ARM-software
diff --git a/‎ARM.CMSIS-FreeRTOS.pdsc‎
Lines changed: 53 additions & 24 deletions b/‎ARM.CMSIS-FreeRTOS.pdsc‎
Lines changed: 53 additions & 24 deletions
diff --git a/‎CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h‎
Lines changed: 42 additions & 75 deletions b/‎CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h‎
Lines changed: 42 additions & 75 deletions
@@ -8,6 +8,14 @@
   <license>License/license.txt</license>
 
   <releases>
+    <release version="10.0.1" date="2018-02-22">
+      FreeRTOS 10.0.0
+      Maintenance for CMSIS 5.3.0: 
+       - Added queue registry support to CMSIS:RTOS2:FreeRTOS component.
+       - Updated CMSIS-FreeRTOS component view to display queue, mutex and semaphore objects.
+       - Updated to CMSIS RTOS2 API 2.1.2 and OS Tick API 1.0.1.
+       - Fixed context switch response latency for API calls from ISR.
+    </release>
     <release version="9.1.0" date="2017-08-11">
       FreeRTOS 9.0.0
       Maintenance release for CMSIS 5.1.0:
@@ -27,7 +35,7 @@
 
   <requirements>
     <packages>
-      <package vendor="ARM" name="CMSIS" version="5.1.0-0"/>
+      <package vendor="ARM" name="CMSIS" version="5.3.0-0"/>
     </packages>
   </requirements>
 
@@ -304,7 +312,7 @@
 
   <components>
     <!-- CMSIS-RTOS FreeRTOS component -->
-    <component Cclass="CMSIS" Cgroup="RTOS" Csub="FreeRTOS" Cversion="9.0.0" Capiversion="1.0.0" condition="FreeRTOS RTOS2 Core">
+    <component Cclass="CMSIS" Cgroup="RTOS" Csub="FreeRTOS" Cversion="10.0.1" Capiversion="1.0.0" condition="FreeRTOS RTOS2 Core">
       <description>CMSIS-RTOS implementation for Cortex-M based on FreeRTOS</description>
       <RTE_Components_h>
         #define RTE_CMSIS_RTOS                  /* CMSIS-RTOS */
@@ -317,7 +325,7 @@
     </component>
 
     <!-- CMSIS-RTOS2 FreeRTOS component -->
-    <component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cversion="9.1.0" Capiversion="2.1.1" condition="FreeRTOS RTOS2 CortexM">
+    <component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cversion="10.0.1" Capiversion="2.1.2" condition="FreeRTOS RTOS2 CortexM">
       <description>CMSIS-RTOS2 implementation for Cortex-M based on FreeRTOS</description>
       <RTE_Components_h>
         #define RTE_CMSIS_RTOS2                 /* CMSIS-RTOS2 */
@@ -334,7 +342,7 @@
       </files>
     </component>
 
-    <component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cversion="9.1.0" Capiversion="2.1.1" condition="FreeRTOS RTOS2 CortexA">
+    <component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cversion="10.0.1" Capiversion="2.1.2" condition="FreeRTOS RTOS2 CortexA">
       <description>CMSIS-RTOS2 implementation for Cortex-A based on FreeRTOS</description>
       <RTE_Components_h>
         #define RTE_CMSIS_RTOS2                 /* CMSIS-RTOS2 */
@@ -350,10 +358,10 @@
       </files>
     </component>
 
-    <bundle Cbundle="FreeRTOS" Cclass="RTOS" Cversion="9.0.0">
+    <bundle Cbundle="FreeRTOS" Cclass="RTOS" Cversion="10.0.1">
       <description>FreeRTOS Real Time Kernel</description>
-      <doc>http://www.freertos.org/Documentation/FreeRTOS_Reference_Manual_V9.0.0.pdf</doc>
-      <component Cgroup="Core" Cversion="9.0.0" condition="FreeRTOS">
+      <doc>http://www.freertos.org/Documentation/FreeRTOS_Reference_Manual_V10.0.0.pdf</doc>
+      <component Cgroup="Core" Cversion="10.0.1" condition="FreeRTOS">
         <description>Core components API (Kernel, Tasks, Semaphores, Mutexes, Queues)</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_CORE          /* RTOS FreeRTOS Core */
@@ -388,9 +396,8 @@
           <file category="source"    condition="CA9_DP_ARMCC" name="Source/portable/RVDS/ARM_CA9/port.c"/>
           <file category="sourceAsm" condition="CA9_DP_ARMCC" name="Source/portable/RVDS/ARM_CA9/portASM.s"/>
 
-          <!-- Cortex-M0 Port of latest FreeRTOS 9.0.0 is broken for ARM Compiler 6 -->
-          <!-- file category="include"   condition="CM0_ARMCC6"    name="Source/portable/GCC/ARM_CM0/"/>
-          <file category="source"    condition="CM0_ARMCC6"    name="Source/portable/GCC/ARM_CM0/port.c"/ -->
+          <file category="include"   condition="CM0_ARMCC6"    name="Source/portable/GCC/ARM_CM0/"/>
+          <file category="source"    condition="CM0_ARMCC6"    name="Source/portable/GCC/ARM_CM0/port.c"/>
           <file category="include"   condition="CM3_ARMCC6"    name="Source/portable/GCC/ARM_CM3/"/>
           <file category="source"    condition="CM3_ARMCC6"    name="Source/portable/GCC/ARM_CM3/port.c"/>
           <file category="include"   condition="CM4_ARMCC6"    name="Source/portable/GCC/ARM_CM3/"/>
@@ -431,31 +438,31 @@
         </files>
       </component>
 
-      <component Cgroup="Config" Cvariant="CMSIS RTOS2" Cversion="9.0.0" condition="CMSIS RTOS2 FreeRTOS">
+      <component Cgroup="Config" Cvariant="CMSIS RTOS2" Cversion="10.0.1" condition="CMSIS RTOS2 FreeRTOS">
         <description>FreeRTOS CMSIS-RTOS2 API configuration file</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_CONFIG_RTOS2  /* RTOS FreeRTOS Config for CMSIS RTOS2 API */
         </RTE_Components_h>
         <files>
           <file category="doc"    name="CMSIS/Documentation/General/html/cre_freertos_proj.html#cmsis_freertos_config"/>
-          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.0.0" condition="CoreM"/>
-          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h" version="10.0.0" condition="CoreA"/>
+          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.0.1" condition="CoreM"/>
+          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h" version="10.0.1" condition="CoreA"/>
         </files>
       </component>
 
-      <component Cgroup="Config" Cvariant="FreeRTOS" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Config" Cvariant="FreeRTOS" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>FreeRTOS API configuration file</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_CONFIG        /* RTOS FreeRTOS Config for FreeRTOS API */
         </RTE_Components_h>
         <files>
           <file category="doc"    name="CMSIS/Documentation/General/html/cre_freertos_proj.html#native_freertos_config"/>
-          <file category="header" attr="config" name="Config/ARMCM/FreeRTOSConfig.h" version="9.0.0" condition="CoreM"/>
-          <file category="header" attr="config" name="Config/ARMCA/FreeRTOSConfig.h" version="9.0.0" condition="CoreA"/>
+          <file category="header" attr="config" name="Config/ARMCM/FreeRTOSConfig.h" version="10.0.0" condition="CoreM"/>
+          <file category="header" attr="config" name="Config/ARMCA/FreeRTOSConfig.h" version="10.0.0" condition="CoreA"/>
         </files>
       </component>
 
-      <component Cgroup="Coroutines" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Coroutines" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>Co-routine API</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_COROUTINE     /* RTOS FreeRTOS Co-routines */
@@ -466,7 +473,7 @@
         </files>
       </component>
 
-      <component Cgroup="Event Groups" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Event Groups" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>Event Group API</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_EVENTGROUPS   /* RTOS FreeRTOS Event Groups */
@@ -476,8 +483,30 @@
           <file category="source" name="Source/event_groups.c"/>
         </files>
       </component>
+
+      <component Cgroup="Stream Buffer" Cversion="10.0.1" condition="FreeRTOS Core">
+        <description>Stream Buffer API</description>
+        <RTE_Components_h>
+          #define RTE_RTOS_FreeRTOS_STREAM_BUFFER /* RTOS FreeRTOS Stream Buffers */
+        </RTE_Components_h>
+        <files>
+          <file category="header" name="Source/include/stream_buffer.h"/>
+          <file category="source" name="Source/stream_buffer.c"/>
+        </files>
+      </component>
+
+      <component Cgroup="Message Buffer" Cversion="10.0.1" condition="FreeRTOS Core">
+        <description>Message Buffer API</description>
+        <RTE_Components_h>
+          #define RTE_RTOS_FreeRTOS_MESSAGE_BUFFER /* RTOS FreeRTOS Message Buffers */
+        </RTE_Components_h>
+        <files>
+          <file category="header" name="Source/include/message_buffer.h"/>
+          <file category="source" name="Source/stream_buffer.c"/>
+        </files>
+      </component>
 
-      <component Cgroup="Timers" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Timers" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>Timer API</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_TIMERS        /* RTOS FreeRTOS Timers */
@@ -488,7 +517,7 @@
         </files>
       </component>
 
-      <component Cgroup="Heap" Cvariant="Heap_1" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Heap" Cvariant="Heap_1" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>Very simple, does not permit memory to be freed.</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_HEAP_1        /* RTOS FreeRTOS Heap 1 */
@@ -499,7 +528,7 @@
         </files>
       </component>
 
-      <component Cgroup="Heap" Cvariant="Heap_2" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Heap" Cvariant="Heap_2" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>Permits memory to be freed, but not does coalescence adjacent free memory blocks.</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_HEAP_2        /* RTOS FreeRTOS Heap 2 */
@@ -510,7 +539,7 @@
         </files>
       </component>
 
-      <component Cgroup="Heap" Cvariant="Heap_3" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Heap" Cvariant="Heap_3" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>Wraps the standard malloc() and free() for thread safety.</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_HEAP_3        /* RTOS FreeRTOS Heap 3 */
@@ -521,7 +550,7 @@
         </files>
       </component>
 
-      <component Cgroup="Heap" Cvariant="Heap_4" Cversion="9.0.0" condition="FreeRTOS Core" isDefaultVariant="true">
+      <component Cgroup="Heap" Cvariant="Heap_4" Cversion="10.0.1" condition="FreeRTOS Core" isDefaultVariant="true">
         <description>Coalescences adjacent free memory blocks to avoid fragmentation. Includes absolute address placement option.</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_HEAP_4        /* RTOS FreeRTOS Heap 4 */
@@ -532,7 +561,7 @@
         </files>
       </component>
 
-      <component Cgroup="Heap" Cvariant="Heap_5" Cversion="9.0.0" condition="FreeRTOS Core">
+      <component Cgroup="Heap" Cvariant="Heap_5" Cversion="10.0.1" condition="FreeRTOS Core">
         <description>Same as Heap_4, with the ability to span the heap across multiple non-adjacent memory areas.</description>
         <RTE_Components_h>
           #define RTE_RTOS_FreeRTOS_HEAP_5        /* RTOS FreeRTOS Heap 5 */
 
@@ -1,71 +1,29 @@
-/*
-    FreeRTOS V9.0.0 - Copyright (C) 2016 Real Time Engineers Ltd.
-    All rights reserved
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
-
-    ***************************************************************************
-    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
-    >>!   distribute a combined work that includes FreeRTOS without being   !<<
-    >>!   obliged to provide the source code for proprietary components     !<<
-    >>!   outside of the FreeRTOS kernel.                                   !<<
-    ***************************************************************************
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
-    link: http://www.freertos.org/a00114.html
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that is more than just the market leader, it     *
-     *    is the industry's de facto standard.                               *
-     *                                                                       *
-     *    Help yourself get started quickly while simultaneously helping     *
-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
-     *    tutorial book, reference manual, or both:                          *
-     *    http://www.FreeRTOS.org/Documentation                              *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
-    the FAQ page "My application does not run, what could be wrong?".  Have you
-    defined configASSERT()?
-
-    http://www.FreeRTOS.org/support - In return for receiving this top quality
-    embedded software for free we request you assist our global community by
-    participating in the support forum.
-
-    http://www.FreeRTOS.org/training - Investing in training allows your team to
-    be as productive as possible as early as possible.  Now you can receive
-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
-    Ltd, and the world's leading authority on the world's leading RTOS.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and commercial middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
+/* --------------------------------------------------------------------------
+ * Copyright (c) 2013-2018 Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * --------------------------------------------------------------------------
+ *
+ * $Revision:   V10.0.1
+ *
+ * Project:     CMSIS-FreeRTOS
+ * Title:       FreeRTOS configuration definitions
+ *
+ * --------------------------------------------------------------------------*/
+
 
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
@@ -89,7 +47,6 @@
 
 #include "os_tick.h"
 
-
 //-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
 
 //  <o>Minimal stack size [words] <0-65535>
@@ -122,6 +79,11 @@
 //  <i> Default: 5
 #define configTIMER_QUEUE_LENGTH                5
 
+//  <o>Preemption interrupt priority
+//  <i> Maximum priority of interrupts that are safe to call FreeRTOS API.
+//  <i> Default: 16
+#define configMAX_SYSCALL_INTERRUPT_PRIORITY    16
+
 //  <q>Use time slicing
 //  <i> Enable setting to use timeslicing.
 //  <i> Default: 1
@@ -163,22 +125,28 @@
 //  <i> Default: 0
 #define configUSE_MALLOC_FAILED_HOOK            0
 
-//  <q>Interrupt controller base address
+//  <o>Queue registry size
+//  <i> Define maximum number of queue objects registered for debug purposes.
+//  <i> The queue registry is used by kernel aware debuggers to locate queue and semaphore structures and display associated text names.
+//  <i> Default: 0
+#define configQUEUE_REGISTRY_SIZE               0
+
+//  <o>Interrupt controller base address
 //  <i> Must be set to the base address of the ARM Generic Interrupt Controller (GIC).
 //  <i> Default: 0x2C000000
 #define configINTERRUPT_CONTROLLER_BASE_ADDRESS 0x2C000000UL
 
-//  <q>Interrupt controller CPU interface offset
+//  <o>Interrupt controller CPU interface offset
 //  <i> Must be set to the offset from interrupt controller base address at which the CPU interface starts.
 //  <i> Default: 0x1000
 #define configINTERRUPT_CONTROLLER_CPU_INTERFACE_OFFSET 0x00000100UL
 
-//  <q>Interrupt controller unique priorities
+//  <o>Interrupt controller unique priorities
 //  <i> The number of unique priorities that can be specified in the ARM Generic Interrupt Controller (GIC).
 //  <i> Default: 32
 #define configUNIQUE_INTERRUPT_PRIORITIES       32
 
-//  <q>Maximum API call interrupt priority
+//  <o>Maximum API call interrupt priority
 //  <i> Interrupts assigned a priority at or below this priority can call interrupt safe FreeRTOS API function, and will nest.
 //  <i> Interrupts assigned a priority above this priority will not be effected by RTOS critical sections, and will nest,
 //  <i> but cannot call any FreeRTOS API functions.
@@ -201,7 +169,6 @@
 #define configUSE_16_BIT_TICKS                  0
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 0
 #define configMAX_PRIORITIES                    56
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    16
 #define configKERNEL_INTERRUPT_PRIORITY         255
 
 /* Defines that include FreeRTOS functions which implement CMSIS RTOS2 API. Do not change! */
@@ -225,6 +192,6 @@
   OS_Tick_Enable();
 
 #define configCLEAR_TICK_INTERRUPT()                         \
-    OS_Tick_AcknowledgeIRQ()
+  OS_Tick_AcknowledgeIRQ()
 
 #endif /* FREERTOS_CONFIG_H */