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

[freertos] / FreeRTOS / Source / portable / Softune / MB91460 / port.c

diff --git a/FreeRTOS/Source/portable/Softune/MB91460/port.c b/FreeRTOS/Source/portable/Softune/MB91460/port.c
index dc75adc6b49394e1a85c5d8a1baf315dbae57d73..92b3a60be237e5c6f57412aac7ec87c1f666ee0b 100644 (file)
--- a/FreeRTOS/Source/portable/Softune/MB91460/port.c
+++ b/FreeRTOS/Source/portable/Softune/MB91460/port.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.1 - 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
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \r
@@ -23,10 +24,10 @@
     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
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -70,8 +71,8 @@
 \r
 /* We require the address of the pxCurrentTCB variable, but don't want to know\r
 any details of its type. */\r
-typedef void tskTCB;\r
-extern volatile tskTCB * volatile pxCurrentTCB;\r
+typedef void TCB_t;\r
+extern volatile TCB_t * volatile pxCurrentTCB;\r
 \r
 /*-----------------------------------------------------------*/\r
  \r
@@ -142,7 +143,7 @@ static void prvSetupTimerInterrupt( void );
  * \r
  * See the header file portable.h.\r
  */\r
-portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )\r
+StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )\r
 {\r
        /* Place a few bytes of known values on the bottom of the stack. \r
        This is just useful for debugging. */\r
@@ -157,63 +158,63 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
        /* This is a redundant push to the stack, it may be required if \r
        in some implementations of the compiler the parameter to the task \r
        is passed on to the stack rather than in R4 register. */\r
-       *pxTopOfStack = (portSTACK_TYPE)(pvParameters);\r
+       *pxTopOfStack = (StackType_t)(pvParameters);\r
        pxTopOfStack--;                  \r
     \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00000000;  /* RP */\r
+       *pxTopOfStack = ( StackType_t ) 0x00000000;     /* RP */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00007777;  /* R7 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00007777;     /* R7 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00006666;  /* R6 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00006666;     /* R6 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00005555;  /* R5 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00005555;     /* R5 */\r
        pxTopOfStack--;\r
        \r
        /* In the current implementation of the compiler the first \r
        parameter to the task (or function) is passed via R4 parameter \r
        to the task, hence the pvParameters pointer is copied into the R4 \r
        register. See compiler manual section 4.6.2 for more information. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) (pvParameters);      /* R4 */\r
+       *pxTopOfStack = ( StackType_t ) (pvParameters); /* R4 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00003333;  /* R3 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00003333;     /* R3 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00002222;  /* R2 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00002222;     /* R2 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00001111;  /* R1 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00001111;     /* R1 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00000001;  /* R0 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00000001;     /* R0 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x0000EEEE;  /* R14 */\r
+       *pxTopOfStack = ( StackType_t ) 0x0000EEEE;     /* R14 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x0000DDDD;  /* R13 */\r
+       *pxTopOfStack = ( StackType_t ) 0x0000DDDD;     /* R13 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x0000CCCC;  /* R12 */\r
+       *pxTopOfStack = ( StackType_t ) 0x0000CCCC;     /* R12 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x0000BBBB;  /* R11 */\r
+       *pxTopOfStack = ( StackType_t ) 0x0000BBBB;     /* R11 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x0000AAAA;  /* R10 */\r
+       *pxTopOfStack = ( StackType_t ) 0x0000AAAA;     /* R10 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00009999;  /* R9 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00009999;     /* R9 */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00008888;  /* R8 */\r
+       *pxTopOfStack = ( StackType_t ) 0x00008888;     /* R8 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x11110000;  /* MDH */\r
+       *pxTopOfStack = ( StackType_t ) 0x11110000;     /* MDH */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x22220000;  /* MDL */\r
+       *pxTopOfStack = ( StackType_t ) 0x22220000;     /* MDL */\r
        pxTopOfStack--;\r
 \r
        /* The start of the task code. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) pxCode;      /* PC */\r
+       *pxTopOfStack = ( StackType_t ) pxCode; /* PC */\r
        pxTopOfStack--;\r
         \r
     /* PS - User Mode, USP, ILM=31, Interrupts enabled */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x001F0030;  /* PS */\r
+       *pxTopOfStack = ( StackType_t ) 0x001F0030;     /* PS */\r
 \r
        return pxTopOfStack;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
        /* Setup the hardware to generate the tick. */\r
        prvSetupTimerInterrupt();\r
@@ -242,7 +243,7 @@ void vPortEndScheduler( void )
 static void prvSetupTimerInterrupt( void )\r
 {\r
 /* The peripheral clock divided by 32 is used by the timer. */\r
-const unsigned short usReloadValue = ( unsigned short ) ( ( ( configPER_CLOCK_HZ / configTICK_RATE_HZ ) / 32UL ) - 1UL );\r
+const uint16_t usReloadValue = ( uint16_t ) ( ( ( configPER_CLOCK_HZ / configTICK_RATE_HZ ) / 32UL ) - 1UL );\r
 \r
        /* Setup RLT0 to generate a tick interrupt. */\r
 \r