/*\r
- FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+ FreeRTOS V7.6.0 - Copyright (C) 2013 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
* We require the address of the pxCurrentTCB variable, but don't want to\r
* know any details of its type.\r
*/\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
* Define minimal-stack constants\r
#define portSTACK_MINIMAL_CALLRETURN_DEPTH ( 10 )\r
#define portSTACK_OTHER_BYTES ( 20 )\r
\r
-unsigned short usCalcMinStackSize = 0;\r
+uint16_t usCalcMinStackSize = 0;\r
\r
/*-----------------------------------------------------------*/\r
\r
/*\r
* We initialise ucCriticalNesting to the middle value an \r
- * unsigned char can contain. This way portENTER_CRITICAL()\r
+ * uint8_t can contain. This way portENTER_CRITICAL()\r
* and portEXIT_CRITICAL() can be called without interrupts\r
* being enabled before the scheduler starts.\r
*/\r
-register unsigned char ucCriticalNesting = 0x7F;\r
+register uint8_t ucCriticalNesting = 0x7F;\r
\r
/*-----------------------------------------------------------*/\r
\r
* Initialise the stack of a new task.\r
* See portSAVE_CONTEXT macro 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
-unsigned char ucScratch;\r
+uint8_t ucScratch;\r
/*\r
* Get the size of the RAMarea in page 0 used by the compiler\r
* We do this here already to avoid W-register conflicts.\r
* First store the function parameters. This is where the task expects\r
* to find them when it starts running.\r
*/\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) ( (( unsigned short ) pvParameters >> 8) & 0x00ff );\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) ( ( unsigned short ) pvParameters & 0x00ff );\r
+ *pxTopOfStack-- = ( StackType_t ) ( (( uint16_t ) pvParameters >> 8) & 0x00ff );\r
+ *pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pvParameters & 0x00ff );\r
\r
/*\r
* Next are all the registers that form part of the task context.\r
*/\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x11; /* STATUS. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x22; /* WREG. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x33; /* BSR. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x44; /* PRODH. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x55; /* PRODL. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x66; /* FSR0H. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x77; /* FSR0L. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x88; /* FSR1H. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x99; /* FSR1L. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0xAA; /* TABLAT. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x11; /* STATUS. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x22; /* WREG. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x33; /* BSR. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x44; /* PRODH. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x55; /* PRODL. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x66; /* FSR0H. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x77; /* FSR0L. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x88; /* FSR1H. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x99; /* FSR1L. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0xAA; /* TABLAT. */\r
#if _ROMSIZE > 0x8000\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0x00; /* TBLPTRU. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0x00; /* TBLPTRU. */\r
#endif\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0xCC; /* TBLPTRH. */\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0xDD; /* TBLPTRL. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0xCC; /* TBLPTRH. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0xDD; /* TBLPTRL. */\r
#if _ROMSIZE > 0x8000\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0xEE; /* PCLATU. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0xEE; /* PCLATU. */\r
#endif\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0xFF; /* PCLATH. */\r
+ *pxTopOfStack-- = ( StackType_t ) 0xFF; /* PCLATH. */\r
\r
/*\r
* Next the compiler's scratchspace.\r
*/\r
while(ucScratch-- > 0)\r
{\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0;\r
+ *pxTopOfStack-- = ( StackType_t ) 0;\r
}\r
\r
/*\r
* functionpointers to point above 64kB in ROM.\r
*/\r
#if _ROMSIZE > 0x8000\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 0;\r
+ *pxTopOfStack-- = ( StackType_t ) 0;\r
#endif\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) ( ( ( unsigned short ) pxCode >> 8 ) & 0x00ff );\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) ( ( unsigned short ) pxCode & 0x00ff );\r
+ *pxTopOfStack-- = ( StackType_t ) ( ( ( uint16_t ) pxCode >> 8 ) & 0x00ff );\r
+ *pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pxCode & 0x00ff );\r
\r
/*\r
* Store the number of return addresses on the hardware stack.\r
* So far only the address of the task entry point.\r
*/\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) 1;\r
+ *pxTopOfStack-- = ( StackType_t ) 1;\r
\r
/*\r
* The code generated by wizC does not maintain separate\r
* track of the critical section nesting. This variable has to be stored\r
* as part of the task context and is initially set to zero.\r
*/\r
- *pxTopOfStack-- = ( portSTACK_TYPE ) portNO_CRITICAL_SECTION_NESTING; \r
+ *pxTopOfStack-- = ( StackType_t ) portNO_CRITICAL_SECTION_NESTING; \r
\r
return pxTopOfStack;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-unsigned short usPortCALCULATE_MINIMAL_STACK_SIZE( void )\r
+uint16_t usPortCALCULATE_MINIMAL_STACK_SIZE( void )\r
{\r
/*\r
* Fetch the size of compiler's scratchspace.\r
\r
/*-----------------------------------------------------------*/\r
\r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
{\r
extern void portSetupTick( void );\r
\r
\r
/*-----------------------------------------------------------*/\r
\r
-void *pvPortMalloc( unsigned short usWantedSize )\r
+void *pvPortMalloc( uint16_t usWantedSize )\r
{\r
void *pvReturn;\r
\r