/*\r
- FreeRTOS V7.4.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+ FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. \r
+ All rights reserved\r
\r
- FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT\r
- http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
+ VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
\r
***************************************************************************\r
* *\r
- * FreeRTOS tutorial books are available in pdf and paperback. *\r
- * Complete, revised, and edited pdf reference manuals are also *\r
- * available. *\r
+ * FreeRTOS provides completely free yet professionally developed, *\r
+ * robust, strictly quality controlled, supported, and cross *\r
+ * platform software that has become a de facto standard. *\r
* *\r
- * Purchasing FreeRTOS documentation will not only help you, by *\r
- * ensuring you get running as quickly as possible and with an *\r
- * in-depth knowledge of how to use FreeRTOS, it will also help *\r
- * the FreeRTOS project to continue with its mission of providing *\r
- * professional grade, cross platform, de facto standard solutions *\r
- * for microcontrollers - completely free of charge! *\r
+ * Help yourself get started quickly and support the FreeRTOS *\r
+ * project by purchasing a FreeRTOS tutorial book, reference *\r
+ * manual, or both from: http://www.FreeRTOS.org/Documentation *\r
* *\r
- * >>> See http://www.FreeRTOS.org/Documentation for details. <<< *\r
- * *\r
- * Thank you for using FreeRTOS, and thank you for your support! *\r
+ * Thank you! *\r
* *\r
***************************************************************************\r
\r
-\r
This file is part of the FreeRTOS distribution.\r
\r
FreeRTOS is free software; you can redistribute it and/or modify it under\r
the terms of the GNU General Public License (version 2) as published by the\r
- Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
+ Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
\r
- >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to\r
- distribute a combined work that includes FreeRTOS without being obliged to\r
- provide the source code for proprietary components outside of the FreeRTOS\r
- kernel.\r
+ >>! NOTE: The modification to the GPL is included to allow you to !<<\r
+ >>! distribute a combined work that includes FreeRTOS without being !<<\r
+ >>! obliged to provide the source code for proprietary components !<<\r
+ >>! outside of the FreeRTOS kernel. !<<\r
\r
FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\r
- details. You should have received a copy of the GNU General Public License\r
- and the FreeRTOS license exception along with FreeRTOS; if not itcan be\r
- viewed here: http://www.freertos.org/a00114.html and also obtained by\r
- writing to Real Time Engineers Ltd., contact details for whom are available\r
- on the FreeRTOS WEB site.\r
+ FOR A PARTICULAR PURPOSE. Full license text is available from the following\r
+ link: http://www.freertos.org/a00114.html\r
\r
1 tab == 4 spaces!\r
\r
* *\r
***************************************************************************\r
\r
-\r
- http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
+ http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
license and Real Time Engineers Ltd. contact details.\r
\r
http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
- including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
- fully thread aware and reentrant UDP/IP stack.\r
-\r
- http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
- Integrity Systems, who sell the code with commercial support, \r
- indemnification and middleware, under the OpenRTOS brand.\r
- \r
- http://www.SafeRTOS.com - High Integrity Systems also provide a safety \r
- engineered and independently SIL3 certified version for use in safety and \r
+ including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+ compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+ http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
+ Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS\r
+ licenses offer ticketed support, indemnification and middleware.\r
+\r
+ http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+ engineered and independently SIL3 certified version for use in safety and\r
mission critical applications that require provable dependability.\r
+\r
+ 1 tab == 4 spaces!\r
*/\r
\r
/* \r
*----------------------------------------------------------*/\r
\r
/* Start tasks with interrupts enables. */\r
-#define portFLAGS_INT_ENABLED ( ( portSTACK_TYPE ) 0x80 )\r
+#define portFLAGS_INT_ENABLED ( ( StackType_t ) 0x80 )\r
\r
/* Hardware constants for timer 1. */\r
-#define portCLEAR_COUNTER_ON_MATCH ( ( unsigned char ) 0x08 )\r
-#define portPRESCALE_64 ( ( unsigned char ) 0x03 )\r
-#define portCLOCK_PRESCALER ( ( unsigned long ) 64 )\r
-#define portCOMPARE_MATCH_A_INTERRUPT_ENABLE ( ( unsigned char ) 0x10 )\r
+#define portCLEAR_COUNTER_ON_MATCH ( ( uint8_t ) 0x08 )\r
+#define portPRESCALE_64 ( ( uint8_t ) 0x03 )\r
+#define portCLOCK_PRESCALER ( ( uint32_t ) 64 )\r
+#define portCOMPARE_MATCH_A_INTERRUPT_ENABLE ( ( uint8_t ) 0x10 )\r
\r
/*-----------------------------------------------------------*/\r
\r
/* We require the address of the pxCurrentTCB variable, but don't want to know\r
any details of its type. */\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
\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
-unsigned short usAddress;\r
+uint16_t usAddress;\r
\r
/* Place a few bytes of known values on the bottom of the stack. \r
This is just useful for debugging. */\r
\r
/* The start of the task code will be popped off the stack last, so place\r
it on first. */\r
- usAddress = ( unsigned short ) pxCode;\r
- *pxTopOfStack = ( portSTACK_TYPE ) ( usAddress & ( unsigned short ) 0x00ff );\r
+ usAddress = ( uint16_t ) pxCode;\r
+ *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );\r
pxTopOfStack--;\r
\r
usAddress >>= 8;\r
- *pxTopOfStack = ( portSTACK_TYPE ) ( usAddress & ( unsigned short ) 0x00ff );\r
+ *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );\r
pxTopOfStack--;\r
\r
/* Next simulate the stack as if after a call to portSAVE_CONTEXT(). \r
portSAVE_CONTEXT places the flags on the stack immediately after r0\r
to ensure the interrupts get disabled as soon as possible, and so ensuring\r
the stack use is minimal should a context switch interrupt occur. */\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x00; /* R0 */\r
+ *pxTopOfStack = ( StackType_t ) 0x00; /* R0 */\r
pxTopOfStack--;\r
*pxTopOfStack = portFLAGS_INT_ENABLED;\r
pxTopOfStack--;\r
\r
\r
/* Now the remaining registers. The compiler expects R1 to be 0. */\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x00; /* R1 */\r
+ *pxTopOfStack = ( StackType_t ) 0x00; /* R1 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x02; /* R2 */\r
+ *pxTopOfStack = ( StackType_t ) 0x02; /* R2 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x03; /* R3 */\r
+ *pxTopOfStack = ( StackType_t ) 0x03; /* R3 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x04; /* R4 */\r
+ *pxTopOfStack = ( StackType_t ) 0x04; /* R4 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x05; /* R5 */\r
+ *pxTopOfStack = ( StackType_t ) 0x05; /* R5 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x06; /* R6 */\r
+ *pxTopOfStack = ( StackType_t ) 0x06; /* R6 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x07; /* R7 */\r
+ *pxTopOfStack = ( StackType_t ) 0x07; /* R7 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x08; /* R8 */\r
+ *pxTopOfStack = ( StackType_t ) 0x08; /* R8 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x09; /* R9 */\r
+ *pxTopOfStack = ( StackType_t ) 0x09; /* R9 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x10; /* R10 */\r
+ *pxTopOfStack = ( StackType_t ) 0x10; /* R10 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x11; /* R11 */\r
+ *pxTopOfStack = ( StackType_t ) 0x11; /* R11 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x12; /* R12 */\r
+ *pxTopOfStack = ( StackType_t ) 0x12; /* R12 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x13; /* R13 */\r
+ *pxTopOfStack = ( StackType_t ) 0x13; /* R13 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x14; /* R14 */\r
+ *pxTopOfStack = ( StackType_t ) 0x14; /* R14 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x15; /* R15 */\r
+ *pxTopOfStack = ( StackType_t ) 0x15; /* R15 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x16; /* R16 */\r
+ *pxTopOfStack = ( StackType_t ) 0x16; /* R16 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x17; /* R17 */\r
+ *pxTopOfStack = ( StackType_t ) 0x17; /* R17 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x18; /* R18 */\r
+ *pxTopOfStack = ( StackType_t ) 0x18; /* R18 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x19; /* R19 */\r
+ *pxTopOfStack = ( StackType_t ) 0x19; /* R19 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x20; /* R20 */\r
+ *pxTopOfStack = ( StackType_t ) 0x20; /* R20 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x21; /* R21 */\r
+ *pxTopOfStack = ( StackType_t ) 0x21; /* R21 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x22; /* R22 */\r
+ *pxTopOfStack = ( StackType_t ) 0x22; /* R22 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x23; /* R23 */\r
+ *pxTopOfStack = ( StackType_t ) 0x23; /* R23 */\r
pxTopOfStack--;\r
\r
/* Place the parameter on the stack in the expected location. */\r
- usAddress = ( unsigned short ) pvParameters;\r
- *pxTopOfStack = ( portSTACK_TYPE ) ( usAddress & ( unsigned short ) 0x00ff );\r
+ usAddress = ( uint16_t ) pvParameters;\r
+ *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );\r
pxTopOfStack--;\r
\r
usAddress >>= 8;\r
- *pxTopOfStack = ( portSTACK_TYPE ) ( usAddress & ( unsigned short ) 0x00ff );\r
+ *pxTopOfStack = ( StackType_t ) ( usAddress & ( uint16_t ) 0x00ff );\r
pxTopOfStack--;\r
\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x26; /* R26 X */\r
+ *pxTopOfStack = ( StackType_t ) 0x26; /* R26 X */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x27; /* R27 */\r
+ *pxTopOfStack = ( StackType_t ) 0x27; /* R27 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x28; /* R28 Y */\r
+ *pxTopOfStack = ( StackType_t ) 0x28; /* R28 Y */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x29; /* R29 */\r
+ *pxTopOfStack = ( StackType_t ) 0x29; /* R29 */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x30; /* R30 Z */\r
+ *pxTopOfStack = ( StackType_t ) 0x30; /* R30 Z */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) 0x031; /* R31 */\r
+ *pxTopOfStack = ( StackType_t ) 0x031; /* R31 */\r
pxTopOfStack--;\r
\r
/*lint +e950 +e611 +e923 */\r
}\r
/*-----------------------------------------------------------*/\r
\r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
{\r
/* Setup the hardware to generate the tick. */\r
prvSetupTimerInterrupt();\r
void vPortYieldFromTick( void )\r
{\r
portSAVE_CONTEXT();\r
- vTaskIncrementTick();\r
- vTaskSwitchContext();\r
+ if( xTaskIncrementTick() != pdFALSE )\r
+ {\r
+ vTaskSwitchContext();\r
+ }\r
portRESTORE_CONTEXT();\r
\r
asm volatile ( "ret" );\r
*/\r
static void prvSetupTimerInterrupt( void )\r
{\r
-unsigned long ulCompareMatch;\r
-unsigned char ucHighByte, ucLowByte;\r
+uint32_t ulCompareMatch;\r
+uint8_t ucHighByte, ucLowByte;\r
\r
/* Using 16bit timer 1 to generate the tick. Correct fuses must be\r
selected for the configCPU_CLOCK_HZ clock. */\r
ulCompareMatch /= portCLOCK_PRESCALER;\r
\r
/* Adjust for correct value. */\r
- ulCompareMatch -= ( unsigned long ) 1;\r
+ ulCompareMatch -= ( uint32_t ) 1;\r
\r
/* Setup compare match value for compare match A. Interrupts are disabled \r
before this is called so we need not worry here. */\r
- ucLowByte = ( unsigned char ) ( ulCompareMatch & ( unsigned long ) 0xff );\r
+ ucLowByte = ( uint8_t ) ( ulCompareMatch & ( uint32_t ) 0xff );\r
ulCompareMatch >>= 8;\r
- ucHighByte = ( unsigned char ) ( ulCompareMatch & ( unsigned long ) 0xff );\r
+ ucHighByte = ( uint8_t ) ( ulCompareMatch & ( uint32_t ) 0xff );\r
OCR1AH = ucHighByte;\r
OCR1AL = ucLowByte;\r
\r
void SIG_OUTPUT_COMPARE1A( void ) __attribute__ ( ( signal ) );\r
void SIG_OUTPUT_COMPARE1A( void )\r
{\r
- vTaskIncrementTick();\r
+ xTaskIncrementTick();\r
}\r
#endif\r
\r
projects / freertos / blobdiff