Fix compiler warning in psp_test.c when compiled with ARM compiler.

Add portYIELD_FROM_ISR() macros to Cortex-M ports.  The new macro just calls the exiting portEND_SWITCHING_ISR() macro.
Remove code from the MSVC port layer that was left over from a previous implementation and become obsolete.

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

11 files changed, 72 insertions, 71 deletions

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
index 37c4f50e6..4293cbd04 100644
--- a/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
@@ -56,19 +56,19 @@
     ***************************************************************************

 

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 

+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

     license and Real Time Engineers Ltd. contact details.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, and our new

     fully thread aware and reentrant UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 

-    Integrity Systems, who sell the code with commercial support, 

+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

+    Integrity Systems, who sell the code with commercial support,

     indemnification and middleware, under the OpenRTOS brand.

-    

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 

-    engineered and independently SIL3 certified version for use in safety and 

+

+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

+    engineered and independently SIL3 certified version for use in safety and

     mission critical applications that require provable dependability.

 */

 

@@ -121,6 +121,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET_BIT		( 1UL << 28UL )

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
index 7f2b357e8..7335aa264 100644
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
@@ -56,19 +56,19 @@
     ***************************************************************************

 

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 

+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

     license and Real Time Engineers Ltd. contact details.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, and our new

     fully thread aware and reentrant UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 

-    Integrity Systems, who sell the code with commercial support, 

+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

+    Integrity Systems, who sell the code with commercial support,

     indemnification and middleware, under the OpenRTOS brand.

-    

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 

-    engineered and independently SIL3 certified version for use in safety and 

+

+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

+    engineered and independently SIL3 certified version for use in safety and

     mission critical applications that require provable dependability.

 */

 

@@ -121,6 +121,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET_BIT		( 1UL << 28UL )

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 /* Critical section management. */

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
index 4fbfd2b3a..218c95975 100644
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
@@ -56,19 +56,19 @@
     ***************************************************************************

 

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 

+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

     license and Real Time Engineers Ltd. contact details.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, and our new

     fully thread aware and reentrant UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 

-    Integrity Systems, who sell the code with commercial support, 

+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

+    Integrity Systems, who sell the code with commercial support,

     indemnification and middleware, under the OpenRTOS brand.

-    

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 

-    engineered and independently SIL3 certified version for use in safety and 

+

+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

+    engineered and independently SIL3 certified version for use in safety and

     mission critical applications that require provable dependability.

 */

 

@@ -162,6 +162,7 @@ typedef struct MPU_SETTINGS
 #define portNVIC_INT_CTRL			( ( volatile unsigned portLONG *) 0xe000ed04 )

 #define portNVIC_PENDSVSET			0x10000000

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) *(portNVIC_INT_CTRL) = portNVIC_PENDSVSET

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 

@@ -181,7 +182,7 @@ typedef struct MPU_SETTINGS
 

 /*

  * Set basepri back to 0 without effective other registers.

- * r0 is clobbered.  FAQ:  Setting BASEPRI to 0 is not a bug.  Please see 

+ * r0 is clobbered.  FAQ:  Setting BASEPRI to 0 is not a bug.  Please see

  * http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html before disagreeing.

  */

 #define portCLEAR_INTERRUPT_MASK()			\

@@ -192,7 +193,7 @@ typedef struct MPU_SETTINGS
 		:::"r0"								\

 	)

 

-/* FAQ:  Setting BASEPRI to 0 is not a bug.  Please see 

+/* FAQ:  Setting BASEPRI to 0 is not a bug.  Please see

 http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html before disagreeing. */

 #define portSET_INTERRUPT_MASK_FROM_ISR()		0;portSET_INTERRUPT_MASK()

 #define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)	portCLEAR_INTERRUPT_MASK();(void)x

@@ -213,7 +214,7 @@ extern void vPortExitCritical( void );
 

 #define portNOP()

 

-/* There are an uneven number of items on the initial stack, so 

+/* There are an uneven number of items on the initial stack, so

 portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */

 #define portALIGNMENT_ASSERT_pxCurrentTCB ( void )

 

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
index 8a8f1fc61..3ad77b20c 100644
--- a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
@@ -121,6 +121,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET_BIT		( 1UL << 28UL )

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 /* Critical section management. */

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h
index a6a1afb6b..1b2e12398 100644
--- a/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h
@@ -56,19 +56,19 @@
     ***************************************************************************

 

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 

+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

     license and Real Time Engineers Ltd. contact details.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, and our new

     fully thread aware and reentrant UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 

-    Integrity Systems, who sell the code with commercial support, 

+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

+    Integrity Systems, who sell the code with commercial support,

     indemnification and middleware, under the OpenRTOS brand.

-    

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 

-    engineered and independently SIL3 certified version for use in safety and 

+

+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

+    engineered and independently SIL3 certified version for use in safety and

     mission critical applications that require provable dependability.

 */

 

@@ -106,13 +106,13 @@ extern "C" {
 	typedef unsigned portLONG portTickType;

 	#define portMAX_DELAY ( portTickType ) 0xffffffff

 #endif

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 /* Architecture specifics. */

 #define portSTACK_GROWTH			( -1 )

-#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )		

+#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )

 #define portBYTE_ALIGNMENT			8

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 

 /* Scheduler utilities. */

@@ -121,6 +121,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET			0x10000000

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) 	*(portNVIC_INT_CTRL) = portNVIC_PENDSVSET

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h
index b600fcb21..ad3632060 100644
--- a/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h
@@ -56,19 +56,19 @@
     ***************************************************************************

 

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 

+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

     license and Real Time Engineers Ltd. contact details.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, and our new

     fully thread aware and reentrant UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 

-    Integrity Systems, who sell the code with commercial support, 

+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

+    Integrity Systems, who sell the code with commercial support,

     indemnification and middleware, under the OpenRTOS brand.

-    

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 

-    engineered and independently SIL3 certified version for use in safety and 

+

+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

+    engineered and independently SIL3 certified version for use in safety and

     mission critical applications that require provable dependability.

 */

 

@@ -106,13 +106,13 @@ extern "C" {
 	typedef unsigned portLONG portTickType;

 	#define portMAX_DELAY ( portTickType ) 0xffffffff

 #endif

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 /* Architecture specifics. */

 #define portSTACK_GROWTH			( -1 )

-#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )		

+#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )

 #define portBYTE_ALIGNMENT			8

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 /* Scheduler utilities. */

 extern void vPortYield( void );

@@ -120,6 +120,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET_BIT		( 1UL << 28UL )

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 /* Architecture specific optimisations. */

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
index 913e814cf..a9c6e8890 100644
--- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
@@ -56,19 +56,19 @@
     ***************************************************************************

 

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 

+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

     license and Real Time Engineers Ltd. contact details.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, and our new

     fully thread aware and reentrant UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 

-    Integrity Systems, who sell the code with commercial support, 

+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

+    Integrity Systems, who sell the code with commercial support,

     indemnification and middleware, under the OpenRTOS brand.

-    

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 

-    engineered and independently SIL3 certified version for use in safety and 

+

+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

+    engineered and independently SIL3 certified version for use in safety and

     mission critical applications that require provable dependability.

 */

 

@@ -106,13 +106,13 @@ extern "C" {
 	typedef unsigned portLONG portTickType;

 	#define portMAX_DELAY ( portTickType ) 0xffffffff

 #endif

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 /* Architecture specifics. */

 #define portSTACK_GROWTH			( -1 )

-#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )		

+#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )

 #define portBYTE_ALIGNMENT			8

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 /* Scheduler utilities. */

 extern void vPortYield( void );

@@ -120,6 +120,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET_BIT		( 1UL << 28UL )

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 /* Architecture specific optimisations. */

@@ -156,7 +157,7 @@ extern void vPortClearInterruptMask( unsigned long ulNewMask );
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)	vPortClearInterruptMask( x )

 /*-----------------------------------------------------------*/

 

-/* There are an uneven number of items on the initial stack, so 

+/* There are an uneven number of items on the initial stack, so

 portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */

 #define portALIGNMENT_ASSERT_pxCurrentTCB ( void )

 /*-----------------------------------------------------------*/

diff --git a/FreeRTOS/Source/portable/MSVC-MingW/port.c b/FreeRTOS/Source/portable/MSVC-MingW/port.c
index bd85d1726..8b82a8c96 100644
--- a/FreeRTOS/Source/portable/MSVC-MingW/port.c
+++ b/FreeRTOS/Source/portable/MSVC-MingW/port.c
@@ -196,6 +196,7 @@ portTickType xMinimumWindowsBlockTime = ( portTickType ) 20;
 portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )

 {

 xThreadState *pxThreadState = NULL;

+char *pcTopOfStack = ( char * ) pxTopOfStack;

 

 	/* In this simulated case a stack is not initialised, but instead a thread

 	is created that will execute the task being created.  The thread handles

@@ -203,7 +204,7 @@ xThreadState *pxThreadState = NULL;
 	the stack that was created for the task - so the stack buffer is still

 	used, just not in the conventional way.  It will not be used for anything

 	other than holding this structure. */

-	pxThreadState = ( xThreadState * ) ( pxTopOfStack - sizeof( xThreadState ) );

+	pxThreadState = ( xThreadState * ) ( pcTopOfStack - sizeof( xThreadState ) );

 

 	/* Create the thread itself. */

 	pxThreadState->pvThread = CreateThread( NULL, 0, ( LPTHREAD_START_ROUTINE ) pxCode, pvParameters, CREATE_SUSPENDED, NULL );

@@ -411,8 +412,6 @@ void vPortEndScheduler( void )
 

 void vPortGenerateSimulatedInterrupt( unsigned long ulInterruptNumber )

 {

-xThreadState *pxThreadState;

-

 	if( ( ulInterruptNumber < portMAX_INTERRUPTS ) && ( pvInterruptEventMutex != NULL ) )

 	{

 		/* Yield interrupts are processed even when critical nesting is non-zero. */

@@ -424,9 +423,6 @@ xThreadState *pxThreadState;
 		be in a critical section as calls to wait for mutexes are accumulative. */

 		if( ulCriticalNesting == 0 )

 		{

-			/* The event handler needs to know to signal the interrupt acknowledge event

-			the next time this task runs. */

-			pxThreadState = ( xThreadState * ) *( ( unsigned long * ) pxCurrentTCB );

 			SetEvent( pvInterruptEvent );			

 		}

 

@@ -471,7 +467,6 @@ void vPortEnterCritical( void )
 

 void vPortExitCritical( void )

 {

-xThreadState *pxThreadState;

 long lMutexNeedsReleasing;

 

 	/* The interrupt event mutex should already be held by this thread as it was

@@ -491,10 +486,6 @@ long lMutexNeedsReleasing;
 			{

 				SetEvent( pvInterruptEvent );

 

-				/* The event handler needs to know to signal the interrupt 

-				acknowledge event the next time this task runs. */

-				pxThreadState = ( xThreadState * ) *( ( unsigned long * ) pxCurrentTCB );

-

 				/* Mutex will be released now, so does not require releasing

 				on function exit. */

 				lMutexNeedsReleasing = pdFALSE;

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h
index 75ff4fc86..80a7b2f3f 100644
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h
@@ -120,6 +120,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET_BIT		( 1UL << 28UL )

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 /* Critical section management. */

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
index fae2fb978..a3c1748a8 100644
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
@@ -56,19 +56,19 @@
     ***************************************************************************

 

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 

+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

     license and Real Time Engineers Ltd. contact details.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, and our new

     fully thread aware and reentrant UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 

-    Integrity Systems, who sell the code with commercial support, 

+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

+    Integrity Systems, who sell the code with commercial support,

     indemnification and middleware, under the OpenRTOS brand.

-    

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 

-    engineered and independently SIL3 certified version for use in safety and 

+

+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

+    engineered and independently SIL3 certified version for use in safety and

     mission critical applications that require provable dependability.

 */

 

@@ -81,7 +81,7 @@ extern "C" {
 #endif

 

 /*-----------------------------------------------------------

- * Port specific definitions.  

+ * Port specific definitions.

  *

  * The settings in this file configure FreeRTOS correctly for the

  * given hardware and compiler.

@@ -106,13 +106,13 @@ extern "C" {
 	typedef unsigned portLONG portTickType;

 	#define portMAX_DELAY ( portTickType ) 0xffffffff

 #endif

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 /* Architecture specifics. */

 #define portSTACK_GROWTH			( -1 )

-#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )		

+#define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )

 #define portBYTE_ALIGNMENT			8

-/*-----------------------------------------------------------*/	

+/*-----------------------------------------------------------*/

 

 /* Scheduler utilities. */

 extern void vPortYield( void );

@@ -120,6 +120,7 @@ extern void vPortYield( void );
 #define portNVIC_PENDSVSET_BIT		( 1UL << 28UL )

 #define portYIELD()					vPortYield()

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/

 

 /* Critical section management. */

@@ -137,7 +138,7 @@ extern void vPortExitCritical( void );
 

 /*-----------------------------------------------------------*/

 

-/* There are an uneven number of items on the initial stack, so 

+/* There are an uneven number of items on the initial stack, so

 portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */

 #define portALIGNMENT_ASSERT_pxCurrentTCB ( void )

 /*-----------------------------------------------------------*/

diff --git a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
index 9e6b40d1a..9f12a88f1 100644
--- a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
@@ -122,6 +122,7 @@ extern void vPortYield( void );
 #define portYIELD()					vPortYield()

 

 #define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) *(portNVIC_INT_CTRL) = portNVIC_PENDSVSET

+#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )

 /*-----------------------------------------------------------*/