Ensure both one-shot and auto-reload are written consistently with a hyphen in comments.

[freertos] / FreeRTOS / Demo / CORTEX_MB9A310_IAR_Keil / main-full.c

diff --git a/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c b/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c
index b787eacf5f0d2509e72aaa2f778746ed05c419ec..bde9d9add8c272ffc180b6119940941fb659597c 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c
+++ b/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c
@@ -1,67 +1,29 @@
 /*\r
 /*\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
-    ***************************************************************************\r
-     *                                                                       *\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
-     *    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
-     *    Thank you!                                                         *\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
-\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
-\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 from the following\r
-    link: http://www.freertos.org/a00114.html\r
-\r
-    1 tab == 4 spaces!\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
-     *                                                                       *\r
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\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, 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
+ * FreeRTOS Kernel V10.2.1\r
+ * Copyright (C) 2019 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
+ * this software and associated documentation files (the "Software"), to deal in\r
+ * the Software without restriction, including without limitation the rights to\r
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r
+ * the Software, and to permit persons to whom the Software is furnished to do so,\r
+ * subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included in all\r
+ * copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://aws.amazon.com/freertos\r
+ *\r
+ * 1 tab == 4 spaces!\r
+ */\r

 \r
 /*\r
  * main-blinky.c is included when the "Blinky" build configuration is used.\r
 \r
 /*\r
  * main-blinky.c is included when the "Blinky" build configuration is used.\r


@@ -174,8 +136,8 @@
 #include "dynamic.h"\r
 \r
 /* The rate at which data is sent to the queue, specified in milliseconds, and\r
 #include "dynamic.h"\r
 \r
 /* The rate at which data is sent to the queue, specified in milliseconds, and\r

-converted to ticks using the portTICK_RATE_MS constant. */\r
-#define mainQUEUE_SEND_FREQUENCY_MS    ( 200 / portTICK_RATE_MS )\r
+converted to ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainQUEUE_SEND_FREQUENCY_MS    ( 200 / portTICK_PERIOD_MS )\r

 \r
 /* The number of items the queue can hold.  This is 1 as the receive task\r
 will remove items as they are added, meaning the send task should always find\r
 \r
 /* The number of items the queue can hold.  This is 1 as the receive task\r
 will remove items as they are added, meaning the send task should always find\r


@@ -224,21 +186,21 @@ FreeRTOS.org web site to see which LEDs this relates to. */
 \r
 /* The period at which the check timer will expire, in ms, provided no errors\r
 have been reported by any of the standard demo tasks.  ms are converted to the\r
 \r
 /* The period at which the check timer will expire, in ms, provided no errors\r
 have been reported by any of the standard demo tasks.  ms are converted to the\r

-equivalent in ticks using the portTICK_RATE_MS constant. */\r
-#define mainCHECK_TIMER_PERIOD_MS                      ( 3000UL / portTICK_RATE_MS )\r
+equivalent in ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainCHECK_TIMER_PERIOD_MS                      ( 3000UL / portTICK_PERIOD_MS )\r

 \r
 /* The period at which the check timer will expire, in ms, if an error has been\r
 reported in one of the standard demo tasks.  ms are converted to the equivalent\r
 \r
 /* The period at which the check timer will expire, in ms, if an error has been\r
 reported in one of the standard demo tasks.  ms are converted to the equivalent\r

-in ticks using the portTICK_RATE_MS constant. */\r
-#define mainERROR_CHECK_TIMER_PERIOD_MS        ( 500UL / portTICK_RATE_MS )\r
+in ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainERROR_CHECK_TIMER_PERIOD_MS        ( 500UL / portTICK_PERIOD_MS )\r

 \r
 /* The period at which the digit counter timer will expire, in ms, and converted\r
 \r
 /* The period at which the digit counter timer will expire, in ms, and converted\r

-to ticks using the portTICK_RATE_MS constant. */\r
-#define mainDIGIT_COUNTER_TIMER_PERIOD_MS      ( 250UL / portTICK_RATE_MS )\r
+to ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainDIGIT_COUNTER_TIMER_PERIOD_MS      ( 250UL / portTICK_PERIOD_MS )\r

 \r
 /* The LED will remain on until the button has not been pushed for a full\r
 5000ms. */\r
 \r
 /* The LED will remain on until the button has not been pushed for a full\r
 5000ms. */\r

-#define mainLED_TIMER_PERIOD_MS                                ( 5000UL / portTICK_RATE_MS )\r
+#define mainLED_TIMER_PERIOD_MS                                ( 5000UL / portTICK_PERIOD_MS )\r

 \r
 /* A zero block time. */\r
 #define mainDONT_BLOCK                                         ( 0UL )\r
 \r
 /* A zero block time. */\r
 #define mainDONT_BLOCK                                         ( 0UL )\r


@@ -263,17 +225,17 @@ static void prvQueueSendTask( void *pvParameters );
 /*\r
  * The LED timer callback function.  This does nothing but switch an LED off.\r
  */\r
 /*\r
  * The LED timer callback function.  This does nothing but switch an LED off.\r
  */\r

-static void prvLEDTimerCallback( xTimerHandle xTimer );\r
+static void prvLEDTimerCallback( TimerHandle_t xTimer );\r

 \r
 /*\r
  * The check timer callback function, as described at the top of this file.\r
  */\r
 \r
 /*\r
  * The check timer callback function, as described at the top of this file.\r
  */\r

-static void prvCheckTimerCallback( xTimerHandle xTimer );\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer );\r

 \r
 /*\r
  * The digit counter callback function, as described at the top of this file.\r
  */\r
 \r
 /*\r
  * The digit counter callback function, as described at the top of this file.\r
  */\r

-static void prvDigitCounterTimerCallback( xTimerHandle xTimer );\r
+static void prvDigitCounterTimerCallback( TimerHandle_t xTimer );\r

 \r
 /*\r
  * This is not a 'standard' partest function, so the prototype is not in\r
 \r
 /*\r
  * This is not a 'standard' partest function, so the prototype is not in\r


@@ -284,19 +246,19 @@ void vParTestSetLEDFromISR( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE x
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used by both application specific demo tasks defined in this file. */\r
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used by both application specific demo tasks defined in this file. */\r

-static xQueueHandle xQueue = NULL;\r
+static QueueHandle_t xQueue = NULL;\r

 \r
 /* The LED software timer.  This uses prvLEDTimerCallback() as it's callback\r
 function. */\r
 \r
 /* The LED software timer.  This uses prvLEDTimerCallback() as it's callback\r
 function. */\r

-static xTimerHandle xLEDTimer = NULL;\r
+static TimerHandle_t xLEDTimer = NULL;\r

 \r
 /* The digit counter software timer.  This displays a counting digit on one half\r
 of the seven segment displays. */\r
 \r
 /* The digit counter software timer.  This displays a counting digit on one half\r
 of the seven segment displays. */\r

-static xTimerHandle xDigitCounterTimer = NULL;\r
+static TimerHandle_t xDigitCounterTimer = NULL;\r

 \r
 /* The check timer.  This uses prvCheckTimerCallback() as its callback\r
 function. */\r
 \r
 /* The check timer.  This uses prvCheckTimerCallback() as its callback\r
 function. */\r

-static xTimerHandle xCheckTimer = NULL;\r
+static TimerHandle_t xCheckTimer = NULL;\r

 \r
 /* If an error is detected in a standard demo task, then pcStatusMessage will\r
 be set to point to a string that identifies the offending task.  This is just\r
 \r
 /* If an error is detected in a standard demo task, then pcStatusMessage will\r
 be set to point to a string that identifies the offending task.  This is just\r


@@ -325,7 +287,7 @@ int main(void)
                this file. */\r
                xLEDTimer = xTimerCreate(       "LEDTimer",                             /* A text name, purely to help debugging. */\r
                                                                        ( mainLED_TIMER_PERIOD_MS ),/* The timer period, in this case 5000ms (5s). */\r
                this file. */\r
                xLEDTimer = xTimerCreate(       "LEDTimer",                             /* A text name, purely to help debugging. */\r
                                                                        ( mainLED_TIMER_PERIOD_MS ),/* The timer period, in this case 5000ms (5s). */\r

-                                                                       pdFALSE,                                        /* This is a one shot timer, so xAutoReload is set to pdFALSE. */\r
+                                                                       pdFALSE,                                        /* This is a one-shot timer, so xAutoReload is set to pdFALSE. */\r

                                                                        ( void * ) 0,                           /* The ID is not used, so can be set to anything. */\r
                                                                        prvLEDTimerCallback                     /* The callback function that switches the LED off. */\r
                                                                );\r
                                                                        ( void * ) 0,                           /* The ID is not used, so can be set to anything. */\r
                                                                        prvLEDTimerCallback                     /* The callback function that switches the LED off. */\r
                                                                );\r


@@ -383,7 +345,7 @@ int main(void)
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-static void prvCheckTimerCallback( xTimerHandle xTimer )\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer )\r

 {\r
        /* Check the standard demo tasks are running without error.   Latch the\r
        latest reported error in the pcStatusMessage character pointer. */\r
 {\r
        /* Check the standard demo tasks are running without error.   Latch the\r
        latest reported error in the pcStatusMessage character pointer. */\r


@@ -477,7 +439,7 @@ static void prvCheckTimerCallback( xTimerHandle xTimer )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-static void prvLEDTimerCallback( xTimerHandle xTimer )\r
+static void prvLEDTimerCallback( TimerHandle_t xTimer )\r

 {\r
        /* The timer has expired - so no button pushes have occurred in the last\r
        five seconds - turn the LED off. */\r
 {\r
        /* The timer has expired - so no button pushes have occurred in the last\r
        five seconds - turn the LED off. */\r


@@ -485,7 +447,7 @@ static void prvLEDTimerCallback( xTimerHandle xTimer )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-static void prvDigitCounterTimerCallback( xTimerHandle xTimer )\r
+static void prvDigitCounterTimerCallback( TimerHandle_t xTimer )\r

 {\r
 /* Define the bit patterns that display numbers on the seven segment display. */\r
 static const unsigned short usNumbersPatterns[] = { 0x8004, 0xF204, 0x4804, 0x6004, 0x3204, 0x2404, 0x0404, 0xF104, 0x0004, 0x2004 };\r
 {\r
 /* Define the bit patterns that display numbers on the seven segment display. */\r
 static const unsigned short usNumbersPatterns[] = { 0x8004, 0xF204, 0x4804, 0x6004, 0x3204, 0x2404, 0x0404, 0xF104, 0x0004, 0x2004 };\r


@@ -542,7 +504,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 \r
 static void prvQueueSendTask( void *pvParameters )\r
 {\r
 \r
 static void prvQueueSendTask( void *pvParameters )\r
 {\r

-portTickType xNextWakeTime;\r
+TickType_t xNextWakeTime;\r

 const unsigned long ulValueToSend = 100UL;\r
 \r
        /* The timer command queue will have been filled when the timer test tasks\r
 const unsigned long ulValueToSend = 100UL;\r
 \r
        /* The timer command queue will have been filled when the timer test tasks\r


@@ -638,7 +600,7 @@ void vApplicationMallocFailedHook( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName )\r
+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )\r

 {\r
        ( void ) pcTaskName;\r
        ( void ) pxTask;\r
 {\r
        ( void ) pcTaskName;\r
        ( void ) pxTask;\r