Update version number to 9.0.0rc2.

[freertos] / FreeRTOS-Plus / Demo / FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator / DemoTasks / UDPCommandServer.c

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
index 9bee950cfcd7c273627aa48d3a3f1693ff71b078..4e16842f80daf96ab19523e0636ac7a3e42d11b7 100644 (file)
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
@@ -1,75 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.4.1 - Copyright (C) 2013 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
+    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 obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.\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
 \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.  See the GNU General Public License for more\r
-    details. You should have received a copy of the GNU General Public License\r
-    and the FreeRTOS license exception along with FreeRTOS; if not it can be\r
-    viewed here: http://www.freertos.org/a00114.html and also obtained by\r
-    writing to Real Time Engineers Ltd., contact details for whom are available\r
-    on the FreeRTOS WEB site.\r
-\r
-    1 tab == 4 spaces!\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \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

+    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
 \r

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
-    license and Real Time Engineers Ltd. contact details.\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
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
-    fully thread aware and reentrant UDP/IP stack.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
-    Integrity Systems, who sell the code with commercial support, \r
-    indemnification and middleware, under the OpenRTOS brand.\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
+    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
+    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
     mission critical applications that require provable dependability.\r

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

 */\r
 \r
 /* Standard includes. */\r
 */\r
 \r
 /* Standard includes. */\r


@@ -111,13 +106,13 @@ static xSocket_t prvOpenUDPServerSocket( uint16_t usPort );
 \r
 /*-----------------------------------------------------------*/\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
 \r

-void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, unsigned portBASE_TYPE uxPriority )\r
+void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, UBaseType_t uxPriority )\r

 {\r
 {\r

-       xTaskCreate( vUDPCommandInterpreterTask, ( signed char * ) "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );\r
+       xTaskCreate( vUDPCommandInterpreterTask, "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );\r

 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-/* \r
+/*\r

  * Task that provides the input and output for the FreeRTOS+CLI command\r
  * interpreter.  In this case a UDP port is used.  See the URL in the comments\r
  * within main.c for the location of the online documentation.\r
  * Task that provides the input and output for the FreeRTOS+CLI command\r
  * interpreter.  In this case a UDP port is used.  See the URL in the comments\r
  * within main.c for the location of the online documentation.\r


@@ -127,7 +122,7 @@ void vUDPCommandInterpreterTask( void *pvParameters )
 long lBytes, lByte;\r
 signed char cInChar, cInputIndex = 0;\r
 static signed char cInputString[ cmdMAX_INPUT_SIZE ], cOutputString[ cmdMAX_OUTPUT_SIZE ], cLocalBuffer[ cmdSOCKET_INPUT_BUFFER_SIZE ];\r
 long lBytes, lByte;\r
 signed char cInChar, cInputIndex = 0;\r
 static signed char cInputString[ cmdMAX_INPUT_SIZE ], cOutputString[ cmdMAX_OUTPUT_SIZE ], cLocalBuffer[ cmdSOCKET_INPUT_BUFFER_SIZE ];\r

-portBASE_TYPE xMoreDataToFollow;\r
+BaseType_t xMoreDataToFollow;\r

 struct freertos_sockaddr xClient;\r
 socklen_t xClientAddressLength = 0; /* This is required as a parameter to maintain the sendto() Berkeley sockets API - but it is not actually used so can take any value. */\r
 xSocket_t xSocket;\r
 struct freertos_sockaddr xClient;\r
 socklen_t xClientAddressLength = 0; /* This is required as a parameter to maintain the sendto() Berkeley sockets API - but it is not actually used so can take any value. */\r
 xSocket_t xSocket;\r


@@ -163,25 +158,25 @@ extern const uint8_t ucMACAddress[ 6 ];
                                        string. */\r
                                        if( cInChar == '\n' )\r
                                        {\r
                                        string. */\r
                                        if( cInChar == '\n' )\r
                                        {\r

-                                               /* Process the input string received prior to the \r
+                                               /* Process the input string received prior to the\r

                                                newline. */\r
                                                do\r
                                                {\r
                                                        /* Pass the string to FreeRTOS+CLI. */\r
                                                        xMoreDataToFollow = FreeRTOS_CLIProcessCommand( cInputString, cOutputString, cmdMAX_OUTPUT_SIZE );\r
                                                newline. */\r
                                                do\r
                                                {\r
                                                        /* Pass the string to FreeRTOS+CLI. */\r
                                                        xMoreDataToFollow = FreeRTOS_CLIProcessCommand( cInputString, cOutputString, cmdMAX_OUTPUT_SIZE );\r

-                                                       \r
+\r

                                                        /* Send the output generated by the command's\r
                                                        implementation. */\r
                                                        /* Send the output generated by the command's\r
                                                        implementation. */\r

-                                                       FreeRTOS_sendto( xSocket, cOutputString,  strlen( ( const char * ) cOutputString ), 0, &xClient, xClientAddressLength );\r
+                                                       FreeRTOS_sendto( xSocket, cOutputString,  strlen( cOutputString ), 0, &xClient, xClientAddressLength );\r

 \r
                                                } while( xMoreDataToFollow != pdFALSE ); /* Until the command does not generate any more output. */\r
 \r
 \r
                                                } while( xMoreDataToFollow != pdFALSE ); /* Until the command does not generate any more output. */\r
 \r

-                                               /* All the strings generated by the command processing \r
-                                               have been sent.  Clear the input string ready to receive \r
+                                               /* All the strings generated by the command processing\r
+                                               have been sent.  Clear the input string ready to receive\r

                                                the next command. */\r
                                                cInputIndex = 0;\r
                                                memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );\r
                                                the next command. */\r
                                                cInputIndex = 0;\r
                                                memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );\r

-                                               \r
+\r

                                                /* Transmit a spacer, just to make the command console\r
                                                easier to read. */\r
                                                FreeRTOS_sendto( xSocket, "\r\n",  strlen( "\r\n" ), 0, &xClient, xClientAddressLength );\r
                                                /* Transmit a spacer, just to make the command console\r
                                                easier to read. */\r
                                                FreeRTOS_sendto( xSocket, "\r\n",  strlen( "\r\n" ), 0, &xClient, xClientAddressLength );\r


@@ -190,12 +185,12 @@ extern const uint8_t ucMACAddress[ 6 ];
                                        {\r
                                                if( cInChar == '\r' )\r
                                                {\r
                                        {\r
                                                if( cInChar == '\r' )\r
                                                {\r

-                                                       /* Ignore the character.  Newlines are used to \r
+                                                       /* Ignore the character.  Newlines are used to\r

                                                        detect the end of the input string. */\r
                                                }\r
                                                else if( cInChar == '\b' )\r
                                                {\r
                                                        detect the end of the input string. */\r
                                                }\r
                                                else if( cInChar == '\b' )\r
                                                {\r

-                                                       /* Backspace was pressed.  Erase the last character \r
+                                                       /* Backspace was pressed.  Erase the last character\r

                                                        in the string - if any. */\r
                                                        if( cInputIndex > 0 )\r
                                                        {\r
                                                        in the string - if any. */\r
                                                        if( cInputIndex > 0 )\r
                                                        {\r


@@ -217,7 +212,7 @@ extern const uint8_t ucMACAddress[ 6 ];
                                        }\r
                                }\r
                        }\r
                                        }\r
                                }\r
                        }\r

-               } \r
+               }\r

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


@@ -243,7 +238,7 @@ xSocket_t xSocket = FREERTOS_INVALID_SOCKET;
 \r
                /* Bind the address to the socket. */\r
                if( FreeRTOS_bind( xSocket, &xServer, sizeof( xServer ) ) == -1 )\r
 \r
                /* Bind the address to the socket. */\r
                if( FreeRTOS_bind( xSocket, &xServer, sizeof( xServer ) ) == -1 )\r

-               {                       \r
+               {\r

                        FreeRTOS_closesocket( xSocket );\r
                        xSocket = FREERTOS_INVALID_SOCKET;\r
                }\r
                        FreeRTOS_closesocket( xSocket );\r
                        xSocket = FREERTOS_INVALID_SOCKET;\r
                }\r