Update Cortex-M3 and Cortex-M4F ports to allow the SysTick to be clocked at a differe...

Add additional asserts and isb instructions into the Cortex-M3 and Cortex-M4F ports.

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

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
index 1a33e73804507c22d7527c706fd7c55fd3661164..206e70d25990a5c58ea61302038a1411e81610b2 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
@@ -237,6 +237,7 @@ void vPortSVCHandler( void )
                                        "       ldr r0, [r1]                                    \n" /* The first item in pxCurrentTCB is the task top of stack. */\r
                                        "       ldmia r0!, {r4-r11}                             \n" /* Pop the registers that are not automatically saved on exception entry and the critical nesting count. */\r
                                        "       msr psp, r0                                             \n" /* Restore the task stack pointer. */\r
+                                       "       isb                                                             \n"\r
                                        "       mov r0, #0                                              \n"\r
                                        "       msr     basepri, r0                                     \n"\r
                                        "       orr r14, #0xd                                   \n"\r
@@ -256,6 +257,8 @@ static void prvPortStartFirstTask( void )
                                        " ldr r0, [r0]                  \n"\r
                                        " msr msp, r0                   \n" /* Set the msp back to the start of the stack. */\r
                                        " cpsie i                               \n" /* Globally enable interrupts. */\r
+                                       " dsb                                   \n"\r
+                                       " isb                                   \n"\r
                                        " svc 0                                 \n" /* System call to start first task. */\r
                                        " nop                                   \n"\r
                                );\r
@@ -342,8 +345,9 @@ portBASE_TYPE xPortStartScheduler( void )
 \r
 void vPortEndScheduler( void )\r
 {\r
-       /* It is unlikely that the CM3 port will require this function as there\r
-       is nothing to return to.  */\r
+       /* Not implemented in ports where there is nothing to return to.\r
+       Artificially force an assert. */\r
+       configASSERT( uxCriticalNesting == 1000UL );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -370,6 +374,7 @@ void vPortEnterCritical( void )
 \r
 void vPortExitCritical( void )\r
 {\r
+       configASSERT( uxCriticalNesting );\r
        uxCriticalNesting--;\r
        if( uxCriticalNesting == 0 )\r
        {\r
@@ -416,6 +421,7 @@ void xPortPendSVHandler( void )
        __asm volatile\r
        (\r
        "       mrs r0, psp                                                     \n"\r
+       "       isb                                                                     \n"\r
        "                                                                               \n"\r
        "       ldr     r3, pxCurrentTCBConst                   \n" /* Get the location of the current TCB. */\r
        "       ldr     r2, [r3]                                                \n"\r
@@ -435,6 +441,7 @@ void xPortPendSVHandler( void )
        "       ldr r0, [r1]                                            \n" /* The first item in pxCurrentTCB is the task top of stack. */\r
        "       ldmia r0!, {r4-r11}                                     \n" /* Pop the registers. */\r
        "       msr psp, r0                                                     \n"\r
+       "       isb                                                                     \n"\r
        "       bx r14                                                          \n"\r
        "                                                                               \n"\r
        "       .align 2                                                        \n"\r
@@ -468,7 +475,7 @@ void xPortSysTickHandler( void )
 \r
        __attribute__((weak)) void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )\r
        {\r
-       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements;\r
+       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements, ulSysTickCTRL;\r
        portTickType xModifiableIdleTime;\r
 \r
                /* Make sure the SysTick reload value does not overflow the counter. */\r
@@ -481,7 +488,7 @@ void xPortSysTickHandler( void )
                is accounted for as best it can be, but using the tickless mode will\r
                inevitably result in some tiny drift of the time maintained by the\r
                kernel with respect to calendar time. */\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG &= ~portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime\r
                tick periods.  -1 is used because this code will execute part way\r
@@ -505,7 +512,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_LOAD_REG = portNVIC_SYSTICK_CURRENT_VALUE_REG;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Reset the reload register to the value required for normal tick\r
                        periods. */\r
@@ -525,7 +532,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Sleep until something happens.  configPRE_SLEEP_PROCESSING() can\r
                        set its parameter to 0 to indicate that its implementation contains\r
@@ -546,13 +553,14 @@ void xPortSysTickHandler( void )
                        accounted for as best it can be, but using the tickless mode will\r
                        inevitably result in some tiny drift of the time maintained by the\r
                        kernel with respect to calendar time. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+                       ulSysTickCTRL = portNVIC_SYSTICK_CTRL_REG;\r
+                       portNVIC_SYSTICK_CTRL_REG = ( ulSysTickCTRL & ~portNVIC_SYSTICK_ENABLE_BIT );\r
 \r
                        /* Re-enable interrupts - see comments above the cpsid instruction()\r
                        above. */\r
                        __asm volatile( "cpsie i" );\r
 \r
-                       if( ( portNVIC_SYSTICK_CTRL_REG & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
+                       if( ( ulSysTickCTRL & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
                        {\r
                                unsigned long ulCalculatedLoadValue;\r
 \r
@@ -604,7 +612,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
                        portENTER_CRITICAL();\r
                        {\r
-                               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                               portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
                                vTaskStepTick( ulCompleteTickPeriods );\r
                                portNVIC_SYSTICK_LOAD_REG = ulTimerCountsForOneTick - 1UL;\r
                        }\r
@@ -632,7 +640,7 @@ __attribute__(( weak )) void vPortSetupTimerInterrupt( void )
 \r
        /* Configure SysTick to interrupt at the requested rate. */\r
        portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;;\r
-       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+       portNVIC_SYSTICK_CTRL_REG |= ( portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
index c009b4bce9ea6a2233601871fd16db55eb2ec3fa..98c301ba70bf52ab1743e008b3d0cb4a5e312e36 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
@@ -256,6 +256,7 @@ void vPortSVCHandler( void )
                                        "       ldr r0, [r1]                                    \n" /* The first item in pxCurrentTCB is the task top of stack. */\r
                                        "       ldmia r0!, {r4-r11, r14}                \n" /* Pop the registers that are not automatically saved on exception entry and the critical nesting count. */\r
                                        "       msr psp, r0                                             \n" /* Restore the task stack pointer. */\r
+                                       "       isb                                                             \n"\r
                                        "       mov r0, #0                                              \n"\r
                                        "       msr     basepri, r0                                     \n"\r
                                        "       bx r14                                                  \n"\r
@@ -274,6 +275,8 @@ static void prvPortStartFirstTask( void )
                                        " ldr r0, [r0]                  \n"\r
                                        " msr msp, r0                   \n" /* Set the msp back to the start of the stack. */\r
                                        " cpsie i                               \n" /* Globally enable interrupts. */\r
+                                       " dsb                                   \n"\r
+                                       " isb                                   \n"\r
                                        " svc 0                                 \n" /* System call to start first task. */\r
                                        " nop                                   \n"\r
                                );\r
@@ -366,8 +369,9 @@ portBASE_TYPE xPortStartScheduler( void )
 \r
 void vPortEndScheduler( void )\r
 {\r
-       /* It is unlikely that the CM4F port will require this function as there\r
-       is nothing to return to.  */\r
+       /* Not implemented in ports where there is nothing to return to.\r
+       Artificially force an assert. */\r
+       configASSERT( uxCriticalNesting == 1000UL );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -394,6 +398,7 @@ void vPortEnterCritical( void )
 \r
 void vPortExitCritical( void )\r
 {\r
+       configASSERT( uxCriticalNesting );\r
        uxCriticalNesting--;\r
        if( uxCriticalNesting == 0 )\r
        {\r
@@ -440,6 +445,7 @@ void xPortPendSVHandler( void )
        __asm volatile\r
        (\r
        "       mrs r0, psp                                                     \n"\r
+       "       isb                                                                     \n"\r
        "                                                                               \n"\r
        "       ldr     r3, pxCurrentTCBConst                   \n" /* Get the location of the current TCB. */\r
        "       ldr     r2, [r3]                                                \n"\r
@@ -470,6 +476,7 @@ void xPortPendSVHandler( void )
        "       vldmiaeq r0!, {s16-s31}                         \n"\r
        "                                                                               \n"\r
        "       msr psp, r0                                                     \n"\r
+       "       isb                                                                     \n"\r
        "                                                                               \n"\r
        #ifdef WORKAROUND_PMU_CM001 /* XMC4000 specific errata workaround. */\r
                #if WORKAROUND_PMU_CM001 == 1\r
@@ -511,7 +518,7 @@ void xPortSysTickHandler( void )
 \r
        __attribute__((weak)) void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )\r
        {\r
-       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements;\r
+       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements, ulSysTickCTRL;\r
        portTickType xModifiableIdleTime;\r
 \r
                /* Make sure the SysTick reload value does not overflow the counter. */\r
@@ -524,7 +531,7 @@ void xPortSysTickHandler( void )
                is accounted for as best it can be, but using the tickless mode will\r
                inevitably result in some tiny drift of the time maintained by the\r
                kernel with respect to calendar time. */\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG &= ~portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime\r
                tick periods.  -1 is used because this code will execute part way\r
@@ -548,7 +555,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_LOAD_REG = portNVIC_SYSTICK_CURRENT_VALUE_REG;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Reset the reload register to the value required for normal tick\r
                        periods. */\r
@@ -568,7 +575,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Sleep until something happens.  configPRE_SLEEP_PROCESSING() can\r
                        set its parameter to 0 to indicate that its implementation contains\r
@@ -589,13 +596,14 @@ void xPortSysTickHandler( void )
                        accounted for as best it can be, but using the tickless mode will\r
                        inevitably result in some tiny drift of the time maintained by the\r
                        kernel with respect to calendar time. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+                       ulSysTickCTRL = portNVIC_SYSTICK_CTRL_REG;\r
+                       portNVIC_SYSTICK_CTRL_REG = ( ulSysTickCTRL & ~portNVIC_SYSTICK_ENABLE_BIT );\r
 \r
                        /* Re-enable interrupts - see comments above the cpsid instruction()\r
                        above. */\r
                        __asm volatile( "cpsie i" );\r
 \r
-                       if( ( portNVIC_SYSTICK_CTRL_REG & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
+                       if( ( ulSysTickCTRL & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
                        {\r
                                unsigned long ulCalculatedLoadValue;\r
 \r
@@ -647,7 +655,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
                        portENTER_CRITICAL();\r
                        {\r
-                               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                               portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
                                vTaskStepTick( ulCompleteTickPeriods );\r
                                portNVIC_SYSTICK_LOAD_REG = ulTimerCountsForOneTick - 1UL;\r
                        }\r
@@ -675,7 +683,7 @@ __attribute__(( weak )) void vPortSetupTimerInterrupt( void )
 \r
        /* Configure SysTick to interrupt at the requested rate. */\r
        portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;;\r
-       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+       portNVIC_SYSTICK_CTRL_REG |= ( portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c
index 4e718a4ac30445f934692e98c1460d89bb35d508..d902851d19597818fc787b3ee77bb729905c451b 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c
@@ -357,7 +357,7 @@ void xPortSysTickHandler( void )
 \r
        __weak void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )\r
        {\r
-       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements;\r
+       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements, ulSysTickCTRL;\r
        portTickType xModifiableIdleTime;\r
 \r
                /* Make sure the SysTick reload value does not overflow the counter. */\r
@@ -370,7 +370,7 @@ void xPortSysTickHandler( void )
                is accounted for as best it can be, but using the tickless mode will\r
                inevitably result in some tiny drift of the time maintained by the\r
                kernel with respect to calendar time. */\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG &= ~portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime\r
                tick periods.  -1 is used because this code will execute part way\r
@@ -394,7 +394,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_LOAD_REG = portNVIC_SYSTICK_CURRENT_VALUE_REG;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Reset the reload register to the value required for normal tick\r
                        periods. */\r
@@ -414,7 +414,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Sleep until something happens.  configPRE_SLEEP_PROCESSING() can\r
                        set its parameter to 0 to indicate that its implementation contains\r
@@ -435,13 +435,14 @@ void xPortSysTickHandler( void )
                        accounted for as best it can be, but using the tickless mode will\r
                        inevitably result in some tiny drift of the time maintained by the\r
                        kernel with respect to calendar time. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+                       ulSysTickCTRL = portNVIC_SYSTICK_CTRL_REG;\r
+                       portNVIC_SYSTICK_CTRL_REG = ( ulSysTickCTRL & ~portNVIC_SYSTICK_ENABLE_BIT );\r
 \r
                        /* Re-enable interrupts - see comments above __disable_interrupt()\r
                        call above. */\r
                        __enable_interrupt();\r
 \r
-                       if( ( portNVIC_SYSTICK_CTRL_REG & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
+                       if( ( ulSysTickCTRL & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
                        {\r
                                unsigned long ulCalculatedLoadValue;\r
 \r
@@ -493,7 +494,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
                        portENTER_CRITICAL();\r
                        {\r
-                               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                               portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
                                vTaskStepTick( ulCompleteTickPeriods );\r
                                portNVIC_SYSTICK_LOAD_REG = ulTimerCountsForOneTick - 1UL;\r
                        }\r
@@ -521,7 +522,7 @@ __weak void vPortSetupTimerInterrupt( void )
 \r
        /* Configure SysTick to interrupt at the requested rate. */\r
        portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;;\r
-       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+       portNVIC_SYSTICK_CTRL_REG |= ( portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s b/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s
index 5b4af0c5c4a719ee77d0c39752b629bab1ec43c0..b6bc1b12a4af18f3a206880d60bc1d658e8e80e3 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -82,9 +82,10 @@
 /*-----------------------------------------------------------*/\r
 \r
 xPortPendSVHandler:\r
-       mrs r0, psp                                             \r
+       mrs r0, psp\r
+       isb\r
        ldr     r3, =pxCurrentTCB                       /* Get the location of the current TCB. */\r
-       ldr     r2, [r3]                                                \r
+       ldr     r2, [r3]\r
 \r
        stmdb r0!, {r4-r11}                             /* Save the remaining registers. */\r
        str r0, [r2]                                    /* Save the new top of stack into the first member of the TCB. */\r
@@ -92,16 +93,17 @@ xPortPendSVHandler:
        stmdb sp!, {r3, r14}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
        msr basepri, r0\r
-       bl vTaskSwitchContext                   \r
+       bl vTaskSwitchContext\r
        mov r0, #0\r
        msr basepri, r0\r
        ldmia sp!, {r3, r14}\r
 \r
-       ldr r1, [r3]                                    \r
+       ldr r1, [r3]\r
        ldr r0, [r1]                                    /* The first item in pxCurrentTCB is the task top of stack. */\r
        ldmia r0!, {r4-r11}                             /* Pop the registers. */\r
-       msr psp, r0                                             \r
-       bx r14                                                  \r
+       msr psp, r0\r
+       isb\r
+       bx r14\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
@@ -111,7 +113,7 @@ ulPortSetInterruptMask:
        mov r1, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
        msr basepri, r1\r
        bx r14\r
-       \r
+\r
 /*-----------------------------------------------------------*/\r
 \r
 vPortClearInterruptMask:\r
@@ -128,6 +130,7 @@ vPortSVCHandler:
        /* Pop the core registers. */\r
        ldmia r0!, {r4-r11}\r
        msr psp, r0\r
+       isb\r
        mov r0, #0\r
        msr     basepri, r0\r
        orr r14, r14, #13\r
@@ -144,7 +147,8 @@ vPortStartFirstTask
        msr msp, r0\r
        /* Call SVC to start the first task. */\r
        cpsie i\r
+       dsb\r
+       isb\r
        svc 0\r
 \r
        END\r
-       
\ No newline at end of file

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
index 95b8b1870c58583aabb76fa33e27d46586a73ad4..7c287649e1388516aeabe80c5048dc79b87b4db4 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
@@ -383,7 +383,7 @@ void xPortSysTickHandler( void )
 \r
        __weak void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )\r
        {\r
-       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements;\r
+       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements, ulSysTickCTRL;\r
        portTickType xModifiableIdleTime;\r
 \r
                /* Make sure the SysTick reload value does not overflow the counter. */\r
@@ -396,7 +396,7 @@ void xPortSysTickHandler( void )
                is accounted for as best it can be, but using the tickless mode will\r
                inevitably result in some tiny drift of the time maintained by the\r
                kernel with respect to calendar time. */\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG &= ~portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime\r
                tick periods.  -1 is used because this code will execute part way\r
@@ -420,7 +420,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_LOAD_REG = portNVIC_SYSTICK_CURRENT_VALUE_REG;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Reset the reload register to the value required for normal tick\r
                        periods. */\r
@@ -440,7 +440,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Sleep until something happens.  configPRE_SLEEP_PROCESSING() can\r
                        set its parameter to 0 to indicate that its implementation contains\r
@@ -461,13 +461,14 @@ void xPortSysTickHandler( void )
                        accounted for as best it can be, but using the tickless mode will\r
                        inevitably result in some tiny drift of the time maintained by the\r
                        kernel with respect to calendar time. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+                       ulSysTickCTRL = portNVIC_SYSTICK_CTRL_REG;\r
+                       portNVIC_SYSTICK_CTRL_REG = ( ulSysTickCTRL & ~portNVIC_SYSTICK_ENABLE_BIT );\r
 \r
                        /* Re-enable interrupts - see comments above __disable_interrupt()\r
                        call above. */\r
                        __enable_interrupt();\r
 \r
-                       if( ( portNVIC_SYSTICK_CTRL_REG & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
+                       if( ( ulSysTickCTRL & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
                        {\r
                                unsigned long ulCalculatedLoadValue;\r
 \r
@@ -519,7 +520,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
                        portENTER_CRITICAL();\r
                        {\r
-                               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                               portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
                                vTaskStepTick( ulCompleteTickPeriods );\r
                                portNVIC_SYSTICK_LOAD_REG = ulTimerCountsForOneTick - 1UL;\r
                        }\r
@@ -547,7 +548,7 @@ __weak void vPortSetupTimerInterrupt( void )
 \r
        /* Configure SysTick to interrupt at the requested rate. */\r
        portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;;\r
-       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+       portNVIC_SYSTICK_CTRL_REG |= ( portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s
index 72bf98e33a2beca5cf553ce0749fa4a847c8deb2..b0123a4a75432a14f4b919b3b1ecfe0cf64fb917 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s
@@ -83,7 +83,7 @@
 \r
 xPortPendSVHandler:\r
        mrs r0, psp\r
-\r
+       isb\r
        /* Get the location of the current TCB. */\r
        ldr     r3, =pxCurrentTCB\r
        ldr     r2, [r3]\r
@@ -121,7 +121,7 @@ xPortPendSVHandler:
        vldmiaeq r0!, {s16-s31}\r
 \r
        msr psp, r0\r
-\r
+       isb\r
        #ifdef WORKAROUND_PMU_CM001 /* XMC4000 specific errata */\r
                #if WORKAROUND_PMU_CM001 == 1\r
                        push { r14 }\r
@@ -156,6 +156,7 @@ vPortSVCHandler:
        /* Pop the core registers. */\r
        ldmia r0!, {r4-r11, r14}\r
        msr psp, r0\r
+       isb\r
        mov r0, #0\r
        msr     basepri, r0\r
        bx r14\r
@@ -171,6 +172,8 @@ vPortStartFirstTask
        msr msp, r0\r
        /* Call SVC to start the first task. */\r
        cpsie i\r
+       dsb\r
+       isb\r
        svc 0\r
 \r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
index 8e881953fbb44fdb502f6faf91aea4c321452e77..c3fe7088aa873f0845275f7634f46c6c543aecef 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
@@ -243,6 +243,7 @@ __asm void vPortSVCHandler( void )
        ldr r0, [r1]                    /* The first item in pxCurrentTCB is the task top of stack. */\r
        ldmia r0!, {r4-r11}             /* Pop the registers that are not automatically saved on exception entry and the critical nesting count. */\r
        msr psp, r0                             /* Restore the task stack pointer. */\r
+       isb\r
        mov r0, #0\r
        msr     basepri, r0\r
        orr r14, #0xd\r
@@ -262,6 +263,8 @@ __asm void prvStartFirstTask( void )
        msr msp, r0\r
        /* Globally enable interrupts. */\r
        cpsie i\r
+       dsb\r
+       isb\r
        /* Call SVC to start the first task. */\r
        svc 0\r
        nop\r
@@ -385,6 +388,7 @@ __asm void xPortPendSVHandler( void )
        PRESERVE8\r
 \r
        mrs r0, psp\r
+       isb\r
 \r
        ldr     r3, =pxCurrentTCB               /* Get the location of the current TCB. */\r
        ldr     r2, [r3]\r
@@ -404,6 +408,7 @@ __asm void xPortPendSVHandler( void )
        ldr r0, [r1]                            /* The first item in pxCurrentTCB is the task top of stack. */\r
        ldmia r0!, {r4-r11}                     /* Pop the registers and the critical nesting count. */\r
        msr psp, r0\r
+       isb\r
        bx r14\r
        nop\r
 }\r
@@ -433,7 +438,7 @@ void xPortSysTickHandler( void )
 \r
        __weak void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )\r
        {\r
-       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements;\r
+       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements, ulSysTickCTRL;\r
        portTickType xModifiableIdleTime;\r
 \r
                /* Make sure the SysTick reload value does not overflow the counter. */\r
@@ -446,7 +451,7 @@ void xPortSysTickHandler( void )
                is accounted for as best it can be, but using the tickless mode will\r
                inevitably result in some tiny drift of the time maintained by the\r
                kernel with respect to calendar time. */\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG &= ~portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime\r
                tick periods.  -1 is used because this code will execute part way\r
@@ -470,7 +475,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_LOAD_REG = portNVIC_SYSTICK_CURRENT_VALUE_REG;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Reset the reload register to the value required for normal tick\r
                        periods. */\r
@@ -490,7 +495,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Sleep until something happens.  configPRE_SLEEP_PROCESSING() can\r
                        set its parameter to 0 to indicate that its implementation contains\r
@@ -511,13 +516,14 @@ void xPortSysTickHandler( void )
                        accounted for as best it can be, but using the tickless mode will\r
                        inevitably result in some tiny drift of the time maintained by the\r
                        kernel with respect to calendar time. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+                       ulSysTickCTRL = portNVIC_SYSTICK_CTRL_REG;\r
+                       portNVIC_SYSTICK_CTRL_REG = ( ulSysTickCTRL & ~portNVIC_SYSTICK_ENABLE_BIT );\r
 \r
                        /* Re-enable interrupts - see comments above __disable_irq() call\r
                        above. */\r
                        __enable_irq();\r
 \r
-                       if( ( portNVIC_SYSTICK_CTRL_REG & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
+                       if( ( ulSysTickCTRL & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
                        {\r
                                unsigned long ulCalculatedLoadValue;\r
 \r
@@ -569,7 +575,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
                        portENTER_CRITICAL();\r
                        {\r
-                               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                               portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
                                vTaskStepTick( ulCompleteTickPeriods );\r
                                portNVIC_SYSTICK_LOAD_REG = ulTimerCountsForOneTick - 1UL;\r
                        }\r
@@ -600,7 +606,7 @@ void xPortSysTickHandler( void )
 \r
                /* Configure SysTick to interrupt at the requested rate. */\r
                portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;;\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG |= ( portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT );\r
        }\r
 \r
 #endif /* configOVERRIDE_DEFAULT_TICK_CONFIGURATION */\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
index 615f2fa8b8f44c6b904361bf9aca7de3c0a01a58..6141aa9a335de257e40bc34be94288c268b3175f 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
@@ -266,6 +266,7 @@ __asm void vPortSVCHandler( void )
        /* Pop the core registers. */\r
        ldmia r0!, {r4-r11, r14}\r
        msr psp, r0\r
+       isb\r
        mov r0, #0\r
        msr     basepri, r0\r
        bx r14\r
@@ -284,6 +285,8 @@ __asm void prvStartFirstTask( void )
        msr msp, r0\r
        /* Globally enable interrupts. */\r
        cpsie i\r
+       dsb\r
+       isb\r
        /* Call SVC to start the first task. */\r
        svc 0\r
        nop\r
@@ -429,7 +432,7 @@ __asm void xPortPendSVHandler( void )
        PRESERVE8\r
 \r
        mrs r0, psp\r
-\r
+       isb\r
        /* Get the location of the current TCB. */\r
        ldr     r3, =pxCurrentTCB\r
        ldr     r2, [r3]\r
@@ -467,11 +470,12 @@ __asm void xPortPendSVHandler( void )
        vldmiaeq r0!, {s16-s31}\r
 \r
        msr psp, r0\r
-\r
+       isb\r
        #ifdef WORKAROUND_PMU_CM001 /* XMC4000 specific errata */\r
                #if WORKAROUND_PMU_CM001 == 1\r
                        push { r14 }\r
                        pop { pc }\r
+                       nop\r
                #endif\r
        #endif\r
 \r
@@ -504,7 +508,7 @@ void xPortSysTickHandler( void )
 \r
        __weak void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )\r
        {\r
-       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements;\r
+       unsigned long ulReloadValue, ulCompleteTickPeriods, ulCompletedSysTickDecrements, ulSysTickCTRL;\r
        portTickType xModifiableIdleTime;\r
 \r
                /* Make sure the SysTick reload value does not overflow the counter. */\r
@@ -517,7 +521,7 @@ void xPortSysTickHandler( void )
                is accounted for as best it can be, but using the tickless mode will\r
                inevitably result in some tiny drift of the time maintained by the\r
                kernel with respect to calendar time. */\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG &= ~portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime\r
                tick periods.  -1 is used because this code will execute part way\r
@@ -541,7 +545,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_LOAD_REG = portNVIC_SYSTICK_CURRENT_VALUE_REG;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Reset the reload register to the value required for normal tick\r
                        periods. */\r
@@ -561,7 +565,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
 \r
                        /* Restart SysTick. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                       portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
 \r
                        /* Sleep until something happens.  configPRE_SLEEP_PROCESSING() can\r
                        set its parameter to 0 to indicate that its implementation contains\r
@@ -582,13 +586,14 @@ void xPortSysTickHandler( void )
                        accounted for as best it can be, but using the tickless mode will\r
                        inevitably result in some tiny drift of the time maintained by the\r
                        kernel with respect to calendar time. */\r
-                       portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
+                       ulSysTickCTRL = portNVIC_SYSTICK_CTRL_REG;\r
+                       portNVIC_SYSTICK_CTRL_REG = ( ulSysTickCTRL & ~portNVIC_SYSTICK_ENABLE_BIT );\r
 \r
                        /* Re-enable interrupts - see comments above __disable_irq() call\r
                        above. */\r
                        __enable_irq();\r
 \r
-                       if( ( portNVIC_SYSTICK_CTRL_REG & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
+                       if( ( ulSysTickCTRL & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
                        {\r
                                unsigned long ulCalculatedLoadValue;\r
 \r
@@ -640,7 +645,7 @@ void xPortSysTickHandler( void )
                        portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;\r
                        portENTER_CRITICAL();\r
                        {\r
-                               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+                               portNVIC_SYSTICK_CTRL_REG |= portNVIC_SYSTICK_ENABLE_BIT;\r
                                vTaskStepTick( ulCompleteTickPeriods );\r
                                portNVIC_SYSTICK_LOAD_REG = ulTimerCountsForOneTick - 1UL;\r
                        }\r
@@ -671,7 +676,7 @@ void xPortSysTickHandler( void )
 \r
                /* Configure SysTick to interrupt at the requested rate. */\r
                portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;;\r
-               portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+               portNVIC_SYSTICK_CTRL_REG |= ( portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT );\r
        }\r
 \r
 #endif /* configOVERRIDE_DEFAULT_TICK_CONFIGURATION */\r

diff --git a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
index aa3e99f33e018583e335ac313b61bc9ae9c4c659..d6c70a2fe1ad673e28222e146e2cd52cf4aafdc6 100644 (file)
--- a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
+++ b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
@@ -73,6 +73,7 @@
 _vector_14: .type func\r
 \r
        mrs r0, psp\r
+       isb\r
 \r
        ;Get the location of the current TCB.\r
        ldr.w   r3, =pxCurrentTCB\r
@@ -110,6 +111,7 @@ _vector_14: .type func
        vldmiaeq r0!, {s16-s31}\r
 \r
        msr psp, r0\r
+       isb\r
        bx r14\r
 \r
        .size   _vector_14, $-_vector_14\r
@@ -125,6 +127,7 @@ _vector_14: .type func
 _lc_ref__vector_pp_14: .type func\r
 \r
        mrs r0, psp\r
+       isb\r
 \r
        ;Get the location of the current TCB.\r
        ldr.w   r3, =pxCurrentTCB\r
@@ -162,6 +165,7 @@ _lc_ref__vector_pp_14: .type func
        vldmiaeq r0!, {s16-s31}\r
 \r
        msr psp, r0\r
+       isb\r
        push { lr }\r
        pop { pc } ; XMC4000 specific errata workaround.  Do not used "bx lr" here.\r
 \r
@@ -181,6 +185,7 @@ SVC_Handler: .type func
        ;Pop the core registers.\r
        ldmia r0!, {r4-r11, r14}\r
        msr psp, r0\r
+       isb\r
        mov r0, #0\r
        msr     basepri, r0\r
        bx r14\r
@@ -201,6 +206,8 @@ vPortStartFirstTask .type func
        msr msp, r0\r
        ;Call SVC to start the first task.\r
        cpsie i\r
+       dsb\r
+       isb\r
        svc 0\r
        .size   vPortStartFirstTask, $-vPortStartFirstTask\r
        .endsec\r

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index d29c071f4a4c355d641d6628081da324e68907a3..5b389c2cf527684d4bf4f720a41eaa962f444de2 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -242,12 +242,12 @@ portBASE_TYPE xReturn = pdFAIL;
                {\r
                        /* Create the timer task, storing its handle in xTimerTaskHandle so\r
                        it can be returned by the xTimerGetTimerDaemonTaskHandle() function. */\r
-                       xReturn = xTaskCreate( prvTimerTask, ( const signed char * const ) "Tmr Svc", ( unsigned short ) configTIMER_TASK_STACK_DEPTH, NULL, ( ( unsigned portBASE_TYPE ) configTIMER_TASK_PRIORITY ) | portPRIVILEGE_BIT, &xTimerTaskHandle );\r
+                       xReturn = xTaskCreate( prvTimerTask, ( signed char * ) "Tmr Svc", ( unsigned short ) configTIMER_TASK_STACK_DEPTH, NULL, ( ( unsigned portBASE_TYPE ) configTIMER_TASK_PRIORITY ) | portPRIVILEGE_BIT, &xTimerTaskHandle );\r
                }\r
                #else\r
                {\r
                        /* Create the timer task without storing its handle. */\r
-                       xReturn = xTaskCreate( prvTimerTask, ( const signed char * const ) "Tmr Svc", ( unsigned short ) configTIMER_TASK_STACK_DEPTH, NULL, ( ( unsigned portBASE_TYPE ) configTIMER_TASK_PRIORITY ) | portPRIVILEGE_BIT, NULL);\r
+                       xReturn = xTaskCreate( prvTimerTask, ( signed char * ) "Tmr Svc", ( unsigned short ) configTIMER_TASK_STACK_DEPTH, NULL, ( ( unsigned portBASE_TYPE ) configTIMER_TASK_PRIORITY ) | portPRIVILEGE_BIT, NULL);\r
                }\r
                #endif\r
        }\r