Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Demo / PIC18_WizC / Demo2 / main.c

diff --git a/FreeRTOS/Demo/PIC18_WizC/Demo2/main.c b/FreeRTOS/Demo/PIC18_WizC/Demo2/main.c
index 8407881ef650af809cd3ef6241041828dca714b6..b1e8d1b465c7840215275c50e5b2ad9eb70618df 100644 (file)
--- a/FreeRTOS/Demo/PIC18_WizC/Demo2/main.c
+++ b/FreeRTOS/Demo/PIC18_WizC/Demo2/main.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
 \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.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
+    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


@@ -73,11 +74,11 @@ Changes from V3.0.1
 */\r
 \r
 /*\r
 */\r
 \r
 /*\r

- * Instead of the normal single demo application, the PIC18F demo is split \r
- * into several smaller programs of which this is the second.  This enables the \r
+ * Instead of the normal single demo application, the PIC18F demo is split\r
+ * into several smaller programs of which this is the second.  This enables the\r

  * demo's to be executed on the RAM limited PIC-devices.\r
  *\r
  * demo's to be executed on the RAM limited PIC-devices.\r
  *\r

- * The Demo2 project is configured for a PIC18F4620 device.  Main.c starts 12 \r
+ * The Demo2 project is configured for a PIC18F4620 device.  Main.c starts 12\r

  * tasks (including the idle task). See the indicated files in the demo/common\r
  * directory for more information.\r
  *\r
  * tasks (including the idle task). See the indicated files in the demo/common\r
  * directory for more information.\r
  *\r


@@ -86,18 +87,18 @@ Changes from V3.0.1
  * demo/common/minimal/semtest.c:      Creates 4 tasks\r
  * demo/common/minimal/flash.c:                Creates 3 tasks\r
  *\r
  * demo/common/minimal/semtest.c:      Creates 4 tasks\r
  * demo/common/minimal/flash.c:                Creates 3 tasks\r
  *\r

- * Main.c also creates a check task.  This periodically checks that all the \r
- * other tasks are still running and have not experienced any unexpected \r
- * results.  If all the other tasks are executing correctly an LED is flashed \r
- * once every mainCHECK_PERIOD milliseconds.  If any of the tasks have not \r
- * executed, or report an error, the frequency of the LED flash will increase \r
+ * Main.c also creates a check task.  This periodically checks that all the\r
+ * other tasks are still running and have not experienced any unexpected\r
+ * results.  If all the other tasks are executing correctly an LED is flashed\r
+ * once every mainCHECK_PERIOD milliseconds.  If any of the tasks have not\r
+ * executed, or report an error, the frequency of the LED flash will increase\r

  * to mainERROR_FLASH_RATE.\r
  *\r
  * On entry to main an 'X' is transmitted.  Monitoring the serial port using a\r
  * to mainERROR_FLASH_RATE.\r
  *\r
  * On entry to main an 'X' is transmitted.  Monitoring the serial port using a\r

- * dumb terminal allows for verification that the device is not continuously \r
+ * dumb terminal allows for verification that the device is not continuously\r

  * being reset (no more than one 'X' should be transmitted).\r
  *\r
  * being reset (no more than one 'X' should be transmitted).\r
  *\r

- * http://www.FreeRTOS.org contains important information on the use of the \r
+ * http://www.FreeRTOS.org contains important information on the use of the\r

  * wizC PIC18F port.\r
  */\r
 \r
  * wizC PIC18F port.\r
  */\r
 \r


@@ -116,8 +117,8 @@ Changes from V3.0.1
 /* The period between executions of the check task before and after an error\r
 has been discovered.  If an error has been discovered the check task runs\r
 more frequently - increasing the LED flash rate. */\r
 /* The period between executions of the check task before and after an error\r
 has been discovered.  If an error has been discovered the check task runs\r
 more frequently - increasing the LED flash rate. */\r

-#define mainNO_ERROR_CHECK_PERIOD      ( ( portTickType ) 10000 / portTICK_RATE_MS )\r
-#define mainERROR_CHECK_PERIOD         ( ( portTickType )  1000 / portTICK_RATE_MS )\r
+#define mainNO_ERROR_CHECK_PERIOD      ( ( TickType_t ) 10000 / portTICK_PERIOD_MS )\r
+#define mainERROR_CHECK_PERIOD         ( ( TickType_t )  1000 / portTICK_PERIOD_MS )\r

 #define mainCHECK_TASK_LED                     ( ( unsigned char ) 3 )\r
 \r
 /* Priority definitions for some of the tasks.  Other tasks just use the idle\r
 #define mainCHECK_TASK_LED                     ( ( unsigned char ) 3 )\r
 \r
 /* Priority definitions for some of the tasks.  Other tasks just use the idle\r


@@ -128,10 +129,10 @@ priority. */
 #define mainSEM_TEST_PRIORITY  ( tskIDLE_PRIORITY + ( unsigned char ) 1 )\r
 #define mainINTEGER_PRIORITY   ( tskIDLE_PRIORITY + ( unsigned char ) 0 )\r
 \r
 #define mainSEM_TEST_PRIORITY  ( tskIDLE_PRIORITY + ( unsigned char ) 1 )\r
 #define mainINTEGER_PRIORITY   ( tskIDLE_PRIORITY + ( unsigned char ) 0 )\r
 \r

-/* Constants required for the communications.  Only one character is ever \r
+/* Constants required for the communications.  Only one character is ever\r

 transmitted. */\r
 #define mainCOMMS_QUEUE_LENGTH         ( ( unsigned char ) 5 )\r
 transmitted. */\r
 #define mainCOMMS_QUEUE_LENGTH         ( ( unsigned char ) 5 )\r

-#define mainNO_BLOCK                           ( ( portTickType ) 0 )\r
+#define mainNO_BLOCK                           ( ( TickType_t ) 0 )\r

 #define mainBAUD_RATE                          ( ( unsigned long ) 57600 )\r
 \r
 /*\r
 #define mainBAUD_RATE                          ( ( unsigned long ) 57600 )\r
 \r
 /*\r


@@ -164,7 +165,7 @@ void main( void )
        vStartLEDFlashTasks( mainLED_FLASH_PRIORITY );\r
 \r
        /* Start the check task defined in this file. */\r
        vStartLEDFlashTasks( mainLED_FLASH_PRIORITY );\r
 \r
        /* Start the check task defined in this file. */\r

-       xTaskCreate( vErrorChecks, ( const char * const ) "Check", portMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
+       xTaskCreate( vErrorChecks, "Check", portMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r

 \r
        /* Start the scheduler.  Will never return here. */\r
        vTaskStartScheduler();\r
 \r
        /* Start the scheduler.  Will never return here. */\r
        vTaskStartScheduler();\r


@@ -177,21 +178,21 @@ void main( void )
 \r
 static portTASK_FUNCTION( vErrorChecks, pvParameters )\r
 {\r
 \r
 static portTASK_FUNCTION( vErrorChecks, pvParameters )\r
 {\r

-portTickType xLastCheckTime;\r
-portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD;\r
+TickType_t xLastCheckTime;\r
+TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD;\r

 char cErrorOccurred;\r
 \r
 char cErrorOccurred;\r
 \r

-       /* We need to initialise xLastCheckTime prior to the first call to \r
+       /* We need to initialise xLastCheckTime prior to the first call to\r

        vTaskDelayUntil(). */\r
        xLastCheckTime = xTaskGetTickCount();\r
        vTaskDelayUntil(). */\r
        xLastCheckTime = xTaskGetTickCount();\r

-       \r
+\r

        /* Cycle for ever, delaying then checking all the other tasks are still\r
        operating without error. */\r
        for( ;; )\r
        {\r
                /* Wait until it is time to check the other tasks again. */\r
                vTaskDelayUntil( &xLastCheckTime, xDelayTime );\r
        /* Cycle for ever, delaying then checking all the other tasks are still\r
        operating without error. */\r
        for( ;; )\r
        {\r
                /* Wait until it is time to check the other tasks again. */\r
                vTaskDelayUntil( &xLastCheckTime, xDelayTime );\r

-               \r
+\r

                /* Check all the other tasks are running, and running without ever\r
                having an error. */\r
                cErrorOccurred = prvCheckOtherTasksAreStillRunning();\r
                /* Check all the other tasks are running, and running without ever\r
                having an error. */\r
                cErrorOccurred = prvCheckOtherTasksAreStillRunning();\r