Update ports that have their tick configuration in an application callback to use...

[freertos] / FreeRTOS / Demo / ColdFire_MCF52233_Eclipse / RTOSDemo / FreeRTOS_Tick_Setup.c

diff --git a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index 4c84befe46656ec19ebd53aa7cc2dfdc4e31a626..53087b765e9886d48384a61d8d81944740ff70cf 100644 (file)
--- a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
+++ b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
@@ -147,14 +147,9 @@ unsigned portLONG ulSavedInterruptMask;
 \r
        /* Increment the RTOS tick. */\r
        ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();\r
-               vTaskIncrementTick();\r
+               if( xTaskIncrementTick() != pdFALSE )\r
+               {\r
+                       taskYIELD();\r
+               }\r
        portCLEAR_INTERRUPT_MASK_FROM_ISR( ulSavedInterruptMask );\r
-\r
-       /* If we are using the pre-emptive scheduler then also request a\r
-       context switch as incrementing the tick could have unblocked a task. */\r
-       #if configUSE_PREEMPTION == 1\r
-       {\r
-               taskYIELD();\r
-       }\r
-       #endif\r
 }\r