Update version number in preparation for maintenance release.

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CRx_No_GIC / port.c

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c b/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c
index 1fd906bb5f0b915ab5910462b55d312c1c8de6be..b8399c56353ed01a37e33af16cf965bd7fc69208 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.2.2 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.1 - Copyright (C) 2017 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
@@ -113,7 +113,7 @@ mode. */
 #define portAPSR_USER_MODE                             ( 0x10 )\r
 \r
 /* Let the user override the pre-loading of the initial LR with the address of\r
-prvTaskExitError() in case is messes up unwinding of the stack in the\r
+prvTaskExitError() in case it messes up unwinding of the stack in the\r
 debugger. */\r
 #ifdef configTASK_RETURN_ADDRESS\r
        #define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS\r
@@ -268,7 +268,7 @@ uint32_t ulAPSR;
                vPortRestoreTaskContext();\r
        }\r
 \r
-       /* Will only get here if xTaskStartScheduler() was called with the CPU in\r
+       /* Will only get here if vTaskStartScheduler() was called with the CPU in\r
        a non-privileged mode or the binary point register was not set to its lowest\r
        possible value.  prvTaskExitError() is referenced to prevent a compiler\r
        warning about it being defined but not referenced in the case that the user\r
@@ -329,7 +329,9 @@ void vPortExitCritical( void )
 \r
 void FreeRTOS_Tick_Handler( void )\r
 {\r
-       portDISABLE_INTERRUPTS();\r
+uint32_t ulInterruptStatus;\r
+\r
+       ulInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
 \r
        /* Increment the RTOS tick. */\r
        if( xTaskIncrementTick() != pdFALSE )\r
@@ -337,7 +339,8 @@ void FreeRTOS_Tick_Handler( void )
                ulPortYieldRequired = pdTRUE;\r
        }\r
 \r
-       portENABLE_INTERRUPTS();\r
+       portCLEAR_INTERRUPT_MASK_FROM_ISR( ulInterruptStatus );\r
+\r
        configCLEAR_TICK_INTERRUPT();\r
 }\r
 /*-----------------------------------------------------------*/\r