Changes to core code and port layer:

[freertos] / FreeRTOS / Source / portable / RVDS / ARM_CM4_MPU / portmacro.h

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h
index 8d441eef6fe207e783dbd0ff58bd837a5c4ec287..3555aa78151dc9e1a373f5b8ab5852485acb65c8 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h
@@ -179,7 +179,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
@@ -273,7 +273,7 @@ static portFORCE_INLINE void vPortClearBASEPRIFromISR( void )
        __asm\r
        {\r
                /* Set BASEPRI to 0 so no interrupts are masked.  This function is only\r
-               used to lower the mask in an interrupt, so memory barriers are not \r
+               used to lower the mask in an interrupt, so memory barriers are not\r
                used. */\r
                msr basepri, #0\r
        }\r
@@ -326,10 +326,10 @@ BaseType_t xReturn;
 portFORCE_INLINE static void vPortResetPrivilege( BaseType_t xRunningPrivileged )\r
 {\r
 uint32_t ulReg;\r
-       \r
-       if( xRunningPrivileged != pdTRUE ) \r
+\r
+       if( xRunningPrivileged != pdTRUE )\r
        {\r
-               __asm \r
+               __asm\r
                {\r
                        mrs ulReg, control\r
                        orr ulReg, #1\r