Update version number to 8.1.1 for patch release that re-enables mutexes to be given...

[freertos] / FreeRTOS / Demo / CORTEX_A2F200_SoftConsole / uIP_Task.c

diff --git a/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/uIP_Task.c b/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/uIP_Task.c
index 75acce2cb5c2b3a5cdd9bb66e30c7871c6b4fa49..5c557689d3e4f176ab4e92ca19656b78b0c8e39e 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/uIP_Task.c
+++ b/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/uIP_Task.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.5.3 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.1 - 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
@@ -106,7 +106,7 @@ driver to the uIP stack. */
 #define uipDONT_BLOCK                          0UL\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
@@ -136,7 +136,7 @@ static void prvEMACEventListener( unsigned long ulISREvents );
  * 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
  * Initialise the MAC hardware.\r
@@ -158,7 +158,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
@@ -192,7 +192,7 @@ long lPacketLength;
                if( ( lPacketLength > 0 ) && ( uip_buf != NULL ) )\r
                {\r
                        uip_len = ( u16_t ) lPacketLength;\r
-                       \r
+\r
                        /* Standard uIP loop taken from the uIP manual. */\r
                        if( xHeader->type == htons( UIP_ETHTYPE_IP ) )\r
                        {\r
@@ -237,7 +237,7 @@ long lPacketLength;
                                for( i = 0; i < UIP_CONNS; i++ )\r
                                {\r
                                        uip_periodic( i );\r
-       \r
+\r
                                        /* If the above function invocation resulted in data that\r
                                        should be sent out on the network, the global variable\r
                                        uip_len is set to a value > 0. */\r
@@ -286,7 +286,7 @@ struct uip_eth_addr xAddr;
 static void prvInitialise_uIP( void )\r
 {\r
 uip_ipaddr_t xIPAddr;\r
-xTimerHandle xARPTimer, xPeriodicTimer;\r
+TimerHandle_t xARPTimer, xPeriodicTimer;\r
 \r
        uip_init();\r
        uip_ipaddr( &xIPAddr, configIP_ADDR0, configIP_ADDR1, configIP_ADDR2, configIP_ADDR3 );\r
@@ -300,15 +300,15 @@ xTimerHandle xARPTimer, xPeriodicTimer;
        xEMACEventQueue = xQueueCreate( uipEVENT_QUEUE_LENGTH, sizeof( unsigned long ) );\r
 \r
        /* Create and start the uIP timers. */\r
-       xARPTimer = xTimerCreate(       ( signed char * ) "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(  ( signed char * ) "PeriodicTimer",\r
-                                                                       ( 500UL / portTICK_RATE_MS ),\r
+       xPeriodicTimer = xTimerCreate(  "PeriodicTimer",\r
+                                                                       ( 500UL / portTICK_PERIOD_MS ),\r
                                                                        pdTRUE, /* Autor-reload. */\r
                                                                        ( void * ) uipPERIODIC_TIMER,\r
                                                                        prvUIPTimerCallback\r
@@ -370,7 +370,7 @@ void vEMACWrite( void )
 {\r
 const long lMaxAttempts = 10;\r
 long lAttempt;\r
-const portTickType xShortDelay = ( 5 / portTICK_RATE_MS );\r
+const TickType_t xShortDelay = ( 5 / portTICK_PERIOD_MS );\r
 \r
        /* Try to send data to the Ethernet.  Keep trying for a while if data cannot\r
        be sent immediately.  Note that this will actually cause the data to be sent\r
@@ -390,7 +390,7 @@ const portTickType xShortDelay = ( 5 / portTICK_RATE_MS );
 }\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
@@ -418,7 +418,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