Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Demo / MB96350_Softune_Dice_Kit / SegmentToggleTasks.c

diff --git a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
index 4944a2bb8f5ba495812da0291261164094818ecf..b4244472918a8cfb4f6d52048690eb240c86d757 100644 (file)
--- a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
+++ b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
@@ -1,69 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.\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
-\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
-     *                                                                       *\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
-     *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
-     *                                                                       *\r
-    ***************************************************************************\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
+    All rights reserved\r

 \r
 \r

+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\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
 \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
-    >>>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.  FreeRTOS is distributed in the hope that it will be useful, but\r
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public\r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
-    by writing to Richard Barry, contact details for whom are available on the\r
-    FreeRTOS WEB site.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
+\r
+    ***************************************************************************\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
+\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.  Full license text is available on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \r
 \r

-    1 tab == 4 spaces!\r
-    \r

     ***************************************************************************\r
      *                                                                       *\r
     ***************************************************************************\r
      *                                                                       *\r

-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that is more than just the market leader, it     *\r
+     *    is the industry's de facto standard.                               *\r

      *                                                                       *\r
      *                                                                       *\r

-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
+     *    Help yourself get started quickly while simultaneously helping     *\r
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *\r
+     *    tutorial book, reference manual, or both:                          *\r
+     *    http://www.FreeRTOS.org/Documentation                              *\r

      *                                                                       *\r
     ***************************************************************************\r
 \r
      *                                                                       *\r
     ***************************************************************************\r
 \r

-    \r
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license \r
-    and contact details.  \r
-    \r
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading\r
+    the FAQ page "My application does not run, what could be wrong?".  Have you\r
+    defined configASSERT()?\r
+\r
+    http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+    embedded software for free we request you assist our global community by\r
+    participating in the support forum.\r
+\r
+    http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+    be as productive as possible as early as possible.  Now you can receive\r
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+    Ltd, and the world's leading authority on the world's leading RTOS.\r
+\r

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool.\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.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and commercial middleware.\r

 \r
 \r

-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
-    the code with commercial support, indemnification, and middleware, under \r
-    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also\r
-    provide a safety engineered and independently SIL3 certified version under \r
-    the SafeRTOS brand: http://www.SafeRTOS.com.\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
 /**\r


@@ -88,7 +89,7 @@
 #define ledNUM_OF_LED_TASKS    ( 7 )\r
 \r
 /* Each task toggles at a frequency that is a multiple of 333ms. */\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
 \r
 /* One co-routine per segment of the right hand display. */\r
 #define ledNUM_OF_LED_CO_ROUTINES      7\r


@@ -102,18 +103,18 @@
 static void vLEDFlashTask( void *pvParameters );\r
 \r
 /* The co-routine that is created 7 times. */\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
 \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
 \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
 \r
 /*-----------------------------------------------------------*/\r
 \r


@@ -129,12 +130,12 @@ signed short sLEDTask;
        for( sLEDTask = 0; sLEDTask < ledNUM_OF_LED_TASKS; ++sLEDTask )\r
        {\r
                /* Spawn the task. */\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
        }\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
 /*-----------------------------------------------------------*/\r
 \r


@@ -179,21 +180,21 @@ short sLEDTask;
 \r
 static void vLEDFlashTask( void * pvParameters )\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
 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
 \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
 \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
        vTaskDelayUntil(). */\r
        xLastFlashTime = xTaskGetTickCount();\r
 \r


@@ -231,17 +232,17 @@ unsigned short usCoroutine;
 }\r
 /*-----------------------------------------------------------*/\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
 {\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
 \r
        /* Co-routines MUST start with a call to crSTART. */\r
        crSTART( xHandle );\r