Update RM48/TMS570 port to use xTaskIncrementTick in place of vTaskIncrementTick.

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

diff --git a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c
index 45c2c850a27f58a2cad7c91cdab44da623e156b7..7aab15e01973f20182c21c71add18c2f11d4d0cb 100644 (file)
--- a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c
+++ b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c
@@ -56,19 +56,19 @@
     ***************************************************************************\r
 \r
 \r
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
     license and Real Time Engineers Ltd. contact details.\r
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
     including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
     fully thread aware and reentrant UDP/IP stack.\r
 \r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
-    Integrity Systems, who sell the code with commercial support, \r
+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
+    Integrity Systems, who sell the code with commercial support,\r
     indemnification and middleware, under the OpenRTOS brand.\r
-    \r
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety \r
-    engineered and independently SIL3 certified version for use in safety and \r
+\r
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+    engineered and independently SIL3 certified version for use in safety and\r
     mission critical applications that require provable dependability.\r
 */\r
 \r
@@ -279,11 +279,11 @@ void vPortEndScheduler(void)
        __interrupt void vPortNonPreemptiveTick( void )\r
        {\r
                /* clear clock interrupt flag */\r
-               RTI->INTFLAG = 0x00000001;\r
+               portRTI_INTFLAG_REG = 0x00000001;\r
 \r
                /* Increment the tick count - this may make a delaying task ready\r
                to run - but a context switch is not performed. */\r
-               vTaskIncrementTick();\r
+               xTaskIncrementTick();\r
        }\r
 \r
  #else\r

diff --git a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm
index 61896add1e8d534a42ccc3a09b6d92bdf6fa4bd3..a30ced7080eee3a17a0f4c0426c7f2888a27d2f1 100644 (file)
--- a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm
+++ b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm
@@ -54,7 +54,7 @@
         .text\r
         .arm\r
         .ref vTaskSwitchContext\r
-        .ref vTaskIncrementTick\r
+        .ref xTaskIncrementTick\r
         .ref ulTaskHasFPUContext\r
                .ref pxCurrentTCB\r
 \r
@@ -225,10 +225,11 @@ vPortPreemptiveTick:
 \r
         ; Increment the tick count, making any adjustments to the blocked lists\r
         ; that may be necessary.\r
-        BL      vTaskIncrementTick\r
+        BL      xTaskIncrementTick\r
 \r
         ; Select the next task to execute.\r
-        BL      vTaskSwitchContext\r
+        CMP    R0, #0\r
+        BLNE    vTaskSwitchContext\r
 \r
         ; Restore the context of the task selected to execute.\r
         portRESTORE_CONTEXT\r