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

[freertos] / FreeRTOS / Source / portable / IAR / ARM_CA9 / portASM.h

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CA9/portASM.h b/FreeRTOS/Source/portable/IAR/ARM_CA9/portASM.h
index 5c58d0aaa59492db0bb4a3ce9724de407d0cc99d..8283959c677a17cf28f059f6004f3d941bd53ed7 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CA9/portASM.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA9/portASM.h
@@ -1,5 +1,6 @@
 ;/*\r
-;    FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+;    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+;    All rights reserved\r
 ;\r
 ;\r
 ;    ***************************************************************************\r
@@ -96,9 +97,6 @@ portSAVE_CONTEXT macro
 \r
 portRESTORE_CONTEXT macro\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
@@ -112,7 +110,7 @@ portRESTORE_CONTEXT macro
        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