RTOS2: added RTX5 component
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index 3275442..74424b3 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -8,6 +8,10 @@
<url>http://www.keil.com/pack/</url>
<releases>
+ <release version="5.0.0-Beta10">
+ CMSIS-RTOS2:
+ - Added RTX5 component.
+ </release>
<release version="5.0.0-Beta9">
CMSIS_Core:
- Replaced macro __SAU_PRESENT with __SAU_REGION_PRESENT.
@@ -393,7 +397,7 @@
<file category="doc" name="CMSIS/Documentation/RTOS/html/index.html"/>
</files>
</api>
- <api Cclass="CMSIS" Cgroup="RTOS" Capiversion="2.0" exclusive="1">
+ <api Cclass="CMSIS" Cgroup="RTOS2" Capiversion="2.0" exclusive="1">
<description>CMSIS-RTOS API for Cortex-M, SC000, and SC300</description>
<files>
<file category="doc" name="CMSIS/Documentation/RTOS2/html/index.html"/>
@@ -1040,21 +1044,23 @@
<require Tcompiler="IAR"/>
</condition>
- <condition id="RTX Dependency">
- <description>Components required for RTX</description>
+ <condition id="RTOS RTX Dependency">
+ <description>Components required for RTOS RTX</description>
<require condition="Cortex-M Device"/>
<require Cclass="Device" Cgroup="Startup"/>
- <deny Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX5"/>
+ <deny Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5"/> -->
</condition>
-
- <condition id="RTX5 Dependency">
- <description>Components required for RTX5</description>
+ <condition id="RTOS RTX5 Dependency">
+ <description>Components required for RTOS RTX5</description>
+ <require Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5"/> -->
+ </condition>
+ <condition id="RTOS2 RTX5 Dependency">
+ <description>Components required for RTOS2 RTX5</description>
<require condition="Cortex-M Device"/>
- <require Cclass="CMSIS" Cgroup="CORE"/>
+ <require Cclass="CMSIS" Cgroup="CORE"/>
<require Cclass="Device" Cgroup="Startup"/>
- <deny Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX"/>
+ <deny Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX"/>
</condition>
-
</conditions>
<components>
@@ -1342,7 +1348,7 @@
</component>
<!-- CMSIS-RTOS Keil RTX component -->
- <component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX" Cversion="4.81.0" Capiversion="1.0" condition="RTX Dependency">
+ <component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX" Cversion="4.81.0" Capiversion="1.0" condition="RTOS RTX Dependency">
<description>CMSIS-RTOS RTX implementation for Cortex-M, SC000, and SC300</description>
<RTE_Components_h>
<!-- the following content goes into file 'RTE_Components.h' -->
@@ -1418,12 +1424,28 @@
</component>
<!-- CMSIS-RTOS Keil RTX5 component -->
- <component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX5" Cversion="5.0.0-Alpha" Capiversion="2.0" condition="RTX5 Dependency">
- <description>CMSIS-RTOS RTX implementation for Cortex-M, SC000, and SC300</description>
+ <component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX5" Cversion="5.0.0-Alpha" Capiversion="1.0" condition="RTOS RTX5 Dependency">
+ <description>CMSIS-RTOS RTX5 implementation for Cortex-M, SC000, and SC300</description>
<RTE_Components_h>
<!-- the following content goes into file 'RTE_Components.h' -->
#define RTE_CMSIS_RTOS /* CMSIS-RTOS */
- #define RTE_CMSIS_RTOS_RTX /* CMSIS-RTOS Keil RTX */
+ #define RTE_CMSIS_RTOS_RTX5 /* CMSIS-RTOS Keil RTX5 */
+ </RTE_Components_h>
+ <files>
+ <!-- RTX header file -->
+ <file category="header" name="CMSIS/RTOS2/RTX/Include1/cmsis_os.h"/>
+ <!-- RTX compatibility module for API V1 -->
+ <file category="source" name="CMSIS/RTOS2/RTX/Library/cmsis_os1.c"/>
+ </files>
+ </component>
+
+ <!-- CMSIS-RTOS2 Keil RTX5 component -->
+ <component Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cversion="5.0.0-Alpha" Capiversion="2.0" condition="RTOS2 RTX5 Dependency">
+ <description>CMSIS-RTOS2 RTX5 implementation for Cortex-M, SC000, and SC300</description>
+ <RTE_Components_h>
+ <!-- the following content goes into file 'RTE_Components.h' -->
+ #define RTE_CMSIS_RTOS2 /* CMSIS-RTOS2 */
+ #define RTE_CMSIS_RTOS2_RTX5 /* CMSIS-RTOS2 Keil RTX5 */
</RTE_Components_h>
<files>
<!-- RTX documentation -->
@@ -1432,7 +1454,6 @@
<!-- RTX header files -->
<file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/>
<file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/>
- <file category="header" name="CMSIS/RTOS2/RTX/Include1/cmsis_os.h"/>
<!-- RTX configuration -->
<file category="source" attr="config" name="CMSIS/RTOS2/RTX/Config/RTX_Config.c" version="5.0.0"/>
@@ -1441,9 +1462,6 @@
<file category="source" attr="template" name="CMSIS/RTOS2/RTX/Template/main.c" select="CMSIS-RTOS 'main' function"/>
<file category="source" attr="template" name="CMSIS/RTOS2/RTX/Source/user_svc.c" select="CMSIS-RTOS User SVC"/>
- <!-- RTX compatibility module for API V1 -->
- <file category="source" name="CMSIS/RTOS2/RTX/Library/cmsis_os1.c"/>
-
<!-- RTX libraries (CPU and Compiler dependent) -->
<!-- ARMCC -->
<file category="library" condition="CM0_LE_ARMCC" name="CMSIS/RTOS2/RTX/Library/ARM/RTX_CM0.lib" src="CMSIS/RTOS2/RTX/Source"/>