]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Demo/Common/Minimal/crflash.c
Roll up the minor changes checked into svn since V10.0.0 into new V10.0.1 ready for...
[freertos] / FreeRTOS / Demo / Common / Minimal / crflash.c
index 2ba623c2200d86d178e0fde7dd6aa96e081ffdbb..90489c58f3a96798f3e4e79538f087312a300352 100644 (file)
@@ -1,66 +1,29 @@
 /*\r
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.\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.0.1\r
+ * Copyright (C) 2017 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
  * This demo application file demonstrates the use of queues to pass data\r
@@ -117,28 +80,28 @@ created. */
 /*\r
  * The 'fixed delay' co-routine as described at the top of the file.\r
  */\r
-static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex );\r
+static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex );\r
 \r
 /*\r
  * The 'flash' co-routine as described at the top of the file.\r
  */\r
-static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex );\r
+static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex );\r
 \r
 /* The queue used to pass data between the 'fixed delay' co-routines and the\r
 'flash' co-routine. */\r
-static xQueueHandle xFlashQueue;\r
+static QueueHandle_t xFlashQueue;\r
 \r
 /* This will be set to pdFALSE if we detect an error. */\r
-static portBASE_TYPE xCoRoutineFlashStatus = pdPASS;\r
+static BaseType_t xCoRoutineFlashStatus = pdPASS;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
  * See the header file for details.\r
  */\r
-void vStartFlashCoRoutines( unsigned portBASE_TYPE uxNumberToCreate )\r
+void vStartFlashCoRoutines( UBaseType_t uxNumberToCreate )\r
 {\r
-unsigned portBASE_TYPE uxIndex;\r
+UBaseType_t uxIndex;\r
 \r
        if( uxNumberToCreate > crfMAX_FLASH_TASKS )\r
        {\r
@@ -146,7 +109,7 @@ unsigned portBASE_TYPE uxIndex;
        }\r
 \r
        /* Create the queue used to pass data between the co-routines. */\r
-       xFlashQueue = xQueueCreate( crfQUEUE_LENGTH, sizeof( unsigned portBASE_TYPE ) );\r
+       xFlashQueue = xQueueCreate( crfQUEUE_LENGTH, sizeof( UBaseType_t ) );\r
 \r
        if( xFlashQueue )\r
        {\r
@@ -162,21 +125,21 @@ unsigned portBASE_TYPE uxIndex;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )\r
+static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex )\r
 {\r
 /* Even though this is a co-routine the xResult variable does not need to be\r
 static as we do not need it to maintain its state between blocks. */\r
-signed portBASE_TYPE xResult;\r
+BaseType_t xResult;\r
 /* The uxIndex 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[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_RATE_MS,\r
-                                                                                                                               200 / portTICK_RATE_MS,\r
-                                                                                                                               250 / portTICK_RATE_MS,\r
-                                                                                                                               300 / portTICK_RATE_MS,\r
-                                                                                                                               350 / portTICK_RATE_MS,\r
-                                                                                                                               400 / portTICK_RATE_MS,\r
-                                                                                                                               450 / portTICK_RATE_MS,\r
-                                                                                                                               500  / portTICK_RATE_MS };\r
+static const TickType_t xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_PERIOD_MS,\r
+                                                                                                                               200 / portTICK_PERIOD_MS,\r
+                                                                                                                               250 / portTICK_PERIOD_MS,\r
+                                                                                                                               300 / portTICK_PERIOD_MS,\r
+                                                                                                                               350 / portTICK_PERIOD_MS,\r
+                                                                                                                               400 / portTICK_PERIOD_MS,\r
+                                                                                                                               450 / portTICK_PERIOD_MS,\r
+                                                                                                                               500  / portTICK_PERIOD_MS };\r
 \r
        /* Co-routines MUST start with a call to crSTART. */\r
        crSTART( xHandle );\r
@@ -203,21 +166,21 @@ static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_R
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )\r
+static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex )\r
 {\r
 /* Even though this is a co-routine the variable do not need to be\r
 static as we do not need it to maintain their state between blocks. */\r
-signed portBASE_TYPE xResult;\r
-unsigned portBASE_TYPE uxLEDToFlash;\r
+BaseType_t xResult;\r
+UBaseType_t uxLEDToFlash;\r
 \r
        /* Co-routines MUST start with a call to crSTART. */\r
        crSTART( xHandle );\r
        ( void ) uxIndex;\r
-       \r
+\r
        for( ;; )\r
        {\r
                /* Block to wait for the number of the LED to flash. */\r
-               crQUEUE_RECEIVE( xHandle, xFlashQueue, &uxLEDToFlash, portMAX_DELAY, &xResult );                \r
+               crQUEUE_RECEIVE( xHandle, xFlashQueue, &uxLEDToFlash, portMAX_DELAY, &xResult );\r
 \r
                if( xResult != pdPASS )\r
                {\r
@@ -236,7 +199,7 @@ unsigned portBASE_TYPE uxLEDToFlash;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xAreFlashCoRoutinesStillRunning( void )\r
+BaseType_t xAreFlashCoRoutinesStillRunning( void )\r
 {\r
        /* Return pdPASS or pdFAIL depending on whether an error has been detected\r
        or not. */\r