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

[freertos] / FreeRTOS / Source / portable / oWatcom / 16BitDOS / PC / port.c

diff --git a/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/port.c b/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/port.c
index ab0552f59f5078f09fcec1685c58ab0812be2f14..145af852960e89581568ff28b27eb809a95e100c 100644 (file)
--- a/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/port.c
+++ b/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/port.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.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
 \r
@@ -105,7 +106,7 @@ Changes from V4.0.1
 #define portTIMER_INT_NUMBER   0x08\r
 \r
 /* Setup hardware for required tick interrupt rate. */\r
-static void prvSetTickFrequency( unsigned long ulTickRateHz );\r
+static void prvSetTickFrequency( uint32_t ulTickRateHz );\r
 \r
 /* Restore hardware to as it was prior to starting the scheduler. */\r
 static void prvExitFunction( void );\r
@@ -136,10 +137,10 @@ static void prvSetTickFrequencyDefault( void );
 /*lint -e956 File scopes necessary here. */\r
 \r
 /* Used to signal when to chain to the DOS tick, and when to just clear the PIC ourselves. */\r
-static short sDOSTickCounter;                                                  \r
+static int16_t sDOSTickCounter;                                                        \r
 \r
 /* Set true when the vectors are set so the scheduler will service the tick. */\r
-static short sSchedulerRunning = pdFALSE;                              \r
+static int16_t sSchedulerRunning = pdFALSE;                            \r
 \r
 /* Points to the original routine installed on the vector we use for manual context switches.  This is then used to restore the original routine during prvExitFunction(). */\r
 static void ( __interrupt __far *pxOldSwitchISR )();           \r
@@ -153,7 +154,7 @@ static jmp_buf xJumpBuf;
 /*lint +e956 */\r
 \r
 /*-----------------------------------------------------------*/\r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
 pxISR pxOriginalTickISR;\r
        \r
@@ -255,7 +256,7 @@ static void prvPortResetPIC( void )
        --sDOSTickCounter;\r
        if( sDOSTickCounter <= 0 )\r
        {\r
-               sDOSTickCounter = ( short ) portTICKS_PER_DOS_TICK;\r
+               sDOSTickCounter = ( int16_t ) portTICKS_PER_DOS_TICK;\r
                __asm{ int      portSWITCH_INT_NUMBER + 1 };             \r
        }\r
        else\r
@@ -305,29 +306,29 @@ void ( __interrupt __far *pxOriginalTickISR )();
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvSetTickFrequency( unsigned long ulTickRateHz )\r
+static void prvSetTickFrequency( uint32_t ulTickRateHz )\r
 {\r
-const unsigned short usPIT_MODE = ( unsigned short ) 0x43;\r
-const unsigned short usPIT0 = ( unsigned short ) 0x40;\r
-const unsigned long ulPIT_CONST = ( unsigned long ) 1193180;\r
-const unsigned short us8254_CTR0_MODE3 = ( unsigned short ) 0x36;\r
-unsigned long ulOutput;\r
+const uint16_t usPIT_MODE = ( uint16_t ) 0x43;\r
+const uint16_t usPIT0 = ( uint16_t ) 0x40;\r
+const uint32_t ulPIT_CONST = ( uint32_t ) 1193180;\r
+const uint16_t us8254_CTR0_MODE3 = ( uint16_t ) 0x36;\r
+uint32_t ulOutput;\r
 \r
        /* Setup the 8245 to tick at the wanted frequency. */\r
        portOUTPUT_BYTE( usPIT_MODE, us8254_CTR0_MODE3 );\r
        ulOutput = ulPIT_CONST / ulTickRateHz;\r
    \r
-       portOUTPUT_BYTE( usPIT0, ( unsigned short )( ulOutput & ( unsigned long ) 0xff ) );\r
+       portOUTPUT_BYTE( usPIT0, ( uint16_t )( ulOutput & ( uint32_t ) 0xff ) );\r
        ulOutput >>= 8;\r
-       portOUTPUT_BYTE( usPIT0, ( unsigned short ) ( ulOutput & ( unsigned long ) 0xff ) );\r
+       portOUTPUT_BYTE( usPIT0, ( uint16_t ) ( ulOutput & ( uint32_t ) 0xff ) );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 static void prvSetTickFrequencyDefault( void )\r
 {\r
-const unsigned short usPIT_MODE = ( unsigned short ) 0x43;\r
-const unsigned short usPIT0 = ( unsigned short ) 0x40;\r
-const unsigned short us8254_CTR0_MODE3 = ( unsigned short ) 0x36;\r
+const uint16_t usPIT_MODE = ( uint16_t ) 0x43;\r
+const uint16_t usPIT0 = ( uint16_t ) 0x40;\r
+const uint16_t us8254_CTR0_MODE3 = ( uint16_t ) 0x36;\r
 \r
        portOUTPUT_BYTE( usPIT_MODE, us8254_CTR0_MODE3 );\r
        portOUTPUT_BYTE( usPIT0,0 );\r