/*\r
- FreeRTOS V7.5.2 - 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
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
\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
\r
- >>! NOTE: The modification to the GPL is included to allow you to distribute\r
- >>! a combined work that includes FreeRTOS without being obliged to provide\r
- >>! 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
#define ledNUM_OF_LED_TASKS ( 7 )\r
\r
/* Each task toggles at a frequency that is a multiple of 333ms. */\r
-#define ledFLASH_RATE_BASE ( ( portTickType ) 333 )\r
+#define ledFLASH_RATE_BASE ( ( TickType_t ) 333 )\r
\r
/* One co-routine per segment of the right hand display. */\r
#define ledNUM_OF_LED_CO_ROUTINES 7\r
static void vLEDFlashTask( void *pvParameters );\r
\r
/* The co-routine that is created 7 times. */\r
-static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned short usIndex );\r
+static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned short usIndex );\r
\r
/* This task is created once, but itself creates 7 co-routines. */\r
static void vLEDCoRoutineControlTask( void *pvParameters );\r
\r
/* Handles to each of the 7 tasks. Used so the tasks can be suspended\r
and resumed. */\r
-static xTaskHandle xFlashTaskHandles[ ledNUM_OF_LED_TASKS ] = { 0 };\r
+static TaskHandle_t xFlashTaskHandles[ ledNUM_OF_LED_TASKS ] = { 0 };\r
\r
/* Handle to the task in which the co-routines run. Used so the\r
co-routines can be suspended and resumed. */\r
-static xTaskHandle xCoroutineTask;\r
+static TaskHandle_t xCoroutineTask;\r
\r
/*-----------------------------------------------------------*/\r
\r
for( sLEDTask = 0; sLEDTask < ledNUM_OF_LED_TASKS; ++sLEDTask )\r
{\r
/* Spawn the task. */\r
- xTaskCreate( vLEDFlashTask, ( signed char * ) "LEDt", configMINIMAL_STACK_SIZE, ( void * ) sLEDTask, ( tskIDLE_PRIORITY + 1 ), &( xFlashTaskHandles[ sLEDTask ] ) );\r
+ xTaskCreate( vLEDFlashTask, "LEDt", configMINIMAL_STACK_SIZE, ( void * ) sLEDTask, ( tskIDLE_PRIORITY + 1 ), &( xFlashTaskHandles[ sLEDTask ] ) );\r
}\r
\r
/* Create the task in which the co-routines run. The co-routines themselves\r
are created within the task. */\r
- xTaskCreate( vLEDCoRoutineControlTask, ( signed char * ) "LEDc", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, &xCoroutineTask );\r
+ xTaskCreate( vLEDCoRoutineControlTask, "LEDc", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, &xCoroutineTask );\r
}\r
/*-----------------------------------------------------------*/\r
\r
\r
static void vLEDFlashTask( void * pvParameters )\r
{\r
-portTickType xFlashRate, xLastFlashTime;\r
+TickType_t xFlashRate, xLastFlashTime;\r
unsigned short usLED;\r
\r
/* The LED to flash is passed in as the task parameter. */\r
usLED = ( unsigned short ) pvParameters;\r
\r
/* Calculate the rate at which this task is going to toggle its LED. */\r
- xFlashRate = ledFLASH_RATE_BASE + ( ledFLASH_RATE_BASE * ( portTickType ) usLED );\r
- xFlashRate /= portTICK_RATE_MS;\r
+ xFlashRate = ledFLASH_RATE_BASE + ( ledFLASH_RATE_BASE * ( TickType_t ) usLED );\r
+ xFlashRate /= portTICK_PERIOD_MS;\r
\r
/* We will turn the LED on and off again in the delay period, so each\r
delay is only half the total period. */\r
- xFlashRate /= ( portTickType ) 2;\r
+ xFlashRate /= ( TickType_t ) 2;\r
\r
- /* We need to initialise xLastFlashTime prior to the first call to \r
+ /* We need to initialise xLastFlashTime prior to the first call to\r
vTaskDelayUntil(). */\r
xLastFlashTime = xTaskGetTickCount();\r
\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned short usIndex )\r
+static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned short usIndex )\r
{\r
/* The usIndex parameter of the co-routine function is used as an index into\r
the xFlashRates array to obtain the delay period to use. */\r
-static const portTickType xFlashRates[ ledNUM_OF_LED_CO_ROUTINES ] = { 150 / portTICK_RATE_MS,\r
- 300 / portTICK_RATE_MS,\r
- 450 / portTICK_RATE_MS,\r
- 600 / portTICK_RATE_MS,\r
- 750 / portTICK_RATE_MS,\r
- 900 / portTICK_RATE_MS,\r
- 1050 / portTICK_RATE_MS };\r
+static const TickType_t xFlashRates[ ledNUM_OF_LED_CO_ROUTINES ] = { 150 / portTICK_PERIOD_MS,\r
+ 300 / portTICK_PERIOD_MS,\r
+ 450 / portTICK_PERIOD_MS,\r
+ 600 / portTICK_PERIOD_MS,\r
+ 750 / portTICK_PERIOD_MS,\r
+ 900 / portTICK_PERIOD_MS,\r
+ 1050 / portTICK_PERIOD_MS };\r
\r
/* Co-routines MUST start with a call to crSTART. */\r
crSTART( xHandle );\r
projects / freertos / blobdiff