From 65704174c94fc98a1457f01906d1b6f6dadd5a04 Mon Sep 17 00:00:00 2001 From: Richard Barry Date: Tue, 9 Jul 2013 17:57:59 +0000 Subject: [PATCH] Add portASSERT_IF_INTERRUPT_PRIORITY_INVALID() implementation to the RX ports that use the Renesas compiler. Add portASSERT_IF_INTERRUPT_PRIORITY_INVALID() implementation to the Cortex-A9 ports. --- FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h | 2 -- FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h | 2 -- FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h | 4 +--- FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h | 2 -- FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h | 2 -- FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h | 2 -- FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h | 2 -- FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h | 2 -- FreeRTOS/Source/portable/Renesas/RX100/portmacro.h | 4 ++++ FreeRTOS/Source/portable/Renesas/RX200/portmacro.h | 4 ++++ FreeRTOS/Source/portable/Renesas/RX600/portmacro.h | 4 ++++ 11 files changed, 13 insertions(+), 17 deletions(-) diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h index def764e1c7..66294724f4 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h +++ b/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h @@ -183,8 +183,6 @@ not necessary for to use this port. They are defined so the common demo files #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() -#else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() #endif /* portNOP() is not required by this port. */ diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h index a006e45173..60ff58ab35 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h +++ b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h @@ -184,8 +184,6 @@ not necessary for to use this port. They are defined so the common demo files #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() -#else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() #endif /* portNOP() is not required by this port. */ diff --git a/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h index 2f1f13d550..a7c3031499 100644 --- a/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h +++ b/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h @@ -185,9 +185,7 @@ #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() - #else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() - #endif +#endif #define portNOP() __asm volatile( "NOP" ) diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h index 396bddacb6..a49d042ee0 100644 --- a/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h +++ b/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h @@ -174,8 +174,6 @@ not necessary for to use this port. They are defined so the common demo files #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() -#else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() #endif /* portNOP() is not required by this port. */ diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h index 3d3be493fb..9b07989cbb 100644 --- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h +++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h @@ -175,8 +175,6 @@ not necessary for to use this port. They are defined so the common demo files #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() -#else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() #endif /* portNOP() is not required by this port. */ diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h index 39bd25fdf6..b60743d3e5 100644 --- a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h +++ b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h @@ -185,8 +185,6 @@ void vPortTaskUsesFPU( void ); #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() -#else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() #endif #define portNOP() __nop() diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h index 8e35226573..cabc2081ad 100644 --- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h +++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h @@ -173,8 +173,6 @@ not necessary for to use this port. They are defined so the common demo files #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() -#else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() #endif /* portNOP() is not required by this port. */ diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h index d2ab5a527f..7004a955eb 100644 --- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h +++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h @@ -174,8 +174,6 @@ not necessary for to use this port. They are defined so the common demo files #ifdef configASSERT void vPortValidateInterruptPriority( void ); #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() vPortValidateInterruptPriority() -#else - #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() #endif /* portNOP() is not required by this port. */ diff --git a/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h index 88c3ddc3a1..66a59be34c 100644 --- a/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h +++ b/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h @@ -118,6 +118,10 @@ than portSTACK_TYPE and portBASE_TYPE. */ #define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ ) #define portNOP() nop() +#ifdef configASSERT + #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() configASSERT( ( get_ipl() <= configMAX_SYSCALL_INTERRUPT_PRIORITY ) ) +#endif + #pragma inline_asm vPortYield static void vPortYield( void ) { diff --git a/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h index c9ef3f132a..4c9c88e588 100644 --- a/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h +++ b/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h @@ -118,6 +118,10 @@ portSTACK_TYPE and portBASE_TYPE. */ #define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ ) #define portNOP() nop() +#ifdef configASSERT + #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() configASSERT( ( get_ipl() <= configMAX_SYSCALL_INTERRUPT_PRIORITY ) ) +#endif + #pragma inline_asm vPortYield static void vPortYield( void ) { diff --git a/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h index c9ef3f132a..4c9c88e588 100644 --- a/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h +++ b/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h @@ -118,6 +118,10 @@ portSTACK_TYPE and portBASE_TYPE. */ #define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ ) #define portNOP() nop() +#ifdef configASSERT + #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() configASSERT( ( get_ipl() <= configMAX_SYSCALL_INTERRUPT_PRIORITY ) ) +#endif + #pragma inline_asm vPortYield static void vPortYield( void ) {