Ready for V5.1.1 release.

[freertos] / Demo / ARM7_LPC2368_Rowley / webserver / uIP_Task.c

diff --git a/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c b/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
index 10c8851bcd78ceb57c0ac8f94d64248a8284213b..6576b4ac0980cc6ceea20f80f5aa8a2dc81bb2f9 100644 (file)
--- a/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*\r
-       FreeRTOS.org V4.2.1 - Copyright (C) 2003-2007 Richard Barry.\r
+       FreeRTOS.org V5.1.1 - Copyright (C) 2003-2008 Richard Barry.\r
 \r
        This file is part of the FreeRTOS.org distribution.\r
 \r
@@ -62,7 +62,7 @@
 #define uipIP_ADDR0            172\r
 #define uipIP_ADDR1            25\r
 #define uipIP_ADDR2            218\r
-#define uipIP_ADDR3            9       \r
+#define uipIP_ADDR3            10      \r
 \r
 /* How long to wait before attempting to connect the MAC again. */\r
 #define uipINIT_WAIT    100\r
@@ -115,7 +115,7 @@ void vuIP_Task( void *pvParameters )
 portBASE_TYPE i;\r
 uip_ipaddr_t xIPAddr;\r
 struct timer periodic_timer, arp_timer;\r
-extern void ( vEMAC_ISR )( void );\r
+extern void ( vEMAC_ISR_Wrapper )( void );\r
 \r
        /* Create the semaphore used by the ISR to wake this task. */\r
        vSemaphoreCreateBinary( xEMACSemaphore );\r
@@ -138,7 +138,7 @@ extern void ( vEMAC_ISR )( void );
        {\r
         IntEnable = INT_RX_DONE;\r
         VICIntEnable |= 0x00200000;\r
-        VICVectAddr21 = ( portLONG ) vEMAC_ISR;\r
+        VICVectAddr21 = ( portLONG ) vEMAC_ISR_Wrapper;\r
                prvSetMACAddress();\r
        }\r
        portEXIT_CRITICAL();\r
@@ -224,9 +224,7 @@ static void prvENET_Send(void)
 \r
     /* Copy the header into the Tx buffer. */\r
     CopyToFrame_EMAC( uip_buf, uipTOTAL_FRAME_HEADER_SIZE );\r
-\r
-    /* If there is room, also copy in the application data if any. */\r
-    if( ( uip_len > uipTOTAL_FRAME_HEADER_SIZE ) && ( uip_len <= ( ETH_FRAG_SIZE - uipTOTAL_FRAME_HEADER_SIZE - 1 ) ) )\r
+    if( uip_len > uipTOTAL_FRAME_HEADER_SIZE )\r
     {\r
         CopyToFrame_EMAC( uip_appdata, ( uip_len - uipTOTAL_FRAME_HEADER_SIZE ) );\r
     }\r