Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@VladimirUmek
VladimirUmek committed Nov 16, 2021
2 parents 0a1cf28 + 3da3609 commit 943dc06
Show file tree
Hide file tree
Showing 3,748 changed files with 582,303 additions and 125,263 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 11 additions & 7 deletions ARM.CMSIS-FreeRTOS.pdsc
View file
Expand Up @@ -8,6 +8,13 @@
<license>License/license.txt</license>

<releases>
<release version="10.4.6" date="2021-11-16">
FreeRTOS 10.4.3
Updates and bugfixes:
- Updated osSemaphoreGetCount to use uxSemaphoreGetCountFromISR instead of uxQueueMessagesWaitingFromISR
- Correct typecasting of argument usStackDepth for xTaskCreate in function osThreadNew (#51)
- Fix mutex allocation for Arm Standard C library and allow it only when the kernel is running
</release>
<release version="10.4.3" date="2021-09-28">
FreeRTOS 10.4.3
Updates and bugfixes:
Expand Down Expand Up @@ -874,7 +881,7 @@

<components>
<!-- CMSIS-RTOS FreeRTOS component -->
<component Cclass="CMSIS" Cgroup="RTOS" Csub="FreeRTOS" Cversion="10.4.3" Capiversion="1.0.0" condition="CMSIS RTOS FreeRTOS">
<component Cclass="CMSIS" Cgroup="RTOS" Csub="FreeRTOS" Cversion="10.4.6" Capiversion="1.0.0" condition="CMSIS RTOS FreeRTOS">
<description>CMSIS-RTOS implementation for Cortex-M based on FreeRTOS</description>
<RTE_Components_h>
#define RTE_CMSIS_RTOS /* CMSIS-RTOS */
Expand All @@ -887,7 +894,7 @@
</component>

<!-- CMSIS-RTOS2 FreeRTOS component -->
<component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cversion="10.4.3" Capiversion="2.1.3" condition="CMSIS RTOS2 FreeRTOS CortexM">
<component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cversion="10.4.6" Capiversion="2.1.3" condition="CMSIS RTOS2 FreeRTOS CortexM">
<description>CMSIS-RTOS2 implementation for Cortex-M based on FreeRTOS</description>
<RTE_Components_h>
#define RTE_CMSIS_RTOS2 /* CMSIS-RTOS2 */
Expand All @@ -904,7 +911,7 @@
</files>
</component>

<component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-A" Cversion="10.4.3" Capiversion="2.1.3" condition="CMSIS RTOS2 FreeRTOS CortexA">
<component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-A" Cversion="10.4.6" Capiversion="2.1.3" condition="CMSIS RTOS2 FreeRTOS CortexA">
<description>CMSIS-RTOS2 implementation for Cortex-A based on FreeRTOS</description>
<RTE_Components_h>
#define RTE_CMSIS_RTOS2 /* CMSIS-RTOS2 */
Expand All @@ -921,7 +928,7 @@
</files>
</component>

<bundle Cbundle="FreeRTOS" Cclass="RTOS" Cversion="10.4.3">
<bundle Cbundle="FreeRTOS" Cclass="RTOS" Cversion="10.4.6">
<description>FreeRTOS Real Time Kernel</description>
<doc>https://www.freertos.org/Documentation/FreeRTOS_Reference_Manual_V10.0.0.pdf</doc>

Expand Down Expand Up @@ -1438,21 +1445,18 @@
<file category="header" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_port_macros.h"/>
<file category="include" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/"/>
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_context.c"/>
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_context_port.c"/>
<file category="sourceAsm" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_context_port_asm.s"/>
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_heap.c"/>
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_init.c"/>
<file category="header" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_port_macros.h"/>
<file category="include" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/"/>
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context.c"/>
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port.c"/>
<file category="sourceAsm" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port_asm.s"/>
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_heap.c"/>
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_init.c"/>
<file category="header" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_port_macros.h"/>
<file category="include" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/"/>
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context.c"/>
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port.c"/>
<file category="sourceAsm" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port_asm.s"/>
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_heap.c"/>
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_init.c"/>
Expand Down
8 changes: 4 additions & 4 deletions CMSIS/RTOS2/FreeRTOS/Examples/Blinky/Blinky.uvoptx
View file
Expand Up @@ -162,13 +162,13 @@
</Ww>
</WatchWindow1>
<ScvdPack>
<Filename>C:\Keil\ARM\PACK\ARM\CMSIS-FreeRTOS\10.4.3\CMSIS\RTOS2\FreeRTOS\FreeRTOS.scvd</Filename>
<Type>ARM.CMSIS-FreeRTOS.10.4.3</Type>
<Filename>C:\Keil\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
<Type>Keil.ARM_Compiler.1.6.3</Type>
<SubType>1</SubType>
</ScvdPack>
<ScvdPack>
<Filename>C:\Keil\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
<Type>Keil.ARM_Compiler.1.6.3</Type>
<Filename>C:\Keil\ARM\PACK\ARM\CMSIS-FreeRTOS\10.4.6\CMSIS\RTOS2\FreeRTOS\FreeRTOS.scvd</Filename>
<Type>ARM.CMSIS-FreeRTOS.10.4.6</Type>
<SubType>1</SubType>
</ScvdPack>
<Tracepoint>
Expand Down
16 changes: 8 additions & 8 deletions CMSIS/RTOS2/FreeRTOS/Examples/Blinky/Blinky.uvprojx
View file
Expand Up @@ -16,7 +16,7 @@
<TargetCommonOption>
<Device>ARMCM3</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.5.7.0</PackID>
<PackID>ARM.CMSIS.5.8.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x00020000) IROM(0x00000000,0x00040000) CPUTYPE("Cortex-M3") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -469,7 +469,7 @@
</targetInfos>
</component>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM3 CMSIS">
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
<targetInfos>
<targetInfo name="Simulation"/>
</targetInfos>
Expand All @@ -494,26 +494,26 @@
<targetInfo name="Simulation"/>
</targetInfos>
</file>
<file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM3\Source\ARM\startup_ARMCM3.s" version="1.0.0">
<file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM3\Source\ARM\startup_ARMCM3.s" version="1.0.1">
<instance index="0">RTE\Device\ARMCM3\startup_ARMCM3.s</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM3 CMSIS"/>
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
<targetInfos>
<targetInfo name="Simulation"/>
</targetInfos>
</file>
<file attr="config" category="sourceC" name="Device\ARM\ARMCM3\Source\system_ARMCM3.c" version="1.0.0">
<file attr="config" category="sourceC" name="Device\ARM\ARMCM3\Source\system_ARMCM3.c" version="1.0.1">
<instance index="0">RTE\Device\ARMCM3\system_ARMCM3.c</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM3 CMSIS"/>
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
<targetInfos>
<targetInfo name="Simulation"/>
</targetInfos>
</file>
<file attr="config" category="header" condition="CoreM" name="CMSIS\RTOS2\FreeRTOS\Config\ARMCM\FreeRTOSConfig.h" version="10.3.0">
<instance index="0">RTE\RTOS\FreeRTOSConfig.h</instance>
<component Cbundle="FreeRTOS" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.3" condition="FreeRTOS Config CMSIS RTOS2"/>
<package name="CMSIS-FreeRTOS" schemaVersion="1.4" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/>
<component Cbundle="FreeRTOS" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.6" condition="FreeRTOS Config CMSIS RTOS2"/>
<package name="CMSIS-FreeRTOS" schemaVersion="1.4" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/>
<targetInfos>
<targetInfo name="Simulation"/>
</targetInfos>
Expand Down

0 comments on commit 943dc06

Please sign in to comment.