Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / Tasking / ARM_CM4F / port_asm.asm

diff --git a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
index 5726ceb05b238e3b64a58167b3abe45ac55313f2..8b8cd94fbf46ab31147a0528b13baf8fe77c3b13 100644 (file)
--- a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
+++ b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
@@ -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
@@ -92,6 +92,7 @@ _vector_14: .type func
 \r
        stmdb sp!, {r3}\r
        ldr.w r0, =ulMaxSyscallInterruptPriorityConst\r
+       ldr r0, [r0]\r
        msr basepri, r0\r
        bl vTaskSwitchContext\r
        mov r0, #0\r
@@ -146,6 +147,7 @@ _lc_ref__vector_pp_14: .type func
 \r
        stmdb sp!, {r3}\r
        ldr.w r0, =ulMaxSyscallInterruptPriorityConst\r
+       ldr r0, [r0]\r
        msr basepri, r0\r
        bl vTaskSwitchContext\r
        mov r0, #0\r
@@ -206,6 +208,7 @@ vPortStartFirstTask .type func
        msr msp, r0\r
        ;Call SVC to start the first task.\r
        cpsie i\r
+       cpsie f\r
        dsb\r
        isb\r
        svc 0\r
@@ -237,6 +240,7 @@ vPortEnableVFP .type func
 ulPortSetInterruptMask:\r
        mrs r0, basepri\r
        ldr.w r1, =ulMaxSyscallInterruptPriorityConst\r
+       ldr r1, [r1]\r
        msr basepri, r1\r
        bx r14\r
        .size   ulPortSetInterruptMask, $-ulPortSetInterruptMask\r