Change version numbers ready for V8.0.0 release candidate 1 tag.

[freertos] / FreeRTOS / Source / portable / CodeWarrior / HCS12 / port.c

diff --git a/FreeRTOS/Source/portable/CodeWarrior/HCS12/port.c b/FreeRTOS/Source/portable/CodeWarrior/HCS12/port.c
index e21b522e25f410df81df7f7eb1d29059cc9331ce..ae4aa0d602a89c48234882859074ad3fc8458b5a 100644 (file)
--- a/FreeRTOS/Source/portable/CodeWarrior/HCS12/port.c
+++ b/FreeRTOS/Source/portable/CodeWarrior/HCS12/port.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.0.0:rc1 - 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
@@ -93,7 +93,7 @@ scheduler startup function. */
        start the scheduler directly because the header file containing the \r
        xPortStartScheduler() prototype is part of the common kernel code, and \r
        therefore cannot use the CODE_SEG pragma. */\r
-       static portBASE_TYPE xBankedStartScheduler( void );\r
+       static BaseType_t xBankedStartScheduler( void );\r
 \r
 #pragma CODE_SEG DEFAULT\r
 \r
@@ -103,24 +103,24 @@ until the nesting depth reaches 0.  This variable simply tracks the nesting
 depth.  Each task maintains it's own critical nesting depth variable so \r
 uxCriticalNesting is saved and restored from the task stack during a context\r
 switch. */\r
-volatile unsigned portBASE_TYPE uxCriticalNesting = 0xff;\r
+volatile UBaseType_t uxCriticalNesting = 0xff;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* \r
  * See header file for description. \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
        /* \r
                Place a few bytes of known values on the bottom of the stack.\r
                This can be uncommented to provide useful stack markers when debugging.\r
 \r
-               *pxTopOfStack = ( portSTACK_TYPE ) 0x11;\r
+               *pxTopOfStack = ( StackType_t ) 0x11;\r
                pxTopOfStack--;\r
-               *pxTopOfStack = ( portSTACK_TYPE ) 0x22;\r
+               *pxTopOfStack = ( StackType_t ) 0x22;\r
                pxTopOfStack--;\r
-               *pxTopOfStack = ( portSTACK_TYPE ) 0x33;\r
+               *pxTopOfStack = ( StackType_t ) 0x33;\r
                pxTopOfStack--;\r
        */\r
 \r
@@ -132,47 +132,47 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
 \r
 \r
        /* The address of the task function is placed in the stack byte at a time. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) *( ((portSTACK_TYPE *) (&pxCode) ) + 1 );\r
+       *pxTopOfStack = ( StackType_t ) *( ((StackType_t *) (&pxCode) ) + 1 );\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) *( ((portSTACK_TYPE *) (&pxCode) ) + 0 );\r
+       *pxTopOfStack = ( StackType_t ) *( ((StackType_t *) (&pxCode) ) + 0 );\r
        pxTopOfStack--;\r
 \r
        /* Next are all the registers that form part of the task context. */\r
 \r
        /* Y register */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xff;\r
+       *pxTopOfStack = ( StackType_t ) 0xff;\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xee;\r
+       *pxTopOfStack = ( StackType_t ) 0xee;\r
        pxTopOfStack--;\r
 \r
        /* X register */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xdd;\r
+       *pxTopOfStack = ( StackType_t ) 0xdd;\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xcc;\r
+       *pxTopOfStack = ( StackType_t ) 0xcc;\r
        pxTopOfStack--;\r
  \r
        /* A register contains parameter high byte. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) *( ((portSTACK_TYPE *) (&pvParameters) ) + 0 );\r
+       *pxTopOfStack = ( StackType_t ) *( ((StackType_t *) (&pvParameters) ) + 0 );\r
        pxTopOfStack--;\r
 \r
        /* B register contains parameter low byte. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) *( ((portSTACK_TYPE *) (&pvParameters) ) + 1 );\r
+       *pxTopOfStack = ( StackType_t ) *( ((StackType_t *) (&pvParameters) ) + 1 );\r
        pxTopOfStack--;\r
 \r
        /* CCR: Note that when the task starts interrupts will be enabled since\r
        "I" bit of CCR is cleared */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00;\r
+       *pxTopOfStack = ( StackType_t ) 0x00;\r
        pxTopOfStack--;\r
        \r
        #ifdef BANKED_MODEL\r
                /* The page of the task. */\r
-               *pxTopOfStack = ( portSTACK_TYPE ) ( ( int ) pxCode );\r
+               *pxTopOfStack = ( StackType_t ) ( ( int ) pxCode );\r
                pxTopOfStack--;\r
        #endif\r
        \r
        /* Finally the critical nesting depth is initialised with 0 (not within\r
        a critical section). */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x00;\r
+       *pxTopOfStack = ( StackType_t ) 0x00;\r
 \r
        return pxTopOfStack;\r
 }\r
@@ -191,7 +191,7 @@ static void prvSetupTimerInterrupt( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
        /* xPortStartScheduler() does not start the scheduler directly because \r
        the header file containing the xPortStartScheduler() prototype is part \r
@@ -205,7 +205,7 @@ portBASE_TYPE xPortStartScheduler( void )
 \r
 #pragma CODE_SEG __NEAR_SEG NON_BANKED\r
 \r
-static portBASE_TYPE xBankedStartScheduler( void )\r
+static BaseType_t xBankedStartScheduler( void )\r
 {\r
        /* Configure the timer that will generate the RTOS tick.  Interrupts are\r
        disabled when this function is called. */\r