Skip to content

Commit 943dc06

Browse files
VladimirUmekVladimirUmek
committed
Merge branch 'develop'
2 parents 0a1cf28 + 3da3609 commit 943dc06

File tree

3,748 files changed

+582303
-125263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,748 files changed

+582303
-125263
lines changed

‎ARM.CMSIS-FreeRTOS.pdsc‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
<license>License/license.txt</license>
99

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

875882
<components>
876883
<!-- CMSIS-RTOS FreeRTOS component -->
877-
<component Cclass="CMSIS" Cgroup="RTOS" Csub="FreeRTOS" Cversion="10.4.3" Capiversion="1.0.0" condition="CMSIS RTOS FreeRTOS">
884+
<component Cclass="CMSIS" Cgroup="RTOS" Csub="FreeRTOS" Cversion="10.4.6" Capiversion="1.0.0" condition="CMSIS RTOS FreeRTOS">
878885
<description>CMSIS-RTOS implementation for Cortex-M based on FreeRTOS</description>
879886
<RTE_Components_h>
880887
#define RTE_CMSIS_RTOS /* CMSIS-RTOS */
@@ -887,7 +894,7 @@
887894
</component>
888895

889896
<!-- CMSIS-RTOS2 FreeRTOS component -->
890-
<component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cversion="10.4.3" Capiversion="2.1.3" condition="CMSIS RTOS2 FreeRTOS CortexM">
897+
<component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cversion="10.4.6" Capiversion="2.1.3" condition="CMSIS RTOS2 FreeRTOS CortexM">
891898
<description>CMSIS-RTOS2 implementation for Cortex-M based on FreeRTOS</description>
892899
<RTE_Components_h>
893900
#define RTE_CMSIS_RTOS2 /* CMSIS-RTOS2 */
@@ -904,7 +911,7 @@
904911
</files>
905912
</component>
906913

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

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

@@ -1438,21 +1445,18 @@
14381445
<file category="header" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_port_macros.h"/>
14391446
<file category="include" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/"/>
14401447
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_context.c"/>
1441-
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_context_port.c"/>
14421448
<file category="sourceAsm" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_context_port_asm.s"/>
14431449
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_heap.c"/>
14441450
<file category="source" condition="CM23_TZ_IAR" name="Source/portable/IAR/ARM_CM23/secure/secure_init.c"/>
14451451
<file category="header" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_port_macros.h"/>
14461452
<file category="include" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/"/>
14471453
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context.c"/>
1448-
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port.c"/>
14491454
<file category="sourceAsm" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port_asm.s"/>
14501455
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_heap.c"/>
14511456
<file category="source" condition="CM33_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_init.c"/>
14521457
<file category="header" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_port_macros.h"/>
14531458
<file category="include" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/"/>
14541459
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context.c"/>
1455-
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port.c"/>
14561460
<file category="sourceAsm" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_context_port_asm.s"/>
14571461
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_heap.c"/>
14581462
<file category="source" condition="CM55_TZ_IAR" name="Source/portable/IAR/ARM_CM33/secure/secure_init.c"/>

‎CMSIS/RTOS2/FreeRTOS/Examples/Blinky/Blinky.uvoptx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@
162162
</Ww>
163163
</WatchWindow1>
164164
<ScvdPack>
165-
<Filename>C:\Keil\ARM\PACK\ARM\CMSIS-FreeRTOS\10.4.3\CMSIS\RTOS2\FreeRTOS\FreeRTOS.scvd</Filename>
166-
<Type>ARM.CMSIS-FreeRTOS.10.4.3</Type>
165+
<Filename>C:\Keil\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
166+
<Type>Keil.ARM_Compiler.1.6.3</Type>
167167
<SubType>1</SubType>
168168
</ScvdPack>
169169
<ScvdPack>
170-
<Filename>C:\Keil\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
171-
<Type>Keil.ARM_Compiler.1.6.3</Type>
170+
<Filename>C:\Keil\ARM\PACK\ARM\CMSIS-FreeRTOS\10.4.6\CMSIS\RTOS2\FreeRTOS\FreeRTOS.scvd</Filename>
171+
<Type>ARM.CMSIS-FreeRTOS.10.4.6</Type>
172172
<SubType>1</SubType>
173173
</ScvdPack>
174174
<Tracepoint>

‎CMSIS/RTOS2/FreeRTOS/Examples/Blinky/Blinky.uvprojx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<TargetCommonOption>
1717
<Device>ARMCM3</Device>
1818
<Vendor>ARM</Vendor>
19-
<PackID>ARM.CMSIS.5.7.0</PackID>
19+
<PackID>ARM.CMSIS.5.8.0</PackID>
2020
<PackURL>http://www.keil.com/pack/</PackURL>
2121
<Cpu>IRAM(0x20000000,0x00020000) IROM(0x00000000,0x00040000) CPUTYPE("Cortex-M3") CLOCK(12000000) ESEL ELITTLE</Cpu>
2222
<FlashUtilSpec></FlashUtilSpec>
@@ -469,7 +469,7 @@
469469
</targetInfos>
470470
</component>
471471
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM3 CMSIS">
472-
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
472+
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
473473
<targetInfos>
474474
<targetInfo name="Simulation"/>
475475
</targetInfos>
@@ -494,26 +494,26 @@
494494
<targetInfo name="Simulation"/>
495495
</targetInfos>
496496
</file>
497-
<file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM3\Source\ARM\startup_ARMCM3.s" version="1.0.0">
497+
<file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM3\Source\ARM\startup_ARMCM3.s" version="1.0.1">
498498
<instance index="0">RTE\Device\ARMCM3\startup_ARMCM3.s</instance>
499499
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM3 CMSIS"/>
500-
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
500+
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
501501
<targetInfos>
502502
<targetInfo name="Simulation"/>
503503
</targetInfos>
504504
</file>
505-
<file attr="config" category="sourceC" name="Device\ARM\ARMCM3\Source\system_ARMCM3.c" version="1.0.0">
505+
<file attr="config" category="sourceC" name="Device\ARM\ARMCM3\Source\system_ARMCM3.c" version="1.0.1">
506506
<instance index="0">RTE\Device\ARMCM3\system_ARMCM3.c</instance>
507507
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM3 CMSIS"/>
508-
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
508+
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
509509
<targetInfos>
510510
<targetInfo name="Simulation"/>
511511
</targetInfos>
512512
</file>
513513
<file attr="config" category="header" condition="CoreM" name="CMSIS\RTOS2\FreeRTOS\Config\ARMCM\FreeRTOSConfig.h" version="10.3.0">
514514
<instance index="0">RTE\RTOS\FreeRTOSConfig.h</instance>
515-
<component Cbundle="FreeRTOS" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.3" condition="FreeRTOS Config CMSIS RTOS2"/>
516-
<package name="CMSIS-FreeRTOS" schemaVersion="1.4" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/>
515+
<component Cbundle="FreeRTOS" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.6" condition="FreeRTOS Config CMSIS RTOS2"/>
516+
<package name="CMSIS-FreeRTOS" schemaVersion="1.4" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/>
517517
<targetInfos>
518518
<targetInfo name="Simulation"/>
519519
</targetInfos>

0 commit comments

Comments
 (0)