Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CA9 / portASM.S

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S b/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S
index 39556686865621b1ed8b582e5f34e777a2fae4ab..6fbde1ea06d81e3989e7fd1ad5ec3de7ee9a0b6a 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S
+++ b/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
 \r
@@ -76,7 +76,6 @@
        .global FreeRTOS_IRQ_Handler\r
        .global FreeRTOS_SWI_Handler\r
        .global vPortRestoreTaskContext\r
-       .global vPortInstallFreeRTOSVectorTable\r
 \r
 \r
 \r
@@ -120,9 +119,6 @@
 \r
 .macro portRESTORE_CONTEXT\r
 \r
-       /* Switch to system mode. */\r
-       CPS             #SYS_MODE\r
-\r
        /* Set the SP to point to the stack of the task being restored. */\r
        LDR             R0, pxCurrentTCBConst\r
        LDR             R1, [R0]\r
@@ -168,7 +164,7 @@
 \r
 \r
 /******************************************************************************\r
- * SVC handler is used to start the scheduler and yield a task.\r
+ * SVC handler is used to start the scheduler.\r
  *****************************************************************************/\r
 .align 4\r
 .type FreeRTOS_SWI_Handler, %function\r
@@ -177,9 +173,16 @@ FreeRTOS_SWI_Handler:
        portSAVE_CONTEXT\r
        LDR R0, vTaskSwitchContextConst\r
        BLX     R0\r
+       portRESTORE_CONTEXT\r
+\r
 \r
+/******************************************************************************\r
+ * vPortRestoreTaskContext is used to start the scheduler.\r
+ *****************************************************************************/\r
 .type vPortRestoreTaskContext, %function\r
 vPortRestoreTaskContext:\r
+       /* Switch to system mode. */\r
+       CPS             #SYS_MODE\r
        portRESTORE_CONTEXT\r
 \r
 .align 4\r