Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CM7 / r0p1 / port.c

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c
index 9a70b68f4f4ef1ee1d51c8b141a453002543f36b..fc8fbabb1baf1fd78c7bab96baf39ba7c331f19a 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.2.2 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -8,7 +8,7 @@
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
 \r
     ***************************************************************************\r
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
@@ -273,7 +273,7 @@ void vPortSVCHandler( void )
                                        "       msr     basepri, r0                                     \n"\r
                                        "       bx r14                                                  \n"\r
                                        "                                                                       \n"\r
-                                       "       .align 2                                                \n"\r
+                                       "       .align 4                                                \n"\r
                                        "pxCurrentTCBConst2: .word pxCurrentTCB                         \n"\r
                                );\r
 }\r
@@ -441,7 +441,7 @@ void xPortPendSVHandler( void )
        "       cpsid i                                                         \n" /* Errata workaround. */\r
        "       msr basepri, r0                                         \n"\r
        "       dsb                                                                     \n"\r
-       "   isb                                                                 \n"\r
+       "       isb                                                                     \n"\r
        "       cpsie i                                                         \n" /* Errata workaround. */\r
        "       bl vTaskSwitchContext                           \n"\r
        "       mov r0, #0                                                      \n"\r
@@ -469,7 +469,7 @@ void xPortPendSVHandler( void )
        "                                                                               \n"\r
        "       bx r14                                                          \n"\r
        "                                                                               \n"\r
-       "       .align 2                                                        \n"\r
+       "       .align 4                                                        \n"\r
        "pxCurrentTCBConst: .word pxCurrentTCB  \n"\r
        ::"i"(configMAX_SYSCALL_INTERRUPT_PRIORITY)\r
        );\r
@@ -482,7 +482,7 @@ void xPortSysTickHandler( void )
        executes all interrupts must be unmasked.  There is therefore no need to\r
        save and then restore the interrupt mask value as its value is already\r
        known. */\r
-       ( void ) portSET_INTERRUPT_MASK_FROM_ISR();\r
+       portDISABLE_INTERRUPTS();\r
        {\r
                /* Increment the RTOS tick. */\r
                if( xTaskIncrementTick() != pdFALSE )\r
@@ -492,7 +492,7 @@ void xPortSysTickHandler( void )
                        portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;\r
                }\r
        }\r
-       portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );\r
+       portENABLE_INTERRUPTS();\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -626,7 +626,7 @@ void xPortSysTickHandler( void )
 \r
                                /* The reload value is set to whatever fraction of a single tick\r
                                period remains. */\r
-                               portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1 ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;\r
+                               portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1UL ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;\r
                        }\r
 \r
                        /* Restart SysTick so it runs from portNVIC_SYSTICK_LOAD_REG\r