Skip to content

Commit 5faada6

Browse files
VladimirUmekVladimirUmek
committed
Fixed support for IAR
1 parent a21b050 commit 5faada6

10 files changed

Lines changed: 41 additions & 1 deletion

File tree

‎ARM.CMSIS-FreeRTOS.pdsc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@
602602
<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/ARM/clib_arm.c" condition="ARMCC"/>
603603
<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/ARM/clib_arm.c" condition="ARMCC6"/>
604604

605-
<file category="source" attr="config" name="CMSIS/RTOS2/FreeRTOS/Source/handlers.c" version="9.1.0"/>
605+
<file category="source" attr="config" name="CMSIS/RTOS2/FreeRTOS/Source/handlers.c"/>
606606
</files>
607607
</component>
608608

@@ -680,18 +680,25 @@
680680

681681
<file category="include" condition="CM0_IAR" name="Source/portable/IAR/ARM_CM0/"/>
682682
<file category="source" condition="CM0_IAR" name="Source/portable/IAR/ARM_CM0/port.c"/>
683+
<file category="sourceAsm" condition="CM0_IAR" name="Source/portable/IAR/ARM_CM0/portasm.s"/>
683684
<file category="include" condition="CM3_IAR" name="Source/portable/IAR/ARM_CM3/"/>
684685
<file category="source" condition="CM3_IAR" name="Source/portable/IAR/ARM_CM3/port.c"/>
686+
<file category="sourceAsm" condition="CM3_IAR" name="Source/portable/IAR/ARM_CM3/portasm.s"/>
685687
<file category="include" condition="CM4_IAR" name="Source/portable/IAR/ARM_CM3/"/>
686688
<file category="source" condition="CM4_IAR" name="Source/portable/IAR/ARM_CM3/port.c"/>
689+
<file category="sourceAsm" condition="CM4_IAR" name="Source/portable/IAR/ARM_CM3/portasm.s"/>
687690
<file category="include" condition="CM4_FP_IAR" name="Source/portable/IAR/ARM_CM4F/"/>
688691
<file category="source" condition="CM4_FP_IAR" name="Source/portable/IAR/ARM_CM4F/port.c"/>
692+
<file category="sourceAsm" condition="CM4_FP_IAR" name="Source/portable/IAR/ARM_CM4F/portasm.s"/>
689693
<file category="include" condition="CM7_IAR" name="Source/portable/IAR/ARM_CM3/"/>
690694
<file category="source" condition="CM7_IAR" name="Source/portable/IAR/ARM_CM3/port.c"/>
695+
<file category="sourceAsm" condition="CM7_IAR" name="Source/portable/IAR/ARM_CM3/portasm.s"/>
691696
<file category="include" condition="CM7_DP_IAR" name="Source/portable/IAR/ARM_CM7/r0p1/"/>
692697
<file category="source" condition="CM7_DP_IAR" name="Source/portable/IAR/ARM_CM7/r0p1/port.c"/>
698+
<file category="sourceAsm" condition="CM7_DP_IAR" name="Source/portable/IAR/ARM_CM7/r0p1/portasm.s"/>
693699
<file category="include" condition="CM7_SP_IAR" name="Source/portable/IAR/ARM_CM7/r0p1/"/>
694700
<file category="source" condition="CM7_SP_IAR" name="Source/portable/IAR/ARM_CM7/r0p1/port.c"/>
701+
<file category="sourceAsm" condition="CM7_SP_IAR" name="Source/portable/IAR/ARM_CM7/r0p1/portasm.s"/>
695702
<file category="include" condition="CM33_IAR" name="Source/portable/IAR/ARM_CM33_NTZ/non_secure/"/>
696703
<file category="source" condition="CM33_IAR" name="Source/portable/IAR/ARM_CM33_NTZ/non_secure/port.c"/>
697704
<file category="source" condition="CM33_IAR" name="Source/portable/IAR/ARM_CM33_NTZ/non_secure/portasm.s"/>

‎CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@
3939
* See http://www.freertos.org/a00110.html
4040
*----------------------------------------------------------*/
4141

42+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4243
#include <stdint.h>
4344

4445
#include "RTE_Components.h"
4546
#include CMSIS_device_header
4647

4748
#include "os_tick.h"
49+
#endif
4850

4951
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
5052

‎CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@
3939
* See http://www.freertos.org/a00110.html
4040
*----------------------------------------------------------*/
4141

42+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4243
#include <stdint.h>
4344

4445
#include "RTE_Components.h"
4546
#include CMSIS_device_header
47+
#endif
4648

4749
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
4850

@@ -254,7 +256,9 @@
254256
/* Ensure Cortex-M port compatibility. */
255257
#define SysTick_Handler xPortSysTickHandler
256258

259+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
257260
/* Include debug event definitions */
258261
#include "freertos_evr.h"
262+
#endif
259263

260264
#endif /* FREERTOS_CONFIG_H */

‎CMSIS/RTOS2/FreeRTOS/Examples/Blinky/RTE/RTOS/FreeRTOSConfig.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@
3939
* See http://www.freertos.org/a00110.html
4040
*----------------------------------------------------------*/
4141

42+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4243
#include <stdint.h>
4344

4445
#include "RTE_Components.h"
4546
#include CMSIS_device_header
47+
#endif
4648

4749
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
4850

@@ -251,7 +253,12 @@
251253
#define xPortPendSVHandler PendSV_Handler
252254
#define vPortSVCHandler SVC_Handler
253255

256+
/* Ensure Cortex-M port compatibility. */
257+
#define SysTick_Handler xPortSysTickHandler
258+
259+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
254260
/* Include debug event definitions */
255261
#include "freertos_evr.h"
262+
#endif
256263

257264
#endif /* FREERTOS_CONFIG_H */

‎CMSIS/RTOS2/FreeRTOS/Examples/Blinky_CA9/RTE/RTOS/FreeRTOSConfig.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@
3939
* See http://www.freertos.org/a00110.html
4040
*----------------------------------------------------------*/
4141

42+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4243
#include <stdint.h>
4344

4445
#include "RTE_Components.h"
4546
#include CMSIS_device_header
4647

4748
#include "os_tick.h"
49+
#endif
4850

4951
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
5052

‎CMSIS/RTOS2/FreeRTOS/Examples/Blinky_CA9_AC6/RTE/RTOS/FreeRTOSConfig.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@
3939
* See http://www.freertos.org/a00110.html
4040
*----------------------------------------------------------*/
4141

42+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4243
#include <stdint.h>
4344

4445
#include "RTE_Components.h"
4546
#include CMSIS_device_header
4647

4748
#include "os_tick.h"
49+
#endif
4850

4951
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
5052

‎CMSIS/RTOS2/FreeRTOS/Examples/Native_Blinky/RTE/RTOS/FreeRTOSConfig.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@
4141
* See http://www.freertos.org/a00110.html
4242
*----------------------------------------------------------*/
4343

44+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4445
#include <stdint.h>
4546

4647
extern uint32_t SystemCoreClock;
48+
#endif
4749

4850
/* Constants that describe the hardware and memory usage. */
4951
#define configCPU_CLOCK_HZ (SystemCoreClock)
@@ -151,7 +153,9 @@ extern uint32_t SystemCoreClock;
151153
#define vPortSVCHandler SVC_Handler
152154
#define xPortSysTickHandler SysTick_Handler
153155

156+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
154157
/* Include debug event definitions */
155158
#include "freertos_evr.h"
159+
#endif
156160

157161
#endif /* FREERTOS_CONFIG_H */

‎CMSIS/RTOS2/FreeRTOS/Examples/TrustZone/NonSecure/RTE/RTOS/FreeRTOSConfig.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@
3939
* See http://www.freertos.org/a00110.html
4040
*----------------------------------------------------------*/
4141

42+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4243
#include <stdint.h>
4344

4445
#include "RTE_Components.h"
4546
#include CMSIS_device_header
47+
#endif
4648

4749
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
4850

@@ -254,7 +256,9 @@
254256
/* Ensure Cortex-M port compatibility. */
255257
#define SysTick_Handler xPortSysTickHandler
256258

259+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
257260
/* Include debug event definitions */
258261
#include "freertos_evr.h"
262+
#endif
259263

260264
#endif /* FREERTOS_CONFIG_H */

‎Config/ARMCA/FreeRTOSConfig.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
* See http://www.freertos.org/a00110.html
4242
*----------------------------------------------------------*/
4343

44+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4445
#include <stdint.h>
46+
#endif
4547

4648
/* Constants that describe the hardware and memory usage. */
4749
#define configCPU_CLOCK_HZ 100000000UL
@@ -140,6 +142,7 @@
140142
#define INCLUDE_xTaskGetSchedulerState 1
141143
#define INCLUDE_xTaskGetCurrentTaskHandle 1
142144

145+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
143146
/*
144147
* The application must provide a function that configures a peripheral to
145148
* create the FreeRTOS tick interrupt, then define configSETUP_TICK_INTERRUPT()
@@ -156,5 +159,6 @@ void vClearTickInterrupt ( void );
156159
code (which is where the vector table is defined). */
157160
#define FreeRTOS_IRQ_Handler IRQ_Handler
158161
#define FreeRTOS_SWI_Handler SWI_Handler
162+
#endif
159163

160164
#endif /* FREERTOS_CONFIG_H */

‎Config/ARMCM/FreeRTOSConfig.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@
4141
* See http://www.freertos.org/a00110.html
4242
*----------------------------------------------------------*/
4343

44+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
4445
#include <stdint.h>
4546

4647
extern uint32_t SystemCoreClock;
48+
#endif
4749

4850
/* Constants that describe the hardware and memory usage. */
4951
#define configCPU_CLOCK_HZ (SystemCoreClock)
@@ -151,7 +153,9 @@ extern uint32_t SystemCoreClock;
151153
#define vPortSVCHandler SVC_Handler
152154
#define xPortSysTickHandler SysTick_Handler
153155

156+
#if (defined(__ARMCC_VERSION) || defined(__GNUC__) || defined(__ICCARM__))
154157
/* Include debug event definitions */
155158
#include "freertos_evr.h"
159+
#endif
156160

157161
#endif /* FREERTOS_CONFIG_H */

0 commit comments

Comments
 (0)