***IMMINENT RELEASE NOTICE***

[freertos] / FreeRTOS / Demo / RX600_RX62N-RSK_Renesas / RTOSDemo / webserver / EMAC.c

diff --git a/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/webserver/EMAC.c b/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/webserver/EMAC.c
index 464e4cfa1a4fa06428d0971baa4ff709b03fd8f8..173a81aae4283fd932eea903808142cd5d0bcc71 100644 (file)
--- a/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/webserver/EMAC.c
+++ b/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/webserver/EMAC.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.5.3 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.0 - 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
@@ -78,7 +78,7 @@
 #include "net/uip.h"\r
 \r
 /* The time to wait between attempts to obtain a free buffer. */\r
-#define emacBUFFER_WAIT_DELAY_ms               ( 3 / portTICK_RATE_MS )\r
+#define emacBUFFER_WAIT_DELAY_ms               ( 3 / portTICK_PERIOD_MS )\r
 \r
 /* The number of times emacBUFFER_WAIT_DELAY_ms should be waited before giving\r
 up on attempting to obtain a free buffer all together. */\r
@@ -95,7 +95,7 @@ more than two. */
 #define emacNUM_BUFFERS                ( emacNUM_RX_DESCRIPTORS + emacNUM_TX_BUFFERS )\r
 \r
 /* The time to wait for the Tx descriptor to become free. */\r
-#define emacTX_WAIT_DELAY_ms ( 10 / portTICK_RATE_MS )\r
+#define emacTX_WAIT_DELAY_ms ( 10 / portTICK_PERIOD_MS )\r
 \r
 /* The total number of times to wait emacTX_WAIT_DELAY_ms for the Tx descriptor to\r
 become free. */\r
@@ -503,12 +503,12 @@ static void prvResetMAC( void )
 {\r
        /* Ensure the EtherC and EDMAC are enabled. */\r
        SYSTEM.MSTPCRB.BIT.MSTPB15 = 0;\r
-       vTaskDelay( 100 / portTICK_RATE_MS );\r
+       vTaskDelay( 100 / portTICK_PERIOD_MS );\r
        \r
        EDMAC.EDMR.BIT.SWR = 1; \r
        \r
        /* Crude wait for reset to complete. */\r
-       vTaskDelay( 500 / portTICK_RATE_MS );   \r
+       vTaskDelay( 500 / portTICK_PERIOD_MS ); \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -551,7 +551,7 @@ void vEMAC_ISR_Handler( void )
 {\r
 unsigned long ul = EDMAC.EESR.LONG;\r
 long lHigherPriorityTaskWoken = pdFALSE;\r
-extern xQueueHandle xEMACEventQueue;\r
+extern QueueHandle_t xEMACEventQueue;\r
 const unsigned long ulRxEvent = uipETHERNET_RX_EVENT;\r
 \r
        /* Has a Tx end occurred? */\r