Convert mpre ports to use xTaskIncrementTick() in place of vTaskIncrementTick().

[freertos] / FreeRTOS / Source / portable / GCC / RX600 / port.c

diff --git a/FreeRTOS/Source/portable/GCC/RX600/port.c b/FreeRTOS/Source/portable/GCC/RX600/port.c
index fe6bd1949eca0975f29112fe8aa328fb26d1fca6..29731368be92721a27aed8bb493fe1a3f58f7e69 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX600/port.c
+++ b/FreeRTOS/Source/portable/GCC/RX600/port.c
@@ -94,7 +94,7 @@ PSW is set with U and I set, and PM and IPL clear. */
 #define portINITIAL_FPSW    ( ( portSTACK_TYPE ) 0x00000100 )\r
 \r
 /* These macros allow a critical section to be added around the call to\r
-vTaskIncrementTick(), which is only ever called from interrupts at the kernel \r
+xTaskIncrementTick(), which is only ever called from interrupts at the kernel \r
 priority - ie a known priority.  Therefore these local macros are a slight \r
 optimisation compared to calling the global SET/CLEAR_INTERRUPT_MASK macros, \r
 which would require the old IPL to be read first and stored in a local variable. */\r
@@ -364,14 +364,12 @@ void vTickISR( void )
        necessitates.  Ensure IPL is at the max syscall value first. */\r
        portDISABLE_INTERRUPTS_FROM_KERNEL_ISR();\r
        {\r
-               vTaskIncrementTick(); \r
+               if( TaskIncrementTick() != pdFALSE )\r
+               {\r
+                       taskYIELD();\r
+               }\r
        }\r
        portENABLE_INTERRUPTS_FROM_KERNEL_ISR();\r
-       \r
-       /* Only select a new task if the preemptive scheduler is being used. */\r
-       #if( configUSE_PREEMPTION == 1 )\r
-               taskYIELD();\r
-       #endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r