Update version number to 8.1.2 after moving the defaulting of configUSE_PORT_OPTIMISE...

[freertos] / FreeRTOS / Demo / RX600_RX62N-RSK_GNURX / RTOSDemo / uIP_Task.c

diff --git a/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/uIP_Task.c b/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/uIP_Task.c
index 63e5d183ceb140a3dca332a5338e09618833a2d8..3437fa991eee1bfb7d71cd5b89e8d14dc9fb91ee 100644 (file)
--- a/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/uIP_Task.c
+++ b/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/uIP_Task.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.1 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.2 - Copyright (C) 2014 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
@@ -23,10 +24,10 @@
     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
+    >>!   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
     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
@@ -85,7 +86,7 @@
 /*-----------------------------------------------------------*/\r
 \r
 /* How long to wait before attempting to connect the MAC again. */\r
-#define uipINIT_WAIT    ( 100 / portTICK_RATE_MS )\r
+#define uipINIT_WAIT    ( 100 / portTICK_PERIOD_MS )\r
 \r
 /* Shortcut to the header within the Rx buffer. */\r
 #define xHeader ((struct uip_eth_hdr *) &uip_buf[ 0 ])\r
@@ -110,7 +111,7 @@ constants are assigned to the timer IDs. */
 static void prvSetMACAddress( void );\r
 \r
 /*\r
- * Perform any uIP initialisation necessary. \r
+ * Perform any uIP initialisation necessary.\r
  */\r
 static void prvInitialise_uIP( void );\r
 \r
@@ -118,7 +119,7 @@ static void prvInitialise_uIP( void );
  * The callback function that is assigned to both the periodic timer and the\r
  * ARP timer.\r
  */\r
-static void prvUIPTimerCallback( xTimerHandle xTimer );\r
+static void prvUIPTimerCallback( TimerHandle_t xTimer );\r
 \r
 /*\r
  * Port functions required by the uIP stack.\r
@@ -128,7 +129,7 @@ clock_time_t clock_time( void );
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to send TCP/IP events to the uIP stack. */\r
-xQueueHandle xEMACEventQueue = NULL;\r
+QueueHandle_t xEMACEventQueue = NULL;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -145,7 +146,7 @@ unsigned long ulNewEvent = 0UL;
 unsigned long ulUIP_Events = 0UL;\r
 \r
        ( void ) pvParameters;\r
-       \r
+\r
        /* Initialise the uIP stack. */\r
        prvInitialise_uIP();\r
 \r
@@ -160,10 +161,10 @@ unsigned long ulUIP_Events = 0UL;
        for( ;; )\r
        {\r
                if( ( ulUIP_Events & uipETHERNET_RX_EVENT ) != 0UL )\r
-               {               \r
+               {\r
                        /* Is there received data ready to be processed? */\r
                        uip_len = ( unsigned short ) ulEMACRead();\r
-                       \r
+\r
                        if( ( uip_len > 0 ) && ( uip_buf != NULL ) )\r
                        {\r
                                /* Standard uIP loop taken from the uIP manual. */\r
@@ -199,11 +200,11 @@ unsigned long ulUIP_Events = 0UL;
                                ulUIP_Events &= ~uipETHERNET_RX_EVENT;\r
                        }\r
                }\r
-               \r
+\r
                if( ( ulUIP_Events & uipPERIODIC_TIMER_EVENT ) != 0UL )\r
                {\r
                        ulUIP_Events &= ~uipPERIODIC_TIMER_EVENT;\r
-                                       \r
+\r
                        for( i = 0; i < UIP_CONNS; i++ )\r
                        {\r
                                uip_periodic( i );\r
@@ -218,14 +219,14 @@ unsigned long ulUIP_Events = 0UL;
                                }\r
                        }\r
                }\r
-               \r
+\r
                /* Call the ARP timer function every 10 seconds. */\r
                if( ( ulUIP_Events & uipARP_TIMER_EVENT ) != 0 )\r
                {\r
                        ulUIP_Events &= ~uipARP_TIMER_EVENT;\r
                        uip_arp_timer();\r
                }\r
-                       \r
+\r
                if( ulUIP_Events == pdFALSE )\r
                {\r
                        xQueueReceive( xEMACEventQueue, &ulNewEvent, portMAX_DELAY );\r
@@ -237,7 +238,7 @@ unsigned long ulUIP_Events = 0UL;
 \r
 static void prvInitialise_uIP( void )\r
 {\r
-xTimerHandle xARPTimer, xPeriodicTimer;\r
+TimerHandle_t xARPTimer, xPeriodicTimer;\r
 uip_ipaddr_t xIPAddr;\r
 const unsigned long ul_uIPEventQueueLength = 10UL;\r
 \r
@@ -254,15 +255,15 @@ const unsigned long ul_uIPEventQueueLength = 10UL;
        xEMACEventQueue = xQueueCreate( ul_uIPEventQueueLength, sizeof( unsigned long ) );\r
 \r
        /* Create and start the uIP timers. */\r
-       xARPTimer = xTimerCreate(       ( const signed char * const ) "ARPTimer", /* Just a name that is helpful for debugging, not used by the kernel. */\r
-                                                               ( 10000UL / portTICK_RATE_MS ), /* Timer period. */\r
+       xARPTimer = xTimerCreate(       "ARPTimer", /* Just a name that is helpful for debugging, not used by the kernel. */\r
+                                                               ( 10000UL / portTICK_PERIOD_MS ), /* Timer period. */\r
                                                                pdTRUE, /* Autor-reload. */\r
                                                                ( void * ) uipARP_TIMER,\r
                                                                prvUIPTimerCallback\r
                                                        );\r
 \r
-       xPeriodicTimer = xTimerCreate(  ( const signed char * const ) "PeriodicTimer",\r
-                                                                       ( 50 / portTICK_RATE_MS ),\r
+       xPeriodicTimer = xTimerCreate(  "PeriodicTimer",\r
+                                                                       ( 50 / portTICK_PERIOD_MS ),\r
                                                                        pdTRUE, /* Autor-reload. */\r
                                                                        ( void * ) uipPERIODIC_TIMER,\r
                                                                        prvUIPTimerCallback\r
@@ -276,7 +277,7 @@ const unsigned long ul_uIPEventQueueLength = 10UL;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvUIPTimerCallback( xTimerHandle xTimer )\r
+static void prvUIPTimerCallback( TimerHandle_t xTimer )\r
 {\r
 static const unsigned long ulARPTimerExpired = uipARP_TIMER_EVENT;\r
 static const unsigned long ulPeriodicTimerExpired = uipPERIODIC_TIMER_EVENT;\r
@@ -318,7 +319,7 @@ char *c;
 \r
        /* Only interested in processing form input if this is the IO page. */\r
        c = strstr( pcInputString, "io.shtml" );\r
-       \r
+\r
        if( c )\r
        {\r
                /* Is there a command in the string? */\r