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

[freertos] / FreeRTOS / Demo / RX600_RX62N-RDK_IAR / uIP_Task.c

diff --git a/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/uIP_Task.c b/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/uIP_Task.c
index 49da3eabc1fc4df23ff72fa3c272d3a5ae0429ff..e4623ebb7e91e6352610a9e838049d328595c578 100644 (file)
--- a/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/uIP_Task.c
+++ b/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/uIP_Task.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 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
@@ -24,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
@@ -86,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
@@ -119,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
@@ -129,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
@@ -238,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
@@ -256,14 +256,14 @@ const unsigned long ul_uIPEventQueueLength = 10UL;
 \r
        /* Create and start the uIP timers. */\r
        xARPTimer = xTimerCreate(       "ARPTimer", /* Just a name that is helpful for debugging, not used by the kernel. */\r
-                                                               ( 10000UL / portTICK_RATE_MS ), /* Timer period. */\r
+                                                               ( 10000UL / portTICK_PERIOD_MS ), /* Timer period. */\r
                                                                pdTRUE, /* Autor-reload. */\r
                                                                ( void * ) uipARP_TIMER,\r
                                                                prvUIPTimerCallback\r
                                                        );\r
 \r
        xPeriodicTimer = xTimerCreate(  "PeriodicTimer",\r
-                                                                       ( 50 / portTICK_RATE_MS ),\r
+                                                                       ( 50 / portTICK_PERIOD_MS ),\r
                                                                        pdTRUE, /* Autor-reload. */\r
                                                                        ( void * ) uipPERIODIC_TIMER,\r
                                                                        prvUIPTimerCallback\r
@@ -277,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