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

[freertos] / FreeRTOS / Source / portable / Paradigm / Tern_EE / large_untested / port.c

diff --git a/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/port.c b/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/port.c
index 36c03c23d8187f1198967a1f81c7c0cc964d6017..26b84733865c7f798cc93dfd49d9a41a0add8558 100644 (file)
--- a/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/port.c
+++ b/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/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
@@ -79,10 +79,10 @@
 #include "portasm.h"\r
 \r
 /* The timer increments every four clocks, hence the divide by 4. */\r
-#define portTIMER_COMPARE ( unsigned short ) ( ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) / ( unsigned long ) 4 )\r
+#define portTIMER_COMPARE ( uint16_t ) ( ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) / ( uint32_t ) 4 )\r
 \r
 /* From the RDC data sheet. */\r
-#define portENABLE_TIMER_AND_INTERRUPT ( unsigned short ) 0xe001\r
+#define portENABLE_TIMER_AND_INTERRUPT ( uint16_t ) 0xe001\r
 \r
 /* Interrupt control. */\r
 #define portEIO_REGISTER 0xff22\r
@@ -113,9 +113,9 @@ static void __interrupt __far prvDummyISR( void );
 \r
 /*-----------------------------------------------------------*/\r
 /* See header file for description. */\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
-portSTACK_TYPE DS_Reg = 0;\r
+StackType_t DS_Reg = 0;\r
 \r
        /* Place a few bytes of known values on the bottom of the stack.\r
        This is just useful for debugging. */\r
@@ -151,15 +151,15 @@ portSTACK_TYPE DS_Reg = 0;
        /* The remaining registers would be pushed on the stack by our context\r
        switch function.  These are loaded with values simply to make debugging\r
        easier. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xAAAA;      /* AX */\r
+       *pxTopOfStack = ( StackType_t ) 0xAAAA; /* AX */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xBBBB;      /* BX */\r
+       *pxTopOfStack = ( StackType_t ) 0xBBBB; /* BX */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xCCCC;      /* CX */\r
+       *pxTopOfStack = ( StackType_t ) 0xCCCC; /* CX */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xDDDD;      /* DX */\r
+       *pxTopOfStack = ( StackType_t ) 0xDDDD; /* DX */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xEEEE;      /* ES */\r
+       *pxTopOfStack = ( StackType_t ) 0xEEEE; /* ES */\r
        pxTopOfStack--;\r
 \r
        /* We need the true data segment. */\r
@@ -167,17 +167,17 @@ portSTACK_TYPE DS_Reg = 0;
 \r
        *pxTopOfStack = DS_Reg;                                         /* DS */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x0123;      /* SI */\r
+       *pxTopOfStack = ( StackType_t ) 0x0123; /* SI */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xDDDD;      /* DI */\r
+       *pxTopOfStack = ( StackType_t ) 0xDDDD; /* DI */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xBBBB;      /* BP */\r
+       *pxTopOfStack = ( StackType_t ) 0xBBBB; /* BP */\r
 \r
        return pxTopOfStack;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
        /* This is called with interrupts already disabled. */\r
 \r
@@ -248,8 +248,8 @@ void vPortEndScheduler( void )
 \r
 static void prvSetupTimerInterrupt( void )\r
 {\r
-const unsigned short usTimerACompare = portTIMER_COMPARE, usTimerAMode = portENABLE_TIMER_AND_INTERRUPT;\r
-const unsigned short usT2_IRQ = 0x13;\r
+const uint16_t usTimerACompare = portTIMER_COMPARE, usTimerAMode = portENABLE_TIMER_AND_INTERRUPT;\r
+const uint16_t usT2_IRQ = 0x13;\r
 \r
        /* Configure the timer, the dummy handler is used here as the init\r
        function leaves interrupts enabled. */\r