Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / RVDS / ARM_CA9 / portmacro.inc

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.inc b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.inc
index c5b7ac05276e8570bad1402855c97ff10e83c1c8..c065fc3ff9f4925af97235bb5872bc8dda4b057f 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.inc
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.inc
@@ -1,5 +1,5 @@
 ;/*\r
-;    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+;    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
 ;    All rights reserved\r
 ;\r
 ;\r
@@ -104,9 +104,6 @@ IRQ_MODE                    EQU             0x12
        MACRO\r
        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, =pxCurrentTCB\r
        LDR             R1, [R0]\r
@@ -120,7 +117,7 @@ IRQ_MODE                    EQU             0x12
        CMP             R1, #0\r
 \r
        ; Restore the floating point context, if any\r
-       LDMFDNE SP!, {R0}\r
+       POPNE   {R0}\r
        VPOPNE  {D16-D31}\r
        VPOPNE  {D0-D15}\r
        VMSRNE  FPSCR, R0\r