From 9036e2d7c858cb7a8619436eb762fb5c51c79acf Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
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.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1968 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 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 def764e1c..66294724f 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 a006e4517..60ff58ab3 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 2f1f13d55..a7c303149 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 396bddacb..a49d042ee 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 3d3be493f..9b07989cb 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 39bd25fdf..b60743d3e 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 8e3522657..cabc2081a 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 d2ab5a527..7004a955e 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 88c3ddc3a..66a59be34 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 c9ef3f132..4c9c88e58 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 c9ef3f132..4c9c88e58 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 )
 {
-- 
2.39.5