Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Demo / RX200_RX210-RSK_Renesas / RTOSDemo / ButtonAndLCD.c

diff --git a/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c b/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c
index b3decdc18d23a0dbb7a43bbb1cf0cd59a36afe6c..90689109f230ecf589e64ef2923680c82cd5c39a 100644 (file)
--- a/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c
+++ b/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.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
 /* Scheduler includes. */\r
 */\r
 \r
 /* Scheduler includes. */\r


@@ -95,7 +96,7 @@ display. */
 \r
 /* Defines the minimum time that must pass between consecutive button presses\r
 to accept a button press as a unique press rather than just a bounce. */\r
 \r
 /* Defines the minimum time that must pass between consecutive button presses\r
 to accept a button press as a unique press rather than just a bounce. */\r

-#define lcdMIN_TIME_BETWEEN_INTERRUPTS_MS ( 125UL / portTICK_RATE_MS )\r
+#define lcdMIN_TIME_BETWEEN_INTERRUPTS_MS ( 125UL / portTICK_PERIOD_MS )\r

 \r
 /* Button interrupt handlers. */\r
 #pragma interrupt ( prvIRQ1_Handler( vect = 65, enable ) )\r
 \r
 /* Button interrupt handlers. */\r
 #pragma interrupt ( prvIRQ1_Handler( vect = 65, enable ) )\r


@@ -147,17 +148,17 @@ static void prvDisplayNextString( unsigned char ucLine, char *pcString );
  * lcdMIN_TIME_BETWEEN_INTERRUPTS_MS milliseconds have passed since the button\r
  * was last pushed (for debouncing). \r
  */\r
  * lcdMIN_TIME_BETWEEN_INTERRUPTS_MS milliseconds have passed since the button\r
  * was last pushed (for debouncing). \r
  */\r

-static portBASE_TYPE prvSendCommandOnDebouncedInput( portTickType *pxTimeLastInterrupt, unsigned char ucCommand );\r
+static portBASE_TYPE prvSendCommandOnDebouncedInput( TickType_t *pxTimeLastInterrupt, unsigned char ucCommand );\r

 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to pass commands from the button interrupt handlers to the\r
 prvLCDTaskLine2() task. */\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to pass commands from the button interrupt handlers to the\r
 prvLCDTaskLine2() task. */\r

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

 \r
 /* The mutex used to ensure only one task writes to the display at any one\r
 time. */\r
 \r
 /* The mutex used to ensure only one task writes to the display at any one\r
 time. */\r

-static xSemaphoreHandle xLCDMutex = NULL;\r
+static SemaphoreHandle_t xLCDMutex = NULL;\r

 \r
 /* The string that is scrolled up and down the first line of the display. */\r
 static const char cDataString1[] = "        http://www.FreeRTOS.org        ";\r
 \r
 /* The string that is scrolled up and down the first line of the display. */\r
 static const char cDataString1[] = "        http://www.FreeRTOS.org        ";\r


@@ -209,7 +210,7 @@ unsigned char ucDirection = lcdRIGHT_TO_LEFT;
        \r
        for( ;; )\r
        {\r
        \r
        for( ;; )\r
        {\r

-               vTaskDelay( pxLCDParamaters->Speed / portTICK_RATE_MS );                \r
+               vTaskDelay( pxLCDParamaters->Speed / portTICK_PERIOD_MS );              \r

 \r
                /* Write the string. */\r
                prvDisplayNextString( pxLCDParamaters->Line, &( pxLCDParamaters->ptr_str[ usPosition ] ) );\r
 \r
                /* Write the string. */\r
                prvDisplayNextString( pxLCDParamaters->Line, &( pxLCDParamaters->ptr_str[ usPosition ] ) );\r


@@ -226,7 +227,7 @@ static void prvLCDTaskLine2( void *pvParameters )
 struct _LCD_Params *pxLCDParamaters = ( struct _LCD_Params * ) pvParameters;\r
 unsigned short usPosition = 0U;\r
 unsigned char ucDirection = lcdRIGHT_TO_LEFT, ucStatus = lcdRUNNING, ucQueueData;\r
 struct _LCD_Params *pxLCDParamaters = ( struct _LCD_Params * ) pvParameters;\r
 unsigned short usPosition = 0U;\r
 unsigned char ucDirection = lcdRIGHT_TO_LEFT, ucStatus = lcdRUNNING, ucQueueData;\r

-portTickType xDelayTicks = ( pxLCDParamaters->Speed / portTICK_RATE_MS );\r
+TickType_t xDelayTicks = ( pxLCDParamaters->Speed / portTICK_PERIOD_MS );\r

        \r
        for(;;)\r
        {\r
        \r
        for(;;)\r
        {\r


@@ -254,7 +255,7 @@ portTickType xDelayTicks = ( pxLCDParamaters->Speed / portTICK_RATE_MS );
                                        \r
                                        if( ucStatus == lcdRUNNING )\r
                                        {\r
                                        \r
                                        if( ucStatus == lcdRUNNING )\r
                                        {\r

-                                               xDelayTicks = ( pxLCDParamaters->Speed / portTICK_RATE_MS );\r
+                                               xDelayTicks = ( pxLCDParamaters->Speed / portTICK_PERIOD_MS );\r

                                        }\r
                                        else\r
                                        {\r
                                        }\r
                                        else\r
                                        {\r


@@ -375,10 +376,10 @@ static char cSingleLine[ lcdSTRING_LEN + 1 ];
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-static portBASE_TYPE prvSendCommandOnDebouncedInput( portTickType *pxTimeLastInterrupt, unsigned char ucCommand )\r
+static portBASE_TYPE prvSendCommandOnDebouncedInput( TickType_t *pxTimeLastInterrupt, unsigned char ucCommand )\r

 {\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 {\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r

-portTickType xCurrentTickCount;\r
+TickType_t xCurrentTickCount;\r

        \r
        /* Check the time now for debouncing purposes. */\r
        xCurrentTickCount = xTaskGetTickCountFromISR();\r
        \r
        /* Check the time now for debouncing purposes. */\r
        xCurrentTickCount = xTaskGetTickCountFromISR();\r


@@ -400,7 +401,7 @@ portTickType xCurrentTickCount;
 \r
 static void prvIRQ1_Handler( void )\r
 {\r
 \r
 static void prvIRQ1_Handler( void )\r
 {\r

-static portTickType xTimeLastInterrupt = 0UL;\r
+static TickType_t xTimeLastInterrupt = 0UL;\r

 static const unsigned char ucCommand = lcdSHIFT_BACK_COMMAND;\r
 portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r
 static const unsigned char ucCommand = lcdSHIFT_BACK_COMMAND;\r
 portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r


@@ -411,7 +412,7 @@ portBASE_TYPE xHigherPriorityTaskWoken;
 \r
 static void prvIRQ3_Handler(void)\r
 {\r
 \r
 static void prvIRQ3_Handler(void)\r
 {\r

-static portTickType xTimeLastInterrupt = 0UL;\r
+static TickType_t xTimeLastInterrupt = 0UL;\r

 static const unsigned char ucCommand = lcdSTART_STOP_COMMAND;\r
 portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r
 static const unsigned char ucCommand = lcdSTART_STOP_COMMAND;\r
 portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r


@@ -422,7 +423,7 @@ portBASE_TYPE xHigherPriorityTaskWoken;
 \r
 static void prvIRQ4_Handler(void)\r
 {\r
 \r
 static void prvIRQ4_Handler(void)\r
 {\r

-static portTickType xTimeLastInterrupt = 0UL;\r
+static TickType_t xTimeLastInterrupt = 0UL;\r

 static const unsigned char ucCommand = lcdSHIFT_FORWARD_COMMAND;\r
 portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r
 static const unsigned char ucCommand = lcdSHIFT_FORWARD_COMMAND;\r
 portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r