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

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

diff --git a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c
index 335710581c8b9c055a912c0bb8882b855e8f0df4..d2d2769fefec0e87a7afea18777ff07bf56e7f90 100644 (file)
--- a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c
+++ b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c
@@ -148,14 +148,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

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

diff --git a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c
index 6727b05eae1934e77e88f21352bec90dfa578690..3b595a9b6730487fdc52b0b2d73f5724e94c5273 100644 (file)
--- a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c
+++ b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c
@@ -148,14 +148,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

diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index 4c84befe46656ec19ebd53aa7cc2dfdc4e31a626..53087b765e9886d48384a61d8d81944740ff70cf 100644 (file)
--- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
+++ b/FreeRTOS/Demo/ColdFire_MCF5282_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

diff --git a/FreeRTOS/Source/portable/GCC/RX600/port.c b/FreeRTOS/Source/portable/GCC/RX600/port.c
index 29731368be92721a27aed8bb493fe1a3f58f7e69..dc41b616c6376aca7096a6aa3f2677c528c88229 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX600/port.c
+++ b/FreeRTOS/Source/portable/GCC/RX600/port.c
@@ -364,7 +364,7 @@ void vTickISR( void )
        necessitates.  Ensure IPL is at the max syscall value first. */\r
        portDISABLE_INTERRUPTS_FROM_KERNEL_ISR();\r
        {\r
-               if( TaskIncrementTick() != pdFALSE )\r
+               if( xTaskIncrementTick() != pdFALSE )\r
                {\r
                        taskYIELD();\r
                }\r