Update version number to 8.1.2 after moving the defaulting of configUSE_PORT_OPTIMISE...

[freertos] / FreeRTOS / Source / portable / IAR / RL78 / portasm.s87

diff --git a/FreeRTOS/Source/portable/IAR/RL78/portasm.s87 b/FreeRTOS/Source/portable/IAR/RL78/portasm.s87
index c20ef360d953e137674d2fb5bda2ffb97e978c0d..a666db54dbe76df826893fa77452310885270183 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/RL78/portasm.s87
+++ b/FreeRTOS/Source/portable/IAR/RL78/portasm.s87
@@ -1,6 +1,7 @@
 ;/*\r
-;    FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.\r
-;      \r
+;    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+;    All rights reserved\r
+;\r
 ;\r
 ;    ***************************************************************************\r
 ;     *                                                                       *\r
@@ -53,11 +54,6 @@
 \r
 #include "ISR_Support.h"\r
 \r
-\r
-#if __CORE__ != __RL78_1__\r
-       #error "This file is only for RL78 Devices"\r
-#endif\r
-\r
 #define CS                    0xFFFFC\r
 #define ES                    0xFFFFD\r
 \r
@@ -66,7 +62,7 @@
        PUBLIC    vPortTickISR\r
 \r
        EXTERN    vTaskSwitchContext\r
-       EXTERN    vTaskIncrementTick\r
+       EXTERN    xTaskIncrementTick\r
 \r
 ; FreeRTOS yield handler.  This is installed as the BRK software interrupt\r
 ; handler.\r
@@ -77,7 +73,7 @@ vPortYield:
        portRESTORE_CONTEXT                     ; Restore the context of the next task to run.\r
        retb\r
 \r
-       \r
+\r
 ; Starts the scheduler by restoring the context of the task that will execute\r
 ; first.\r
     RSEG CODE:CODE\r
@@ -91,19 +87,19 @@ vPortStartFirstTask:
         RSEG CODE:CODE\r
 vPortTickISR:\r
 \r
-       portSAVE_CONTEXT                        ; Save the context of the current task.\r
-       call      vTaskIncrementTick    ; Call the timer tick function.\r
-#if configUSE_PREEMPTION == 1\r
-       call      vTaskSwitchContext    ; Call the scheduler to select the next task.\r
-#endif\r
-       portRESTORE_CONTEXT                     ; Restore the context of the next task to run.\r
+       portSAVE_CONTEXT                       ; Save the context of the current task.\r
+       call    xTaskIncrementTick     ; Call the timer tick function.\r
+       cmpw    ax, #0x00\r
+       skz\r
+       call    vTaskSwitchContext     ; Call the scheduler to select the next task.\r
+       portRESTORE_CONTEXT                    ; Restore the context of the next task to run.\r
        reti\r
 \r
 \r
 ; Install the interrupt handlers\r
 \r
        COMMON INTVEC:CODE:ROOT(1)\r
-       ORG 56\r
+       ORG configTICK_VECTOR\r
        DW vPortTickISR\r
 \r
        COMMON INTVEC:CODE:ROOT(1)\r