Added RTX 5.0.0-Alpha (CMSIS RTOS API 2)
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index 7eb78b0..c30eff0 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -8,6 +8,11 @@
<url>http://www.keil.com/pack/</url>
<releases>
+ <release version="5.0.0-Beta8">
+ CMSIS-RTOS:
+ - API 2.0
+ - RTX 5.0.0-Alpha
+ </release>
<release version="5.0.0-Beta7">
CMSIS_Core:
- Added macro __ALIGNED.
@@ -382,6 +387,12 @@
<file category="doc" name="CMSIS/Documentation/RTOS/html/index.html"/>
</files>
</api>
+ <api Cclass="CMSIS" Cgroup="RTOS" 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"/>
+ </files>
+ </api>
<api Cclass="CMSIS Driver" Cgroup="USART" Capiversion="2.02" exclusive="0">
<description>USART Driver API for Cortex-M</description>
<files>
@@ -525,12 +536,6 @@
<require Cclass="CMSIS" Cgroup="CORE"/>
</condition>
- <condition id="Cortex-M Device Startup">
- <description>Only show for Cortex-M based devices. Depends on Device Startup component.</description>
- <require condition="Cortex-M Device"/>
- <require Cclass="Device" Cgroup="Startup"/>
- </condition>
-
<condition id="CMSIS Core">
<description>CMSIS CORE processor and device specific Startup files</description>
<require Cclass="CMSIS" Cgroup="CORE"/>
@@ -1028,6 +1033,22 @@
<accept Dcore="Cortex-M7" Dfpu="DP_FPU" Dendian="Big-endian"/>
<require Tcompiler="IAR"/>
</condition>
+
+ <condition id="RTX Dependency">
+ <description>Components required for RTX</description>
+ <require condition="Cortex-M Device"/>
+ <require Cclass="Device" Cgroup="Startup"/>
+ <deny Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX5"/>
+ </condition>
+
+ <condition id="RTX5 Dependency">
+ <description>Components required for RTX5</description>
+ <require condition="Cortex-M Device"/>
+ <require Cclass="CMSIS" Cgroup="CORE"/>
+ <require Cclass="Device" Cgroup="Startup"/>
+ <deny Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX"/>
+ </condition>
+
</conditions>
<components>
@@ -1315,7 +1336,7 @@
</component>
<!-- CMSIS-RTOS Keil RTX component -->
- <component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX" Cversion="4.81.0" Capiversion="1.0" condition="Cortex-M Device Startup">
+ <component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX" Cversion="4.81.0" Capiversion="1.0" condition="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' -->
@@ -1389,6 +1410,51 @@
<file category="library" condition="CM7F_BE_IAR" name="CMSIS/RTOS/RTX/LIB/IAR/RTX_CM4_B.a" src="CMSIS/RTOS/RTX/SRC/IAR"/>
</files>
</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>
+ <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 */
+ </RTE_Components_h>
+ <files>
+ <!-- RTX documentation -->
+ <!-- <file category="doc" name="CMSIS/Documentation/RTOS2/html/_r_t_x_implementation.html"/> -->
+
+ <!-- RTX header files -->
+ <file category="header" name="CMSIS/RTOS2/RTX/Include/cmsis_os.h"/>
+ <file category="header" name="CMSIS/RTOS2/RTX/Include/cmsis_os2.h"/>
+ <file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/>
+
+ <!-- RTX configuration -->
+ <file category="source" attr="config" name="CMSIS/RTOS2/RTX/Config/RTX_Config.c" version="5.0.0"/>
+
+ <!-- RTX templates -->
+ <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"/>
+ <file category="library" condition="CM3_LE_ARMCC" name="CMSIS/RTOS2/RTX/Library/ARM/RTX_CM3.lib" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM4_LE_ARMCC_STD" name="CMSIS/RTOS2/RTX/Library/ARM/RTX_CM3.lib" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM4F_LE_ARMCC_STD" name="CMSIS/RTOS2/RTX/Library/ARM/RTX_CM4F.lib" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM7_LE_ARMCC" name="CMSIS/RTOS2/RTX/Library/ARM/RTX_CM3.lib" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM7F_LE_ARMCC" name="CMSIS/RTOS2/RTX/Library/ARM/RTX_CM4F.lib" src="CMSIS/RTOS2/RTX/Source"/>
+ <!-- GCC -->
+ <file category="library" condition="CM0_LE_GCC" name="CMSIS/RTOS2/RTX/Library/GCC/libRTX_CM0.a" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM3_LE_GCC" name="CMSIS/RTOS2/RTX/Library/GCC/libRTX_CM3.a" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM4_LE_GCC_STD" name="CMSIS/RTOS2/RTX/Library/GCC/libRTX_CM3.a" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM4F_LE_GCC_STD" name="CMSIS/RTOS2/RTX/Library/GCC/libRTX_CM4F.a" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM7_LE_GCC" name="CMSIS/RTOS2/RTX/Library/GCC/libRTX_CM3.a" src="CMSIS/RTOS2/RTX/Source"/>
+ <file category="library" condition="CM7F_LE_GCC" name="CMSIS/RTOS2/RTX/Library/GCC/libRTX_CM4F.a" src="CMSIS/RTOS2/RTX/Source"/>
+ </files>
+ </component>
</components>
<boards>