Add portASSERT_IF_INTERRUPT_PRIORITY_INVALID() implementation to the RX ports that...

Add portASSERT_IF_INTERRUPT_PRIORITY_INVALID() implementation to the Cortex-A9 ports.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1968 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
index def764e1c79329e9d88c897af2c43fc49995ed4c..66294724f4f80d0645127631b4e223ce2ef63307 100644 (file)
--- 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\r
        void vPortValidateInterruptPriority( void );\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-#else\r
-       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
 #endif\r
 \r
 /* portNOP() is not required by this port. */\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
index a006e45173621a7232ba145ddd1fe69065bda54c..60ff58ab356530253be6c7f83d5ab83ef28c044c 100644 (file)
--- 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\r
        void vPortValidateInterruptPriority( void );\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-#else\r
-       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
 #endif\r
 \r
 /* portNOP() is not required by this port. */\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h
index 2f1f13d550ac8e99d35762f4a6939c08fe7971c0..a7c30314992be91dc73cac6c0dd615eba96dc9d5 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h
@@ -185,9 +185,7 @@
        #ifdef configASSERT\r
                void vPortValidateInterruptPriority( void );\r
                #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-       #else\r
-               #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
-       #endif\r
+#endif\r
 \r
        #define portNOP() __asm volatile( "NOP" )\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h
index 396bddacb6bb7dbf272c35fb177003e4a3d77a83..a49d042ee02eae7762b0c93f8f153686645a5546 100644 (file)
--- 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\r
        void vPortValidateInterruptPriority( void );\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-#else\r
-       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
 #endif\r
 \r
 /* portNOP() is not required by this port. */\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
index 3d3be493fb0ca710b9f02bdf13c8a49809ab0550..9b07989cbb448da6c4be0976b8d674eabf092bdc 100644 (file)
--- 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\r
        void vPortValidateInterruptPriority( void );\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-#else\r
-       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
 #endif\r
 \r
 /* portNOP() is not required by this port. */\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h
index 39bd25fdf64764a6543cea5d3a8f2a107bc70862..b60743d3e5c93d6f772fd673f842b80994021026 100644 (file)
--- 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\r
        void vPortValidateInterruptPriority( void );\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-#else\r
-       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
 #endif\r
 \r
 #define portNOP() __nop()\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h
index 8e35226573f276889deb489f4b0b7992ecd00508..cabc2081ad82c457f6f45a3cdd6e2c8818a20ecb 100644 (file)
--- 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\r
        void vPortValidateInterruptPriority( void );\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-#else\r
-       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
 #endif\r
 \r
 /* portNOP() is not required by this port. */\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
index d2ab5a527fb0c7a777df72703dd9fa18b9aab60a..7004a955eb961df32593e14b7ca3784fbd80237c 100644 (file)
--- 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\r
        void vPortValidateInterruptPriority( void );\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()      vPortValidateInterruptPriority()\r
-#else\r
-       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID()\r
 #endif\r
 \r
 /* portNOP() is not required by this port. */\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h
index 88c3ddc3a1fdf4bc1b03cfd381b02767b07b8e5e..66a59be34c200090c9f8bb9f611c73b0411713a2 100644 (file)
--- 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 )\r
 #define portNOP()                                              nop()\r
 \r
+#ifdef configASSERT\r
+       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() configASSERT( ( get_ipl() <= configMAX_SYSCALL_INTERRUPT_PRIORITY ) )\r
+#endif\r
+\r
 #pragma inline_asm vPortYield\r
 static void vPortYield( void )\r
 {\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h
index c9ef3f132abdb9621128af96e4fa038489f6f096..4c9c88e588abceccf10a67b5dab6a67594b9833b 100644 (file)
--- 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 )          \r
 #define portNOP()                                              nop()\r
 \r
+#ifdef configASSERT\r
+       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() configASSERT( ( get_ipl() <= configMAX_SYSCALL_INTERRUPT_PRIORITY ) )\r
+#endif\r
+\r
 #pragma inline_asm vPortYield\r
 static void vPortYield( void )\r
 {\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h
index c9ef3f132abdb9621128af96e4fa038489f6f096..4c9c88e588abceccf10a67b5dab6a67594b9833b 100644 (file)
--- 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 )          \r
 #define portNOP()                                              nop()\r
 \r
+#ifdef configASSERT\r
+       #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() configASSERT( ( get_ipl() <= configMAX_SYSCALL_INTERRUPT_PRIORITY ) )\r
+#endif\r
+\r
 #pragma inline_asm vPortYield\r
 static void vPortYield( void )\r
 {\r