#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
/*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 portBASE_TYPE xSchedulerRunning = pdFALSE; \r
+static BaseType_t xSchedulerRunning = 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
/*lint +e956 */\r
\r
/*-----------------------------------------------------------*/\r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
{\r
pxISR pxOriginalTickISR;\r
\r
--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
}\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 ) 1193180UL;\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 ) 1193180UL;\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
- 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