Changes to core code and port layer:

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CM3_MPU / portmacro.h

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
index 7b899661dd00e799e6a089eb46c457829b5fb663..b44fe4c057855c4fe3c311a012f280ba3c0f21dd 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
@@ -173,7 +173,7 @@ typedef struct MPU_SETTINGS
 \r
 #define portNVIC_INT_CTRL_REG          ( * ( ( volatile uint32_t * ) 0xe000ed04 ) )\r
 #define portNVIC_PENDSVSET_BIT         ( 1UL << 28UL )\r
-#define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET\r
+#define portEND_SWITCHING_ISR( xSwitchRequired ) if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT\r
 #define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -246,7 +246,7 @@ not necessary for to use this port.  They are defined so the common demo files
 /* Set the privilege level to user mode if xRunningPrivileged is false. */\r
 portFORCE_INLINE static void vPortResetPrivilege( BaseType_t xRunningPrivileged )\r
 {\r
-       if( xRunningPrivileged != pdTRUE ) \r
+       if( xRunningPrivileged != pdTRUE )\r
        {\r
                __asm volatile ( " mrs r0, control      \n" \\r
                                                 " orr r0, #1           \n" \\r