X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FMB96350_Softune_Dice_Kit%2FSegmentToggleTasks.c;h=b4244472918a8cfb4f6d52048690eb240c86d757;hb=refs%2Ftags%2FV9.0.0rc2;hp=d7a9b5730eae5015d5267bcfe36daaf812253324;hpb=61e4c8bcd10d8a2d87dfda1962932c88f0c7a92f;p=freertos diff --git a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c index d7a9b5730..b42444729 100644 --- a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c +++ b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c @@ -1,60 +1,64 @@ /* - FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd. + FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. - *************************************************************************** - * * - * FreeRTOS provides completely free yet professionally developed, * - * robust, strictly quality controlled, supported, and cross * - * platform software that has become a de facto standard. * - * * - * Help yourself get started quickly and support the FreeRTOS * - * project by purchasing a FreeRTOS tutorial book, reference * - * manual, or both from: http://www.FreeRTOS.org/Documentation * - * * - * Thank you! * - * * - *************************************************************************** - This file is part of the FreeRTOS distribution. FreeRTOS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License (version 2) as published by the - Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception. + Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception. - >>! NOTE: The modification to the GPL is included to allow you to distribute - >>! a combined work that includes FreeRTOS without being obliged to provide - >>! the source code for proprietary components outside of the FreeRTOS - >>! kernel. + *************************************************************************** + >>! NOTE: The modification to the GPL is included to allow you to !<< + >>! distribute a combined work that includes FreeRTOS without being !<< + >>! obliged to provide the source code for proprietary components !<< + >>! outside of the FreeRTOS kernel. !<< + *************************************************************************** FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. Full license text is available from the following + FOR A PARTICULAR PURPOSE. Full license text is available on the following link: http://www.freertos.org/a00114.html - 1 tab == 4 spaces! - *************************************************************************** * * - * Having a problem? Start by reading the FAQ "My application does * - * not run, what could be wrong?" * + * FreeRTOS provides completely free yet professionally developed, * + * robust, strictly quality controlled, supported, and cross * + * platform software that is more than just the market leader, it * + * is the industry's de facto standard. * * * - * http://www.FreeRTOS.org/FAQHelp.html * + * Help yourself get started quickly while simultaneously helping * + * to support the FreeRTOS project by purchasing a FreeRTOS * + * tutorial book, reference manual, or both: * + * http://www.FreeRTOS.org/Documentation * * * *************************************************************************** - http://www.FreeRTOS.org - Documentation, books, training, latest versions, - license and Real Time Engineers Ltd. contact details. + http://www.FreeRTOS.org/FAQHelp.html - Having a problem? Start by reading + the FAQ page "My application does not run, what could be wrong?". Have you + defined configASSERT()? + + http://www.FreeRTOS.org/support - In return for receiving this top quality + embedded software for free we request you assist our global community by + participating in the support forum. + + http://www.FreeRTOS.org/training - Investing in training allows your team to + be as productive as possible as early as possible. Now you can receive + FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers + Ltd, and the world's leading authority on the world's leading RTOS. http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, including FreeRTOS+Trace - an indispensable productivity tool, a DOS compatible FAT file system, and our tiny thread aware UDP/IP stack. - http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High - Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS - licenses offer ticketed support, indemnification and middleware. + http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate. + Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS. + + http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High + Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS + licenses offer ticketed support, indemnification and commercial middleware. http://www.SafeRTOS.com - High Integrity Systems also provide a safety engineered and independently SIL3 certified version for use in safety and @@ -85,7 +89,7 @@ #define ledNUM_OF_LED_TASKS ( 7 ) /* Each task toggles at a frequency that is a multiple of 333ms. */ -#define ledFLASH_RATE_BASE ( ( portTickType ) 333 ) +#define ledFLASH_RATE_BASE ( ( TickType_t ) 333 ) /* One co-routine per segment of the right hand display. */ #define ledNUM_OF_LED_CO_ROUTINES 7 @@ -106,11 +110,11 @@ static void vLEDCoRoutineControlTask( void *pvParameters ); /* Handles to each of the 7 tasks. Used so the tasks can be suspended and resumed. */ -static xTaskHandle xFlashTaskHandles[ ledNUM_OF_LED_TASKS ] = { 0 }; +static TaskHandle_t xFlashTaskHandles[ ledNUM_OF_LED_TASKS ] = { 0 }; /* Handle to the task in which the co-routines run. Used so the co-routines can be suspended and resumed. */ -static xTaskHandle xCoroutineTask; +static TaskHandle_t xCoroutineTask; /*-----------------------------------------------------------*/ @@ -176,19 +180,19 @@ short sLEDTask; static void vLEDFlashTask( void * pvParameters ) { -portTickType xFlashRate, xLastFlashTime; +TickType_t xFlashRate, xLastFlashTime; unsigned short usLED; /* The LED to flash is passed in as the task parameter. */ usLED = ( unsigned short ) pvParameters; /* Calculate the rate at which this task is going to toggle its LED. */ - xFlashRate = ledFLASH_RATE_BASE + ( ledFLASH_RATE_BASE * ( portTickType ) usLED ); - xFlashRate /= portTICK_RATE_MS; + xFlashRate = ledFLASH_RATE_BASE + ( ledFLASH_RATE_BASE * ( TickType_t ) usLED ); + xFlashRate /= portTICK_PERIOD_MS; /* We will turn the LED on and off again in the delay period, so each delay is only half the total period. */ - xFlashRate /= ( portTickType ) 2; + xFlashRate /= ( TickType_t ) 2; /* We need to initialise xLastFlashTime prior to the first call to vTaskDelayUntil(). */ @@ -232,13 +236,13 @@ static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned short us { /* The usIndex parameter of the co-routine function is used as an index into the xFlashRates array to obtain the delay period to use. */ -static const portTickType xFlashRates[ ledNUM_OF_LED_CO_ROUTINES ] = { 150 / portTICK_RATE_MS, - 300 / portTICK_RATE_MS, - 450 / portTICK_RATE_MS, - 600 / portTICK_RATE_MS, - 750 / portTICK_RATE_MS, - 900 / portTICK_RATE_MS, - 1050 / portTICK_RATE_MS }; +static const TickType_t xFlashRates[ ledNUM_OF_LED_CO_ROUTINES ] = { 150 / portTICK_PERIOD_MS, + 300 / portTICK_PERIOD_MS, + 450 / portTICK_PERIOD_MS, + 600 / portTICK_PERIOD_MS, + 750 / portTICK_PERIOD_MS, + 900 / portTICK_PERIOD_MS, + 1050 / portTICK_PERIOD_MS }; /* Co-routines MUST start with a call to crSTART. */ crSTART( xHandle );