X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FRX600_RX62N-RDK_Renesas%2FRTOSDemo%2FuIP_Task.c;h=88fd6e898002e43807fc0edaa60610d490cd8e0f;hb=01b0b5bd98770d9046145309f15c3eca37d2f8cb;hp=94f1682a2e795abc2eaccfd98b715a9cd3417983;hpb=758848cd92bc5b99ef94165052f0f537833ce1d7;p=freertos

diff --git a/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c b/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c
index 94f1682a2..88fd6e898 100644
--- a/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c
+++ b/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V8.1.0 - Copyright (C) 2014 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -86,7 +86,7 @@
 /*-----------------------------------------------------------*/
 
 /* How long to wait before attempting to connect the MAC again. */
-#define uipINIT_WAIT    ( 100 / portTICK_RATE_MS )
+#define uipINIT_WAIT    ( 100 / portTICK_PERIOD_MS )
 
 /* Shortcut to the header within the Rx buffer. */
 #define xHeader ((struct uip_eth_hdr *) &uip_buf[ 0 ])
@@ -119,7 +119,7 @@ static void prvInitialise_uIP( void );
  * The callback function that is assigned to both the periodic timer and the
  * ARP timer.
  */
-static void prvUIPTimerCallback( xTimerHandle xTimer );
+static void prvUIPTimerCallback( TimerHandle_t xTimer );
 
 /*
  * Port functions required by the uIP stack.
@@ -129,7 +129,7 @@ clock_time_t clock_time( void );
 /*-----------------------------------------------------------*/
 
 /* The queue used to send TCP/IP events to the uIP stack. */
-xQueueHandle xEMACEventQueue = NULL;
+QueueHandle_t xEMACEventQueue = NULL;
 
 /*-----------------------------------------------------------*/
 
@@ -238,7 +238,7 @@ unsigned long ulUIP_Events = 0UL;
 
 static void prvInitialise_uIP( void )
 {
-xTimerHandle xARPTimer, xPeriodicTimer;
+TimerHandle_t xARPTimer, xPeriodicTimer;
 uip_ipaddr_t xIPAddr;
 const unsigned long ul_uIPEventQueueLength = 10UL;
 
@@ -256,14 +256,14 @@ const unsigned long ul_uIPEventQueueLength = 10UL;
 
 	/* Create and start the uIP timers. */
 	xARPTimer = xTimerCreate( 	"ARPTimer", /* Just a name that is helpful for debugging, not used by the kernel. */
-								( 10000UL / portTICK_RATE_MS ), /* Timer period. */
+								( 10000UL / portTICK_PERIOD_MS ), /* Timer period. */
 								pdTRUE, /* Autor-reload. */
 								( void * ) uipARP_TIMER,
 								prvUIPTimerCallback
 							);
 
 	xPeriodicTimer = xTimerCreate( 	"PeriodicTimer",
-									( 50 / portTICK_RATE_MS ),
+									( 50 / portTICK_PERIOD_MS ),
 									pdTRUE, /* Autor-reload. */
 									( void * ) uipPERIODIC_TIMER,
 									prvUIPTimerCallback
@@ -277,7 +277,7 @@ const unsigned long ul_uIPEventQueueLength = 10UL;
 }
 /*-----------------------------------------------------------*/
 
-static void prvUIPTimerCallback( xTimerHandle xTimer )
+static void prvUIPTimerCallback( TimerHandle_t xTimer )
 {
 static const unsigned long ulARPTimerExpired = uipARP_TIMER_EVENT;
 static const unsigned long ulPeriodicTimerExpired = uipPERIODIC_TIMER_EVENT;