diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws
index 381da059a..ef666fddb 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws
@@ -7,9 +7,7 @@
 [GENERAL_DATA]
 [BREAKPOINTS]
 [OPEN_WORKSPACE_FILES]
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" 
 [WORKSPACE_FILE_STATES]
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" -4 -23 1442 660 1 0 
 [LOADED_PROJECTS]
 "RTOSDemo" 
 [END]
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h
index 9fa66759e..ae232e346 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h
@@ -135,10 +135,10 @@ to exclude the API function. */
 #define configMAC_ADDR5	0x11
 
 /* IP address configuration. */
-#define configIP_ADDR0		192
-#define configIP_ADDR1		168
-#define configIP_ADDR2		0
-#define configIP_ADDR3		201
+#define configIP_ADDR0		172
+#define configIP_ADDR1		25
+#define configIP_ADDR2		218
+#define configIP_ADDR3		200
 
 /* Netmask configuration. */
 #define configNET_MASK0		255
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/ParTest.c b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/ParTest.c
index 6abffa404..35285f0c0 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/ParTest.c
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/ParTest.c
@@ -75,20 +75,6 @@ void vParTestInitialise( void )
 {
 	/* Port pin configuration is done by the low level set up prior to this
 	function being called. */
-
-	/* Start with all LEDs off. */
-	LED0 = LED_OFF;
-	LED1 = LED_OFF;
-	LED2 = LED_OFF;
-	LED3 = LED_OFF;
-	LED4 = LED_OFF;
-	LED5 = LED_OFF;
-	LED6 = LED_OFF;
-	LED7 = LED_OFF;
-	LED8 = LED_OFF;
-	LED9 = LED_OFF;
-	LED10 = LED_OFF;
-	LED11 = LED_OFF;
 }
 /*-----------------------------------------------------------*/
 
@@ -103,29 +89,29 @@ void vParTestSetLED( unsigned long ulLED, signed long xValue )
 			{
 				switch( ulLED )
 				{
-					case 0:	LED0 = LED_ON;
+					case 0:	LED4 = LED_ON;
 							break;
-					case 1:	LED1 = LED_ON;
+					case 1:	LED5 = LED_ON;
 							break;
-					case 2:	LED2 = LED_ON;
+					case 2:	LED6 = LED_ON;
 							break;
-					case 3:	LED3 = LED_ON;
+					case 3:	LED7 = LED_ON;
 							break;
-					case 4:	LED4 = LED_ON;
+					case 4:	LED8 = LED_ON;
 							break;
-					case 5:	LED5 = LED_ON;
+					case 5:	LED9 = LED_ON;
 							break;
-					case 6:	LED6 = LED_ON;
+					case 6:	LED10 = LED_ON;
 							break;
-					case 7:	LED7 = LED_ON;
+					case 7:	LED11 = LED_ON;
 							break;
-					case 8:	LED8 = LED_ON;
+					case 8:	LED12 = LED_ON;
 							break;
-					case 9:	LED9 = LED_ON;
+					case 9:	LED13 = LED_ON;
 							break;
-					case 10:LED10 = LED_ON;
+					case 10:LED14 = LED_ON;
 							break;
-					case 11:LED11 = LED_ON;
+					case 11:LED15 = LED_ON;
 							break;
 				}
 			}
@@ -138,29 +124,29 @@ void vParTestSetLED( unsigned long ulLED, signed long xValue )
 			{
 				switch( ulLED )
 				{
-					case 0:	LED0 = LED_OFF;
+					case 0:	LED4 = LED_OFF;
 							break;
-					case 1:	LED1 = LED_OFF;
+					case 1:	LED5 = LED_OFF;
 							break;
-					case 2:	LED2 = LED_OFF;
+					case 2:	LED6 = LED_OFF;
 							break;
-					case 3:	LED3 = LED_OFF;
+					case 3:	LED7 = LED_OFF;
 							break;
-					case 4:	LED4 = LED_OFF;
+					case 4:	LED8 = LED_OFF;
 							break;
-					case 5:	LED5 = LED_OFF;
+					case 5:	LED9 = LED_OFF;
 							break;
-					case 6:	LED6 = LED_OFF;
+					case 6:	LED10 = LED_OFF;
 							break;
-					case 7:	LED7 = LED_OFF;
+					case 7:	LED11 = LED_OFF;
 							break;
-					case 8:	LED8 = LED_OFF;
+					case 8:	LED12 = LED_OFF;
 							break;
-					case 9:	LED9 = LED_OFF;
+					case 9:	LED13 = LED_OFF;
 							break;
-					case 10:LED10 = LED_OFF;
+					case 10:LED14 = LED_OFF;
 							break;
-					case 11:LED11 = LED_OFF;
+					case 11:LED15 = LED_OFF;
 							break;
 				}
 
@@ -199,62 +185,62 @@ long lReturn = pdFALSE;
 	{
 		switch( ulLED )
 		{
-			case 0	:	if( LED0 != 0 )
+			case 0	:	if( LED4 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 1	:	if( LED1 != 0 )
+			case 1	:	if( LED5 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 2	:	if( LED2 != 0 )
+			case 2	:	if( LED6 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 3	:	if( LED3 != 0 )
+			case 3	:	if( LED7 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 4	:	if( LED4 != 0 )
+			case 4	:	if( LED8 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 5	:	if( LED5 != 0 )
+			case 5	:	if( LED9 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 6	:	if( LED6 != 0 )
+			case 6	:	if( LED10 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 7	:	if( LED7 != 0 )
+			case 7	:	if( LED11 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 8	:	if( LED8 != 0 )
+			case 8	:	if( LED12 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 9	:	if( LED9 != 0 )
+			case 9	:	if( LED13 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 10	:	if( LED10 != 0 )
+			case 10	:	if( LED14 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
 						break;
-			case 11	:	if( LED11 != 0 )
+			case 11	:	if( LED15 != 0 )
 						{
 							lReturn =  pdTRUE;
 						}
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp
index 789f0d5da..1aa687967 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp
@@ -131,6 +131,13 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "User" "C source file|Common demo tasks" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "User" "C source file|Common demo tasks" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "User" "C source file|Common demo tasks" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\http-strings.c" "User" "C source file|FreeTCP (based on uIP)|webserver|Common" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd-fs.c" "User" "C source file|FreeTCP (based on uIP)|webserver|Common" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd.c" "User" "C source file|FreeTCP (based on uIP)|webserver|Common" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\psock.c" "User" "C source file|FreeTCP (based on uIP)" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\timer.c" "User" "C source file|FreeTCP (based on uIP)" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip.c" "User" "C source file|FreeTCP (based on uIP)" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip_arp.c" "User" "C source file|FreeTCP (based on uIP)" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "User" "C source file" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "User" "C source file" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "User" "C source file" 2 
@@ -144,6 +151,11 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "User" "C source file|Renesas Files" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "User" "C source file" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "User" "C source file" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\uIP_Task.c" "User" "C source file" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\EMAC.c" "User" "C source file|FreeTCP (based on uIP)|webserver|Port specific" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-cgi.c" "User" "C source file|FreeTCP (based on uIP)|webserver|Port specific" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-fsdata.c" "User" "C source file|FreeTCP (based on uIP)|webserver|Port specific" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\phy.c" "User" "C source file|FreeTCP (based on uIP)|webserver|Port specific" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "User" "C source file|FreeRTOS" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "User" "C source file|FreeRTOS|Portable layer" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "User" "C source file|FreeRTOS|Portable layer" 2 
@@ -154,6 +166,10 @@
 "C source file|Common demo tasks" "" 
 "C source file|FreeRTOS" "" 
 "C source file|FreeRTOS|Portable layer" "" 
+"C source file|FreeTCP (based on uIP)" "" 
+"C source file|FreeTCP (based on uIP)|webserver" "" 
+"C source file|FreeTCP (based on uIP)|webserver|Common" "" 
+"C source file|FreeTCP (based on uIP)|webserver|Port specific" "" 
 "C source file|Renesas Files" "" 
 [GENERAL_DATA_PROJECT]
 "MAKEGEN_GENERATE_MAKEFILE_FOR" "0" 
@@ -172,7 +188,7 @@
 [GENERAL_DATA_SESSION_SessionRX600_E1_E20_SYSTEM]
 [GENERAL_DATA_SESSION_SimSessionRX600]
 [OPTIONS_Blinky_Renesas OptLinker]
-"Single Shot" "026c1f52b354bc10" 5 
+"Single Shot" "0cb38d9776b4bc10" 5 
 [OPTIONS_Blinky_Renesas RX Assembler]
 "Assembly source file" "088b30f0a993bc10" 4 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowlvl.src" "0cd92d23ed14bc10" 4 
@@ -192,6 +208,13 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "05d6fdab4a04bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\http-strings.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd-fs.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\psock.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\timer.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip_arp.c" "004baa8c48a4bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "00526507a114bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "0a762c328df3bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "067b2354f2d3bc10" 2 
@@ -204,6 +227,11 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "0cd92d23ed14bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "02c169eb6f14bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "03ceac85ed14bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\uIP_Task.c" "0630f4bd78a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\EMAC.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-cgi.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-fsdata.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\phy.c" "0f825c9776b4bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "067b2354f2d3bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "067b2354f2d3bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "067b2354f2d3bc10" 2 
@@ -212,7 +240,7 @@
 [OPTIONS_Blinky_Renesas RX C/C++ Library Generator]
 "Single Shot" "0ca340787f14bc10" 1 
 [OPTIONS_Blinky_Renesas RX Configurator]
-"Single Shot" "02c169eb6f14bc10" 6 
+"Single Shot" "0f825c9776b4bc10" 6 
 [OPTIONS_Blinky]
 "" 0 
 "[V|VERSION|1] [B|COMMAND|1] [S|SPEC|UITRON4] [S|OUTPUTPATH|^"$(CONFIGDIR)^"] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 6 
@@ -245,55 +273,67 @@
 [LINKAGE_ORDER_Blinky]
 [GENERAL_DATA_CONFIGURATION_Blinky]
 [OPTIONS_Debug_Renesas OptLinker]
-"Single Shot" "021ac70d6f14bc10" 5 
+"Single Shot" "0cb38d9776b4bc10" 5 
 [OPTIONS_Debug_Renesas RX Assembler]
 "Assembly source file" "088b30f0a993bc10" 4 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowlvl.src" "0cd92d23ed14bc10" 4 
 "Linkage symbol file" "088b30f0a993bc10" 4 
 [OPTIONS_Debug_Renesas RX C/C++ Compiler]
-"C source file" "067b2354f2d3bc10" 2 
-"C++ source file" "067b2354f2d3bc10" 3 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\BlockQ.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\GenQTest.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\IntQueue.c" "090dfce07df3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\PollQ.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\QPeek.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\blocktim.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\death.c" "0984667d4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flash.c" "02b798669af3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flop.c" "0fd4f0520214bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "05d6fdab4a04bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "00526507a114bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "0a762c328df3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "067b2354f2d3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\dbsct.c" "0cd92d23ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\hwsetup.c" "0cd92d23ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\intprg.c" "0cd92d23ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowsrc.c" "0cd92d23ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\resetprg.c" "0cd92d23ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\sbrk.c" "0cd92d23ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "0cd92d23ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "02c169eb6f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "03ceac85ed14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "067b2354f2d3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "067b2354f2d3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "067b2354f2d3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\queue.c" "067b2354f2d3bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" "067b2354f2d3bc10" 2 
+"C source file" "0ef4061f39a4bc10" 2 
+"C++ source file" "0ef4061f39a4bc10" 3 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\BlockQ.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\GenQTest.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\IntQueue.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\PollQ.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\QPeek.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\blocktim.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\death.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flash.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flop.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\http-strings.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd-fs.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\psock.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\timer.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip_arp.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\dbsct.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\hwsetup.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\intprg.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowsrc.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\resetprg.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\sbrk.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\uIP_Task.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\EMAC.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-cgi.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-fsdata.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\phy.c" "0f825c9776b4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\queue.c" "0ef4061f39a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" "0ef4061f39a4bc10" 2 
 [OPTIONS_Debug_Renesas RX C/C++ Library Generator]
 "Single Shot" "09bd5759e094bc10" 1 
 [OPTIONS_Debug_Renesas RX Configurator]
-"Single Shot" "02c169eb6f14bc10" 6 
+"Single Shot" "0f825c9776b4bc10" 6 
 [OPTIONS_Debug]
 "" 0 
 "[V|VERSION|1] [B|COMMAND|1] [S|SPEC|UITRON4] [S|OUTPUTPATH|^"$(CONFIGDIR)^"] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 6 
 "[V|VERSION|1] [B|SJIS|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1]
 " 4 
-"[V|VERSION|1] [S|LANG|CPP] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|0] [B|SIZE|1] [B|MAP|0] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
+"[V|VERSION|1] [S|LANG|CPP] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"|^"$(PROJDIR)\..\..\Common\ethernet\FreeTCPIP^"|^"$(PROJDIR)\webserver^"] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|0] [B|SIZE|1] [B|MAP|0] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
 " 3 
-"[V|VERSION|1] [S|LANG|C] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|0] [B|SIZE|1] [B|MAP|0] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
+"[V|VERSION|1] [S|LANG|C] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"|^"$(PROJDIR)\..\..\Common\ethernet\FreeTCPIP^"|^"$(PROJDIR)\webserver^"] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|0] [B|SIZE|1] [B|MAP|0] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
 " 2 
 "[V|VERSION|1] [S|MODE|BUILD/CHANGED] [S|EXISTOUTPUTPATH|^"$(CONFIGDIR)\$(PROJECTNAME).lib^"] [B|RUNTIME|1] [B|MATH|1] [B|STDIO|1] [B|STDLIB|1] [B|STRING|1] [B|NOFLOAT|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(PROJECTNAME).lib^"] [B|SIZE|1] [I|INLINE|100] [I|LOOP|2] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1]
 " 1 
@@ -301,17 +341,18 @@
 " 5 
 [EXCLUDED_FILES_Debug]
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-fsdata.c" 
 [LINKAGE_ORDER_Debug]
 [GENERAL_DATA_CONFIGURATION_Debug]
 [OPTIONS_Debug_RX600_E1_E20_SYSTEM_Renesas OptLinker]
-"Single Shot" "0fd3fdfb6f14bc10" 4 
+"Single Shot" "0cb38d9776b4bc10" 5 
 [OPTIONS_Debug_RX600_E1_E20_SYSTEM_Renesas RX Assembler]
-"Assembly source file" "0cb120ca4793bc10" 3 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowlvl.src" "0cd92d23ed14bc10" 3 
-"Linkage symbol file" "0cb120ca4793bc10" 3 
+"Assembly source file" "0cb120ca4793bc10" 4 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowlvl.src" "0cd92d23ed14bc10" 4 
+"Linkage symbol file" "0cb120ca4793bc10" 4 
 [OPTIONS_Debug_RX600_E1_E20_SYSTEM_Renesas RX C/C++ Compiler]
 "C source file" "0cb120ca4793bc10" 2 
-"C++ source file" "0cb120ca4793bc10" 2 
+"C++ source file" "0c61074bd8a4bc10" 3 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\BlockQ.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\GenQTest.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\IntQueue.c" "090dfce07df3bc10" 2 
@@ -324,6 +365,13 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "05d6fdab4a04bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\http-strings.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd-fs.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\psock.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\timer.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip_arp.c" "004baa8c48a4bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "00526507a114bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "0a762c328df3bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "08d08b78d2d3bc10" 2 
@@ -336,6 +384,11 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "0cd92d23ed14bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "02c169eb6f14bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "03ceac85ed14bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\uIP_Task.c" "0630f4bd78a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\EMAC.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-cgi.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-fsdata.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\phy.c" "0f825c9776b4bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "04345d232893bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "0b083d452893bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "0b8497895893bc10" 2 
@@ -344,67 +397,81 @@
 [OPTIONS_Debug_RX600_E1_E20_SYSTEM_Renesas RX C/C++ Library Generator]
 "Single Shot" "0cb120ca4793bc10" 1 
 [OPTIONS_Debug_RX600_E1_E20_SYSTEM_Renesas RX Configurator]
-"Single Shot" "02c169eb6f14bc10" 5 
+"Single Shot" "0f825c9776b4bc10" 6 
 [OPTIONS_Debug_RX600_E1_E20_SYSTEM]
 "" 0 
 "[S|OUTPUTPATH|^"$(CONFIGDIR)\$(PROJECTNAME).lib^"] [V|VERSION|1] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|ROUND|NEAREST] [S|DBL_SIZE|4] [B|SIGNED_CHAR|0] [B|SIGNED_BITFIELD|0] [S|BIT_ORDER|RIGHT] [S|FINT_REGISTER|0] [S|BRANCH|24] [S|LANG|C] [B|RUNTIME|1] [B|CTYPE|0] [B|MATH|0] [B|MATHF|0] [B|STDARG|0] [B|STDIO|0] [B|STDLIB|0] [B|STRING|0] [B|IOS|0] [B|NEW|1] [B|COMPLEX|0] [B|CPPSTRING|0] [S|MODE|BUILD/CHANGED]" 1 
-"[V|VERSION|1] [B|COMMAND|1] [S|SPEC|UITRON4] [S|OUTPUTPATH|^"$(CONFIGDIR)^"] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 5 
-"[V|VERSION|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|LISTFILE|0] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 3 
+"[V|VERSION|1] [B|COMMAND|1] [S|SPEC|UITRON4] [S|OUTPUTPATH|^"$(CONFIGDIR)^"] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 6 
+"[V|VERSION|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|LISTFILE|0] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 4 
 "[V|VERSION|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|LISTFILE|0] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|ROUND|NEAREST] [S|DBL_SIZE|4] [B|SIGNED_CHAR|0] [B|SIGNED_BITFIELD|0] [S|BIT_ORDER|RIGHT] [S|FINT_REGISTER|0] [S|BRANCH|24]" 2 
-"[V|VERSION|6] [B|DEBUG|1] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).abs^"]  [B|LIST|1] [S|LIST|^"$(CONFIGDIR)\$(PROJECTNAME).map^"] [B|OPTIMIZE|0] [S|ROM|(D,R)|(D_1,R_1)|(D_2,R_2)] [S|FORM|STYPE] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).mot^"] [S|START|B_1,R_1,B_2,R_2,B,R,SU,SI(1000)|PResetPRG(FFFF8000)|C_1,C_2,C,C$*,D*,P,PIntPRG,W*(FFFF8100)|FIXEDVECT(FFFFFFD0)]" 4 
+"[V|VERSION|1] [S|LANG|CPP] [B|SJIS|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [B|SIZE|1] [B|MAP|0] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE]
+" 3 
+"[V|VERSION|6] [B|DEBUG|1] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).abs^"]  [B|LIST|1] [S|LIST|^"$(CONFIGDIR)\$(PROJECTNAME).map^"] [B|OPTIMIZE|0] [S|ROM|(D,R)|(D_1,R_1)|(D_2,R_2)] [S|FORM|STYPE] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).mot^"] [S|START|B_1,R_1,B_2,R_2,B,R,SU,SI(1000)|PResetPRG(FFFF8000)|C_1,C_2,C,C$*,D*,P,PIntPRG,W*(FFFF8100)|FIXEDVECT(FFFFFFD0)]" 5 
 [EXCLUDED_FILES_Debug_RX600_E1_E20_SYSTEM]
 [LINKAGE_ORDER_Debug_RX600_E1_E20_SYSTEM]
 [GENERAL_DATA_CONFIGURATION_Debug_RX600_E1_E20_SYSTEM]
 [OPTIONS_Debug_with_optimisation_Renesas OptLinker]
-"Single Shot" "0365455c6f14bc10" 5 
+"Single Shot" "0cb38d9776b4bc10" 5 
 [OPTIONS_Debug_with_optimisation_Renesas RX Assembler]
 "Assembly source file" "088b30f0a993bc10" 4 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowlvl.src" "0cd92d23ed14bc10" 4 
 "Linkage symbol file" "088b30f0a993bc10" 4 
 [OPTIONS_Debug_with_optimisation_Renesas RX C/C++ Compiler]
-"C source file" "03e2e2a06f14bc10" 2 
-"C++ source file" "03e2e2a06f14bc10" 3 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\BlockQ.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\GenQTest.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\IntQueue.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\PollQ.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\QPeek.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\blocktim.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\death.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flash.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flop.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\dbsct.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\hwsetup.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\intprg.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowsrc.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\resetprg.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\sbrk.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "02c169eb6f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\queue.c" "03e2e2a06f14bc10" 2 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" "03e2e2a06f14bc10" 2 
+"C source file" "035db50ed8a4bc10" 2 
+"C++ source file" "035db50ed8a4bc10" 3 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\BlockQ.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\GenQTest.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\IntQueue.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\PollQ.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\QPeek.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\blocktim.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\death.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flash.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\flop.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\http-strings.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd-fs.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\psock.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\timer.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip_arp.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\dbsct.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\hwsetup.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\intprg.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowsrc.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\resetprg.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\sbrk.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\uIP_Task.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\EMAC.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-cgi.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-fsdata.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\phy.c" "0f825c9776b4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\queue.c" "035db50ed8a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" "035db50ed8a4bc10" 2 
 [OPTIONS_Debug_with_optimisation_Renesas RX C/C++ Library Generator]
 "Single Shot" "00e576febe14bc10" 1 
 [OPTIONS_Debug_with_optimisation_Renesas RX Configurator]
-"Single Shot" "02c169eb6f14bc10" 6 
+"Single Shot" "0f825c9776b4bc10" 6 
 [OPTIONS_Debug_with_optimisation]
 "" 0 
 "[V|VERSION|1] [B|COMMAND|1] [S|SPEC|UITRON4] [S|OUTPUTPATH|^"$(CONFIGDIR)^"] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 6 
 "[V|VERSION|1] [B|SJIS|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1]
 " 4 
-"[V|VERSION|1] [S|LANG|CPP] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"] [S|DEFINE|INCLUDE_HIGH_FREQUENCY_TIMER_TEST=1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|MAX] [B|SIZE|1] [B|MAP|1] [S|MAPPATH|^"$(CONFIGDIR)\$(PROJECTNAME).bls^"] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
+"[V|VERSION|1] [S|LANG|CPP] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"|^"$(PROJDIR)\..\..\Common\ethernet\FreeTCPIP^"|^"$(PROJDIR)\webserver^"] [S|DEFINE|INCLUDE_HIGH_FREQUENCY_TIMER_TEST=1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|MAX] [B|SIZE|1] [B|MAP|1] [S|MAPPATH|^"$(CONFIGDIR)\$(PROJECTNAME).bls^"] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
 " 3 
-"[V|VERSION|1] [S|LANG|C] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"] [S|DEFINE|INCLUDE_HIGH_FREQUENCY_TIMER_TEST=1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|MAX] [B|SIZE|1] [B|MAP|1] [S|MAPPATH|^"$(CONFIGDIR)\$(PROJECTNAME).bls^"] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
+"[V|VERSION|1] [S|LANG|C] [B|SJIS|1] [S|INCLUDE|^"$(PROJDIR)\..\..\..\Source\portable\Renesas\RX600^"|^"$(PROJDIR)\..\..\..\Source\include^"|^"$(PROJDIR)\.^"|^"$(PROJDIR)\..\..\include^"|^"$(PROJDIR)\..\..\Common\include^"|^"$(PROJDIR)\.\include^"|^"$(PROJDIR)\..\..\Common\ethernet\FreeTCPIP^"|^"$(PROJDIR)\webserver^"] [S|DEFINE|INCLUDE_HIGH_FREQUENCY_TIMER_TEST=1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [S|OPTIMIZE|MAX] [B|SIZE|1] [B|MAP|1] [S|MAPPATH|^"$(CONFIGDIR)\$(PROJECTNAME).bls^"] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1] [N|DEPENDSCAN|1]
 " 2 
 "[V|VERSION|1] [S|MODE|BUILD/CHANGED] [S|EXISTOUTPUTPATH|^"$(CONFIGDIR)\$(PROJECTNAME).lib^"] [B|RUNTIME|1] [B|MATH|1] [B|STDIO|1] [B|STDLIB|1] [B|STRING|1] [B|NOFLOAT|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(PROJECTNAME).lib^"] [B|SIZE|1] [I|INLINE|100] [I|LOOP|2] [S|CPU|RX600] [S|BASE|00000000=NONE] [B|SKIPDEPENDENCY|1]
 " 1 
@@ -415,14 +482,14 @@
 [LINKAGE_ORDER_Debug_with_optimisation]
 [GENERAL_DATA_CONFIGURATION_Debug_with_optimisation]
 [OPTIONS_SimDebug_RX600_Renesas OptLinker]
-"Single Shot" "0fd3fdfb6f14bc10" 4 
+"Single Shot" "0cb38d9776b4bc10" 5 
 [OPTIONS_SimDebug_RX600_Renesas RX Assembler]
-"Assembly source file" "0cb120ca4793bc10" 3 
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowlvl.src" "0cd92d23ed14bc10" 3 
-"Linkage symbol file" "0cb120ca4793bc10" 3 
+"Assembly source file" "0cb120ca4793bc10" 4 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\lowlvl.src" "0cd92d23ed14bc10" 4 
+"Linkage symbol file" "0cb120ca4793bc10" 4 
 [OPTIONS_SimDebug_RX600_Renesas RX C/C++ Compiler]
 "C source file" "0cb120ca4793bc10" 2 
-"C++ source file" "0cb120ca4793bc10" 2 
+"C++ source file" "0c61074bd8a4bc10" 3 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\BlockQ.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\GenQTest.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\IntQueue.c" "090dfce07df3bc10" 2 
@@ -435,6 +502,13 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\integer.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "05d6fdab4a04bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\semtest.c" "05d6fdab4a04bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\http-strings.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd-fs.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\apps\httpd\httpd.c" "0b92e45f48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\psock.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\timer.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip.c" "004baa8c48a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\ethernet\FreeTCPIP\uip_arp.c" "004baa8c48a4bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\HighFrequencyTimerTest.c" "00526507a114bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\IntQueueTimer.c" "0a762c328df3bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\ParTest.c" "08d08b78d2d3bc10" 2 
@@ -447,6 +521,11 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\Renesas-Files\vecttbl.c" "0cd92d23ed14bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" "02c169eb6f14bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" "03ceac85ed14bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\uIP_Task.c" "0630f4bd78a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\EMAC.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-cgi.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\httpd-fsdata.c" "0e36287188a4bc10" 2 
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\webserver\phy.c" "0f825c9776b4bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\list.c" "04345d232893bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "0b083d452893bc10" 2 
 "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\RX600\port.c" "0b8497895893bc10" 2 
@@ -455,14 +534,16 @@
 [OPTIONS_SimDebug_RX600_Renesas RX C/C++ Library Generator]
 "Single Shot" "0cb120ca4793bc10" 1 
 [OPTIONS_SimDebug_RX600_Renesas RX Configurator]
-"Single Shot" "02c169eb6f14bc10" 5 
+"Single Shot" "0f825c9776b4bc10" 6 
 [OPTIONS_SimDebug_RX600]
 "" 0 
 "[S|OUTPUTPATH|^"$(CONFIGDIR)\$(PROJECTNAME).lib^"] [V|VERSION|1] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|ROUND|NEAREST] [S|DBL_SIZE|4] [B|SIGNED_CHAR|0] [B|SIGNED_BITFIELD|0] [S|BIT_ORDER|RIGHT] [S|FINT_REGISTER|0] [S|BRANCH|24] [S|LANG|C] [B|RUNTIME|1] [B|CTYPE|0] [B|MATH|0] [B|MATHF|0] [B|STDARG|0] [B|STDIO|0] [B|STDLIB|0] [B|STRING|0] [B|IOS|0] [B|NEW|1] [B|COMPLEX|0] [B|CPPSTRING|0] [S|MODE|BUILD/CHANGED]" 1 
-"[V|VERSION|1] [B|COMMAND|1] [S|SPEC|UITRON4] [S|OUTPUTPATH|^"$(CONFIGDIR)^"] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 5 
-"[V|VERSION|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|LISTFILE|0] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 3 
+"[V|VERSION|1] [B|COMMAND|1] [S|SPEC|UITRON4] [S|OUTPUTPATH|^"$(CONFIGDIR)^"] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 6 
+"[V|VERSION|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|LISTFILE|0] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|FINT_REGISTER|0]" 4 
 "[V|VERSION|1] [B|DEBUG|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|LISTFILE|0] [S|CPU|RX600] [S|ENDIAN|LITTLE] [S|ROUND|NEAREST] [S|DBL_SIZE|4] [B|SIGNED_CHAR|0] [B|SIGNED_BITFIELD|0] [S|BIT_ORDER|RIGHT] [S|FINT_REGISTER|0] [S|BRANCH|24]" 2 
-"[V|VERSION|6] [B|DEBUG|1] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).abs^"]  [B|LIST|1] [S|LIST|^"$(CONFIGDIR)\$(PROJECTNAME).map^"] [B|OPTIMIZE|0] [S|ROM|(D,R)|(D_1,R_1)|(D_2,R_2)] [S|FORM|STYPE] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).mot^"] [S|START|B_1,R_1,B_2,R_2,B,R,SU,SI(1000)|PResetPRG(FFFF8000)|C_1,C_2,C,C$*,D*,P,PIntPRG,W*(FFFF8100)|FIXEDVECT(FFFFFFD0)]" 4 
+"[V|VERSION|1] [S|LANG|CPP] [B|SJIS|1] [S|OUTPUTPATH|^"$(CONFIGDIR)\$(FILELEAF).obj^"] [B|DEBUG|1] [B|SIZE|1] [B|MAP|0] [I|INLINE|100] [I|LOOP|2] [S|MISRA2004_CHECK_RULE|ALL] [S|MISRA2004_RULE|1.1|3.4|4.1|5.2|5.3|5.4|5.5|5.6|5.7|6.1|6.2|6.3|6.4|6.5|7.1|8.1|8.2|8.3|8.5|8.6|8.7|8.8|8.11|8.12|9.2|9.3|10.1|10.2|10.3|10.4|10.5|10.6|11.1|11.2|11.3|11.4|11.5|12.1|12.2|12.3|12.4|12.5|12.6|12.7|12.8|12.9|12.10|12.11|12.12|12.13|13.1|13.2|13.3|13.4|13.7|14.1|14.2|14.3|14.4|14.5|14.6|14.7|14.8|14.9|14.10|15.1|15.2|15.3|15.4|15.5|16.1|16.2|16.3|16.4|16.5|16.6|16.8|16.9|17.3|17.4|17.5|17.6|18.1|18.2|18.4|19.1|20.2|20.4|20.5|20.7|20.8|20.9|20.10|20.11|20.12] [S|MISRA1998_CHECK_RULE|ALL] [S|MISRA1998_RULE|1|5|8|12|13|14|17|18|19|20|21|22|24|28|29|31|32|33|34|35|36|37|38|39|40|42|43|44|45|46|48|49|50|51|53|54|55|56|57|58|59|60|61|62|63|64|65|68|69|70|71|72|73|74|75|76|77|78|79|80|82|83|84|85|99|101|102|103|104|105|106|108|110|111|112|113|115|118|119|121|122|123|124|125|126|127] [S|MISRA_GROUP_FILE_PATH|^"$(PROJDIR)\$(PROJECTNAME).rde^"] [S|CPU|RX600] [S|BASE|00000000=NONE]
+" 3 
+"[V|VERSION|6] [B|DEBUG|1] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).abs^"]  [B|LIST|1] [S|LIST|^"$(CONFIGDIR)\$(PROJECTNAME).map^"] [B|OPTIMIZE|0] [S|ROM|(D,R)|(D_1,R_1)|(D_2,R_2)] [S|FORM|STYPE] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).mot^"] [S|START|B_1,R_1,B_2,R_2,B,R,SU,SI(1000)|PResetPRG(FFFF8000)|C_1,C_2,C,C$*,D*,P,PIntPRG,W*(FFFF8100)|FIXEDVECT(FFFFFFD0)]" 5 
 [EXCLUDED_FILES_SimDebug_RX600]
 [LINKAGE_ORDER_SimDebug_RX600]
 [GENERAL_DATA_CONFIGURATION_SimDebug_RX600]
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.nav b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.nav
index 5d6c9a6ce..39863df2d 100644
Binary files a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.nav and b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.nav differ
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/Renesas-Files/hwsetup.c b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/Renesas-Files/hwsetup.c
index 3cd4565f8..d8085c12a 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/Renesas-Files/hwsetup.c
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/Renesas-Files/hwsetup.c
@@ -73,7 +73,6 @@ Private global variables and functions
 ******************************************************************************/
 void HardwareSetup(void)
 {
-
 	uint32_t sckcr = 0;
 
 	/* Configure system clocks based on header */
@@ -82,11 +81,50 @@ void HardwareSetup(void)
 	sckcr += (PCLK_MUL==8) ? (0ul <<  8) : (PCLK_MUL==4) ? (1ul <<  8) : (PCLK_MUL==2) ? (2ul <<  8) : (3ul <<  8);
 	SYSTEM.SCKCR.LONG = sckcr;
 
-	/* Configure LED pins as outputs */
-	LED0_DDR = 1; 
-	LED1_DDR = 1;
-	LED2_DDR = 1;
-	LED3_DDR = 1;
+	/* Module standby clear - EtherC, EDMAC */
+	SYSTEM.MSTPCRB.BIT.MSTPB15 = 0;
+
+	PORT0.DDR.BYTE = 0x00 ;     // Port 0: inputs (IRQ's from ethernet & WiFi)
+	PORT1.DDR.BYTE = 0x00 ;     // Port 1: inputs (IIC and USB settings will override these later)
+	PORT2.DDR.BYTE = 0x1A ;     // Port 2: USB signals
+	PORT3.DDR.BYTE = 0x04 ;     // Port 3: JTAG (P30, P31, P34), CAN (P32=Tx, P33=Rx), NMI (P35)
+	PORT4.DDR.BYTE = 0x00 ;     // Port 4: Switches (P40-P42), AIN (P43-P47)
+	PORT5.DDR.BYTE = 0x3B ;     // Port 5: Audio (P55,P54), BCLK (P53), SCI (P52=Rx, P50=Tx), LCD-RS (P51)
+
+	PORTA.DR.BYTE = 0x00 ;      // Port A outputs all LOW to start
+	PORTA.DDR.BYTE = 0xFF ;     // Port A: Expansion (PA0-PA2), Ether (PA3-PA5), Audio (PA6-PA7)
+
+	PORTB.DR.BYTE = 0x00 ;
+	PORTB.DDR.BYTE = 0x70 ;     // Port B: Ether
+
+	PORTC.DR.BYTE = 0xF7 ;      // Port C: Chip selects, clock = high; IO reset = low (not reset, needed by Ether PHY)
+	PORTC.DDR.BYTE = 0x7F ;     // Port C: SPI (PC0-2, PC4-7), IO reset (PC3)                
+
+	// Ethernet settings
+	IOPORT.PFENET.BYTE = 0x82;  // Enable Ether poins, RMII mode, enable LINKSTA
+	PORTA.ICR.BIT.B5 = 1;       // ET_LINKSTA 
+	PORTA.ICR.BIT.B3 = 1;       // ET_MDIO
+	PORTB.ICR.BIT.B0 = 1;       // RMII_RXD1
+	PORTB.ICR.BIT.B1 = 1;       // RMII_RXD0
+	PORTB.ICR.BIT.B2 = 1;       // REF50CLK
+	PORTB.ICR.BIT.B3 = 1;       // RMII_RX_ER
+	PORTB.ICR.BIT.B7 = 1;       // RMII_CRS_DV
+
+
+	/* Configure LEDs */
+	LED4 = LED_OFF;
+	LED5 = LED_OFF;
+	LED6 = LED_OFF;
+	LED7 = LED_OFF;
+	LED8 = LED_OFF;
+	LED9 = LED_OFF;
+	LED10 = LED_OFF;
+	LED11 = LED_OFF;
+	LED12 = LED_OFF;
+	LED13 = LED_OFF;
+	LED14 = LED_OFF;
+	LED15 = LED_OFF;
+
 	LED4_DDR = 1;
 	LED5_DDR = 1;
 	LED6_DDR = 1;
@@ -95,13 +133,18 @@ void HardwareSetup(void)
 	LED9_DDR = 1;
 	LED10_DDR = 1;
 	LED11_DDR = 1;
-	
-	/* Configure LCD pins as outputs - uncomment this if an LCD is present.
-	LCD_RS_DDR = 1;
-	LCD_EN_DDR = 1;
-	LCD_DATA_DDR = 0xF0; */
-
-	/* Initialize display - uncomment this if an LCD is present.
-	InitialiseDisplay(); */
+	LED12_DDR = 1;
+	LED13_DDR = 1;
+	LED14_DDR = 1;
+	LED15_DDR = 1;
+
+	/* Configure push button switches */
+	SW1_DDR = 0;
+	SW2_DDR = 0;
+	SW3_DDR = 0;
+	SW1_ICR = 1;
+	SW2_ICR = 1;
+	SW3_ICR = 1;
 }
 
+
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/SessionRX600_E1_E20_SYSTEM.hsf b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/SessionRX600_E1_E20_SYSTEM.hsf
index eab5820b9..782f0ebfa 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/SessionRX600_E1_E20_SYSTEM.hsf
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/SessionRX600_E1_E20_SYSTEM.hsf
@@ -89,29 +89,29 @@
 "{5F75FDA0-6FF0-11D5-B7CE-00E029352378}PACtrlViews" "0" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_DENORMAL_MODE" "16777216" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_ROUND_MODE" "768" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "00000000000071F0" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000006FA8" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "000000000000BAEC" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000000007" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "00000000A5A5A5A5" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "00000000A5A5A5A5" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "00000000A5A5A5A5" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "00000000A5A5A5A5" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000CDBC" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000006FA8" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "00000000000071F0" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000D354" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000004030001" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF88980" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "0000000000000000" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_20" "00000000FFF81644" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "0000000000000007" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "00000000A5A5A5A5" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "000000000000BAEC" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "0000000000011220" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000000030000" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF8E520" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "000000000000C508" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_20" "00000000FFF8C424" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_21" "0000000080000000" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_22" "0000000000000000" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_23" "0000000000000000" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_24" "0000000000000100" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_25" "1234567887650000" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "0000000000000000" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000001" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000000000" 
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "0000000000006A68" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "0000000041480000" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000040E00000" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "000000000000C4E0" 
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "00000000A5A5A5A5" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "00000000A5A5A5A5" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "00000000A5A5A5A5" 
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "00000000A5A5A5A5" 
@@ -126,7 +126,7 @@
 "{8A898260-6F1D-11D5-8EB6-00004CC34E9D}ECX_WAVE_COMB_BUFFER" ",,,," 
 "{8A898260-6F1D-11D5-8EB6-00004CC34E9D}ECX_WAVE_SAMPLING_RATE" "1000" 
 "{8A898260-6F1D-11D5-8EB6-00004CC34E9D}WaveformCtrlViews" "0" 
-"{95A081A1-7001-11D5-B1FD-00A0C9E23A58}RegistersCtrlViews" "1" 
+"{95A081A1-7001-11D5-B1FD-00A0C9E23A58}RegistersCtrlViews" "0" 
 "{95A081A1-7001-11D5-B1FD-00A0C9E23A58}RegistersWnd0ColumnWidth" "47,153,35" 
 "{95A081A1-7001-11D5-B1FD-00A0C9E23A58}RegistersWnd0ECX_REGISTER_COUNT" "33" 
 "{95A081A1-7001-11D5-B1FD-00A0C9E23A58}RegistersWnd0ECX_REGISTER_DISPLAYED" "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1" 
@@ -318,15 +318,15 @@
 0 
 [WINDOW_POSITION_STATE_DATA_VD1]
 "Help" "TOOLBAR 0" 59419 1 5 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
-"{WK_00000001_CmdLine}" "WINDOW" 59422 0 1 "0.07" 218 0 0 100 100 17 0 "32771|32772|32778|<<separator>>|32773|32774|<<separator>>" "0.0" 
-"{WK_00000001_DEBUGCONSOLE}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59421 0 1 "1.00" 307 0 0 350 200 17 0 "57634|57637|57633|<<separator>>|32781|32782|<<separator>>|32780|32785|32787" "0.0" 
+"{WK_00000001_CmdLine}" "WINDOW" 59422 0 2 "0.07" 270 0 0 350 200 17 0 "32771|32772|32778|<<separator>>|32773|32774|<<separator>>|32820|<<separator>>|32801|32824" "0.0" 
+"{WK_00000001_DEBUGCONSOLE}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59421 0 0 "1.00" 307 0 0 350 200 17 0 "57634|57637|57633|<<separator>>|32781|32782|<<separator>>|32780|32785|32787" "0.0" 
 "{WK_00000001_DISASSEMBLY}" "WINDOW" 0 0 0 "0.00" 0 0 0 1062 571 9 0 "" "0.0" 
-"{WK_00000001_IO}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 3 "0.58" 218 0 0 350 200 17 0 "32817|32826|32819|32820|32821" "0.0" 
+"{WK_00000001_IO}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 3 "0.58" 270 0 0 350 200 17 0 "32817|32826|32819|32820|32821" "0.0" 
 "{WK_00000001_MEMORY}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 0 "0.64" 289 0 0 350 200 2065 0 "42202|42203|42204|42233|<<separator>>|42206|42205|42230|42229|42207|<<separator>>|42208|42209|42210|49076|42228|42227|<<separator>>|42231|42232|42234|42235|<<separator>>|42211|<<separator>>" "0.0" 
-"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 0 "1.00" 218 560 340 350 200 18 0 "36756|36757|36758|36759|<<separator>>|36746|36747|<<separator>>|39531|<<separator>>|39500|39534|<<separator>>|36687" "0.0" 
-"{WK_00000001_REGISTERS}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59421 0 0 "1.00" 307 0 0 350 200 18 0 "" "0.0" 
-"{WK_00000001_WATCH}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 1 "0.03" 218 0 0 853 610 18 0 "32781|32783|<<separator>>|32771|32829|32772|32827|32773|<<separator>>|32786|<<separator>>|32810|32811" "0.0" 
-"{WK_00000002_WORKSPACE}" "WINDOW" 59420 0 0 "1.00" 214 560 340 350 200 18 0 "" "0.0" 
+"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 0 "0.97" 270 560 340 350 200 18 0 "36756|36757|36758|36759|<<separator>>|36746|36747|<<separator>>|39531|<<separator>>|39500|39534|<<separator>>|36687" "0.0" 
+"{WK_00000001_REGISTERS}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59421 0 0 "1.00" 307 0 0 350 200 2065 0 "" "0.0" 
+"{WK_00000001_WATCH}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 1 "0.03" 270 0 0 853 610 18 0 "32781|32783|<<separator>>|32771|32829|32772|32827|32773|<<separator>>|32786|<<separator>>|32810|32811" "0.0" 
+"{WK_00000002_WORKSPACE}" "WINDOW" 59420 0 0 "1.00" 360 560 340 350 200 18 0 "" "0.0" 
 "{WK_TB00000001_STANDARD}" "TOOLBAR 0" 59419 0 2 "0.00" 0 0 0 0 0 18 0 "" "0.0" 
 "{WK_TB00000002_EDITOR}" "TOOLBAR 0" 59419 0 0 "0.00" 0 0 0 0 0 18 0 "" "0.0" 
 "{WK_TB00000003_BOOKMARKS}" "TOOLBAR 0" 59419 1 1 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
@@ -343,16 +343,15 @@
 "{WK_TB00000016_GRAPHIC}" "TOOLBAR 0" 59419 2 8 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
 "{WK_TB00000018_DEFAULTWINDOW}" "TOOLBAR 0" 59419 1 2 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
 "{WK_TB00000023_RTOS}" "TOOLBAR 0" 59419 2 11 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
-"{WK_TB00000025_HELPSYSTEMTOOL}" "TOOLBAR 0" 59419 2 3 "0.00" 0 0 0 0 0 18 0 "" "0.0" 
+"{WK_TB00000025_HELPSYSTEMTOOL}" "TOOLBAR 0" 59419 2 4 "0.00" 0 0 0 0 0 18 0 "" "0.0" 
 "{WK_TB00000026_MACRO}" "TOOLBAR 0" 59419 1 6 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
 "{WK_TB00000027_EVENT}" "TOOLBAR 0" 59419 2 7 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
-"{WK_TB00000028_RTOSDEBUG}" "TOOLBAR 0" 59419 2 2 "0.00" 0 0 0 0 0 18 0 "" "0.0" 
-"{WK_TB00000029_SYSTEMTOOL}" "TOOLBAR 0" 59419 2 4 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
+"{WK_TB00000028_RTOSDEBUG}" "TOOLBAR 0" 59419 2 3 "0.00" 0 0 0 0 0 18 0 "" "0.0" 
+"{WK_TB00000029_SYSTEMTOOL}" "TOOLBAR 0" 59419 2 5 "0.00" 0 0 0 0 0 17 0 "" "0.0" 
 [WINDOW_POSITION_STATE_DATA_VD2]
 [WINDOW_POSITION_STATE_DATA_VD3]
 [WINDOW_POSITION_STATE_DATA_VD4]
 [WINDOW_Z_ORDER]
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-full.c" 
 [TARGET_NAME]
 "RX600 E1/E20 SYSTEM" "" 0 
 [STATUSBAR_STATEINFO_VD1]
@@ -375,8 +374,8 @@
 "SBK_TAR_EMUE100|Exception" 1 
 "SBK_TAR_EMUE100|BreakCondition" 1 
 "SBK_TAR_EMUE100|TaskID" 1 
-"SBK_TAR_EMUE100|ExecutionTime" 1 
 "SBK_TAR_EMUE100|PC" 1 
+"SBK_TAR_EMUE100|ExecutionTime" 1 
 [STATUSBAR_DEBUGGER_PANESTATE_VD2]
 [STATUSBAR_DEBUGGER_PANESTATE_VD3]
 [STATUSBAR_DEBUGGER_PANESTATE_VD4]
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/include/yrdkrx62ndef.h b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/include/yrdkrx62ndef.h
index f9109943a..29a1acee7 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/include/yrdkrx62ndef.h
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/include/yrdkrx62ndef.h
@@ -13,8 +13,8 @@
 *         : 06.10.2009 1.00    First Release
 ******************************************************************************/
 
-#ifndef RSKRX62N_H
-#define RSKRX62N_H
+#ifndef RDKRX62N_H
+#define RDKRX62N_H
 
 /******************************************************************************
 Includes   <System Includes> , "Project Includes"
@@ -42,34 +42,49 @@ Macro definitions
 /* General Values */
 #define		LED_ON          (1)
 #define 	LED_OFF			(0)
+#define 	SET_BIT_HIGH	(1)
+#define 	SET_BIT_LOW		(0)
+#define 	SET_BYTE_HIGH	(0xFF)
+#define 	SET_BYTE_LOW	(0x00)
+
+/* Define switches to be polled if not available as interrupts */
+#define		SW_ACTIVE		FALSE
+#define     SW1             PORT4.PORT.BIT.B0
+#define     SW2             PORT4.PORT.BIT.B1
+#define     SW3             PORT4.PORT.BIT.B2
+#define     SW1_DDR         PORT4.DDR.BIT.B0
+#define     SW2_DDR         PORT4.DDR.BIT.B1
+#define     SW3_DDR         PORT4.DDR.BIT.B2
+#define     SW1_ICR         PORT4.ICR.BIT.B0
+#define     SW2_ICR         PORT4.ICR.BIT.B1
+#define     SW3_ICR         PORT4.ICR.BIT.B2
 
 /* LEDs */
-/*  Define LEDs to Port Numbers                                                     */
-#define 	LED0			PORTD.DR.BIT.B0
-#define 	LED1			PORTD.DR.BIT.B1
-#define 	LED2			PORTD.DR.BIT.B2
-#define 	LED3			PORTD.DR.BIT.B3
-#define 	LED4			PORTD.DR.BIT.B4
-#define 	LED5			PORTD.DR.BIT.B5
-#define 	LED6			PORTD.DR.BIT.B6
-#define 	LED7			PORTD.DR.BIT.B7
-#define 	LED8			PORTE.DR.BIT.B0
-#define 	LED9			PORTE.DR.BIT.B1
-#define 	LED10			PORTE.DR.BIT.B2
-#define 	LED11			PORTE.DR.BIT.B3
-
-#define		LED0_DDR		PORTD.DDR.BIT.B0
-#define		LED1_DDR		PORTD.DDR.BIT.B1
-#define 	LED2_DDR		PORTD.DDR.BIT.B2
-#define 	LED3_DDR		PORTD.DDR.BIT.B3
-#define 	LED4_DDR		PORTD.DDR.BIT.B4
-#define 	LED5_DDR		PORTD.DDR.BIT.B5
-#define 	LED6_DDR		PORTD.DDR.BIT.B6
-#define 	LED7_DDR		PORTD.DDR.BIT.B7
-#define 	LED8_DDR		PORTE.DDR.BIT.B0
-#define 	LED9_DDR		PORTE.DDR.BIT.B1
-#define 	LED10_DDR		PORTE.DDR.BIT.B2
-#define 	LED11_DDR		PORTE.DDR.BIT.B3
+#define     LED4            PORTD.DR.BIT.B5
+#define     LED5            PORTE.DR.BIT.B3
+#define     LED6            PORTD.DR.BIT.B2
+#define     LED7            PORTE.DR.BIT.B0
+#define     LED8            PORTD.DR.BIT.B4
+#define     LED9            PORTE.DR.BIT.B2
+#define     LED10           PORTD.DR.BIT.B1
+#define     LED11           PORTD.DR.BIT.B7
+#define     LED12           PORTD.DR.BIT.B3
+#define     LED13           PORTE.DR.BIT.B1
+#define     LED14           PORTD.DR.BIT.B0
+#define     LED15           PORTD.DR.BIT.B6
+
+#define     LED4_DDR        PORTD.DDR.BIT.B5
+#define     LED5_DDR        PORTE.DDR.BIT.B3
+#define     LED6_DDR        PORTD.DDR.BIT.B2
+#define     LED7_DDR        PORTE.DDR.BIT.B0
+#define     LED8_DDR        PORTD.DDR.BIT.B4
+#define     LED9_DDR        PORTE.DDR.BIT.B2
+#define     LED10_DDR       PORTD.DDR.BIT.B1
+#define     LED11_DDR       PORTD.DDR.BIT.B7
+#define     LED12_DDR       PORTD.DDR.BIT.B3
+#define     LED13_DDR       PORTE.DDR.BIT.B1
+#define     LED14_DDR       PORTD.DDR.BIT.B0
+#define     LED15_DDR       PORTD.DDR.BIT.B6
 
 
 
@@ -84,6 +99,6 @@ Functions Prototypes
 
 
 
-/* RSKRX62N_H */
+/* RDKRX62N_H */
 #endif		
 
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/main-full.c b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/main-full.c
index 7e0f49c70..4abf2ad60 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/main-full.c
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/main-full.c
@@ -147,6 +147,10 @@ tasks check that the values are passed in correctly. */
 #define mainGEN_QUEUE_TASK_PRIORITY	( tskIDLE_PRIORITY )
 #define mainFLOP_TASK_PRIORITY		( tskIDLE_PRIORITY )
 
+/* The WEB server uses string handling functions, which in turn use a bit more
+stack than most of the other tasks. */
+#define mainuIP_STACK_SIZE			( configMINIMAL_STACK_SIZE * 3 )
+
 /* The LED toggled by the check task. */
 #define mainCHECK_LED				( 5 )
 
@@ -215,12 +219,23 @@ static void prvRegTest2Implementation( void );
  */
 static void prvCheckTask( void *pvParameters );
 
+/*
+ * Contains the implementation of the WEB server.
+ */
+extern void vuIP_Task( void *pvParameters );
+
+/*-----------------------------------------------------------*/
+
 /* Variables that are incremented on each iteration of the reg test tasks -
 provided the tasks have not reported any errors.  The check task inspects these
 variables to ensure they are still incrementing as expected.  If a variable
 stops incrementing then it is likely that its associate task has stalled. */
 unsigned long ulRegTest1CycleCount = 0UL, ulRegTest2CycleCount = 0UL;
 
+/* The status message that is displayed at the bottom of the "task stats" web
+page, which is served by the uIP task. */
+const char *pcStatusMessage = "All tasks executing without error.";
+
 /*-----------------------------------------------------------*/
 
 void main(void)
@@ -238,6 +253,9 @@ extern void HardwareSetup( void );
 	xTaskCreate( prvRegTest1Task, "RegTst1", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_1_PARAMETER, tskIDLE_PRIORITY, NULL );
 	xTaskCreate( prvRegTest2Task, "RegTst2", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_2_PARAMETER, tskIDLE_PRIORITY, NULL );
 
+	/* The web server task. */
+	xTaskCreate( vuIP_Task, "uIP", mainuIP_STACK_SIZE, NULL, mainuIP_TASK_PRIORITY, NULL );
+
 	/* Start the check task as described at the top of this file. */
 	xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE * 3, NULL, mainCHECK_TASK_PRIORITY, NULL );
 
@@ -276,7 +294,6 @@ portTickType xNextWakeTime, xCycleFrequency = mainNO_ERROR_CYCLE_TIME;
 extern void vSetupHighFrequencyTimer( void );
 extern volatile unsigned short usMaxJitter;
 volatile unsigned long ulActualJitter = 0;
-static char cErrorText[ 100 ];
 
 	/* If this is being executed then the kernel has been started.  Start the high
 	frequency timer test as described at the top of this file.  This is only
@@ -301,57 +318,57 @@ static char cErrorText[ 100 ];
 			rate at which mainCHECK_LED flashes to give visual feedback that an error
 			has occurred. */
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: GenQueue" );
+			pcStatusMessage = "Error: GenQueue";
 		}
 		else if( xAreQueuePeekTasksStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: QueuePeek" );
+			pcStatusMessage = "Error: QueuePeek";
 		}
 		else if( xAreBlockingQueuesStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: BlockQueue" );
+			pcStatusMessage = "Error: BlockQueue";
 		}
 		else if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: BlockTime" );
+			pcStatusMessage = "Error: BlockTime";
 		}
 		else if( xAreSemaphoreTasksStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: SemTest" );
+			pcStatusMessage = "Error: SemTest";
 		}
 		else if( xArePollingQueuesStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: PollQueue" );
+			pcStatusMessage = "Error: PollQueue";
 		}
 		else if( xIsCreateTaskStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: Death" );
+			pcStatusMessage = "Error: Death";
 		}
 		else if( xAreIntegerMathsTaskStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: IntMath" );
+			pcStatusMessage = "Error: IntMath";
 		}
 		else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: RecMutex" );
+			pcStatusMessage = "Error: RecMutex";
 		}
 		else if( xAreIntQueueTasksStillRunning() != pdPASS )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: IntQueue" );
+			pcStatusMessage = "Error: IntQueue";
 		}
 		else if( xAreMathsTaskStillRunning() != pdPASS )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: Flop" );
+			pcStatusMessage = "Error: Flop";
 		}
 
 		/* Check the reg test tasks are still cycling.  They will stop incrementing
@@ -359,13 +376,13 @@ static char cErrorText[ 100 ];
 		if( ulRegTest1CycleCount == ulLastRegTest1CycleCount )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: RegTest1" );
+			pcStatusMessage = "Error: RegTest1";
 		}
 
 		if( ulRegTest2CycleCount == ulLastRegTest2CycleCount )
 		{
 			xCycleFrequency = mainERROR_CYCLE_TIME;
-			strcpy( cErrorText, "Error: RegTest2" );
+			pcStatusMessage = "Error: RegTest2";
 		}
 
 		ulLastRegTest1CycleCount = ulRegTest1CycleCount;
@@ -634,8 +651,20 @@ RegTest2Error:
 	; - causing the check task to indicate the error.
 	BRA RegTest2Error
 }
+/*-----------------------------------------------------------*/
 
+void vTaskGetRunTimeStats( signed char *pcWriteBuffer )
+{
+	/* Not implemented yet, so put here to keep the linker happy. */
+}
+/*-----------------------------------------------------------*/
 
-
+char *pcGetTaskStatusMessage( void )
+{
+	/* Not bothered about a critical section here.  This just returns a string
+	that is displaed on the "Task Stats" WEB page served by this demo. */
+	return pcStatusMessage;
+}
+/*-----------------------------------------------------------*/
 
 
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c
index 21e9b2efa..42db4b1c5 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/uIP_Task.c
@@ -69,9 +69,6 @@
 /* Demo includes. */
 #include "ParTest.h"
 
-/* Hardware includes. */
-#include "hwEthernet.h"
-
 /*-----------------------------------------------------------*/
 
 /* How long to wait before attempting to connect the MAC again. */
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c
index f767a6f9b..2824ca066 100644
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c
+++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c
@@ -54,8 +54,8 @@
 /* Hardware specific includes. */
 #include "iodefine.h"
 #include "typedefine.h"
-#include "hwEthernet.h"
-#include "hwEthernetPhy.h"
+#include "r_ether.h"
+#include "phy.h"
 
 /* FreeRTOS includes. */
 #include "FreeRTOS.h"
@@ -96,16 +96,27 @@ become free. */
 /*-----------------------------------------------------------*/
 
 /* The buffers and descriptors themselves. */
-#pragma section RX_DESCR
-	ethfifo xRxDescriptors[ emacNUM_RX_DESCRIPTORS ];
-#pragma section TX_DESCR
-	ethfifo xTxDescriptors[ emacNUM_TX_BUFFERS ];
-#pragma section _ETHERNET_BUFFERS
-	char xEthernetBuffers[ emacNUM_BUFFERS ][ UIP_BUFSIZE ];
-#pragma section
+static union x_RX_Desc
+{
+	unsigned long long ullAlignmentVariable;
+	ethfifo xDescriptorArray[ emacNUM_RX_DESCRIPTORS ];
+} xRxDescriptors;
+
+static union x_TX_Desc
+{
+	unsigned long long ullAlignmentVariable;
+	ethfifo xDescriptorArray[ emacNUM_TX_BUFFERS ];
+} xTxDescriptors;
+
+static union x_ETH_Buffers
+{
+	unsigned long long ullAlignmentVariable;
+	char xDataBuffers[ emacNUM_BUFFERS ][ UIP_BUFSIZE ];
+} xEthernetBuffers;
+
 
 /* Used to indicate which buffers are free and which are in use.  If an index
-contains 0 then the corresponding buffer in xEthernetBuffers is free, otherwise 
+contains 0 then the corresponding buffer in xEthernetBuffers.xDataBuffers is free, otherwise 
 the buffer is in use or about to be used. */
 static unsigned char ucBufferInUse[ emacNUM_BUFFERS ];
 
@@ -117,7 +128,7 @@ static unsigned char ucBufferInUse[ emacNUM_BUFFERS ];
 static void prvInitialiseDescriptors( void );
 
 /*
- * Return a pointer to a free buffer within xEthernetBuffers.
+ * Return a pointer to a free buffer within xEthernetBuffers.xDataBuffers.
  */
 static unsigned char *prvGetNextBuffer( void );
 
@@ -134,7 +145,7 @@ static unsigned long prvCheckRxFifoStatus( void );
 /*
  * Setup the microcontroller for communication with the PHY.
  */
-static void prvSetupPortPinsAndReset( void );
+static void prvResetMAC( void );
 
 /*
  * Configure the Ethernet interface peripherals.
@@ -160,19 +171,19 @@ unsigned char *uip_buf = NULL;
 
 void vInitEmac( void )
 {
-	/* Setup the SH hardware for MII communications. */
-	prvSetupPortPinsAndReset();
+	/* Software reset. */
+	prvResetMAC();
 	
 	/* Set the Rx and Tx descriptors into their initial state. */
 	prvInitialiseDescriptors();
 
 	/* Set the MAC address into the ETHERC */
-	EtherC.MAHR = 	( ( unsigned long ) configMAC_ADDR0 << 24UL ) | 
+	ETHERC.MAHR = 	( ( unsigned long ) configMAC_ADDR0 << 24UL ) | 
 					( ( unsigned long ) configMAC_ADDR1 << 16UL ) | 
 					( ( unsigned long ) configMAC_ADDR2 << 8UL ) | 
 					( unsigned long ) configMAC_ADDR3;
 					
-	EtherC.MALR.BIT.MA = ( ( unsigned long ) configMAC_ADDR4 << 8UL ) |
+	ETHERC.MALR.BIT.MA = ( ( unsigned long ) configMAC_ADDR4 << 8UL ) |
 						 ( unsigned long ) configMAC_ADDR5;
 
 	/* Perform rest of interface hardware configuration. */
@@ -182,7 +193,7 @@ void vInitEmac( void )
 	uip_buf = NULL;
 
 	/* Initialize the PHY */
-	phyReset();
+	phy_init();
 }
 /*-----------------------------------------------------------*/
 
@@ -193,7 +204,7 @@ long x;
 	/* Wait until the second transmission of the last packet has completed. */
 	for( x = 0; x < emacTX_WAIT_ATTEMPTS; x++ )
 	{
-		if( ( xTxDescriptors[ 1 ].status & ACT ) != 0 )
+		if( ( xTxDescriptors.xDescriptorArray[ 1 ].status & ACT ) != 0 )
 		{
 			/* Descriptor is still active. */
 			vTaskDelay( emacTX_WAIT_DELAY_ms );
@@ -205,27 +216,27 @@ long x;
 	}
 	
 	/* Is the descriptor free after waiting for it? */
-	if( ( xTxDescriptors[ 1 ].status & ACT ) != 0 )
+	if( ( xTxDescriptors.xDescriptorArray[ 1 ].status & ACT ) != 0 )
 	{
 		/* Something has gone wrong. */
 		prvResetEverything();
 	}
 	
 	/* Setup both descriptors to transmit the frame. */
-	xTxDescriptors[ 0 ].buf_p = ( char * ) uip_buf;
-	xTxDescriptors[ 0 ].bufsize = uip_len;	
-	xTxDescriptors[ 1 ].buf_p = ( char * ) uip_buf;
-	xTxDescriptors[ 1 ].bufsize = uip_len;
+	xTxDescriptors.xDescriptorArray[ 0 ].buf_p = ( char * ) uip_buf;
+	xTxDescriptors.xDescriptorArray[ 0 ].bufsize = uip_len;	
+	xTxDescriptors.xDescriptorArray[ 1 ].buf_p = ( char * ) uip_buf;
+	xTxDescriptors.xDescriptorArray[ 1 ].bufsize = uip_len;
 
 	/* uip_buf is being sent by the Tx descriptor.  Allocate a new buffer
 	for use by the stack. */
 	uip_buf = prvGetNextBuffer();
 
 	/* Clear previous settings and go. */
-	xTxDescriptors[0].status &= ~( FP1 | FP0 );
-	xTxDescriptors[0].status |= ( FP1 | FP0 | ACT );
-	xTxDescriptors[1].status &= ~( FP1 | FP0 );
-	xTxDescriptors[1].status |= ( FP1 | FP0 | ACT );
+	xTxDescriptors.xDescriptorArray[0].status &= ~( FP1 | FP0 );
+	xTxDescriptors.xDescriptorArray[0].status |= ( FP1 | FP0 | ACT );
+	xTxDescriptors.xDescriptorArray[1].status &= ~( FP1 | FP0 );
+	xTxDescriptors.xDescriptorArray[1].status |= ( FP1 | FP0 | ACT );
 
 	EDMAC.EDTRR.LONG = 0x00000001;
 }
@@ -267,19 +278,19 @@ long lEMACWaitForLink( void )
 long lReturn;
 
 	/* Set the link status. */
-	switch( phyStatus() )
+	switch( phy_set_autonegotiate() )
 	{
 		/* Half duplex link */
 		case PHY_LINK_100H:
 		case PHY_LINK_10H:
-								EtherC.ECMR.BIT.DM = 0;
+								ETHERC.ECMR.BIT.DM = 0;
 								lReturn = pdPASS;
 								break;
 
 		/* Full duplex link */
 		case PHY_LINK_100F:
 		case PHY_LINK_10F:
-								EtherC.ECMR.BIT.DM = 1;
+								ETHERC.ECMR.BIT.DM = 1;
 								lReturn = pdPASS;
 								break;
 
@@ -291,8 +302,8 @@ long lReturn;
 	if( lReturn == pdPASS )
 	{
 		/* Enable receive and transmit. */
-		EtherC.ECMR.BIT.RE = 1;
-		EtherC.ECMR.BIT.TE = 1;
+		ETHERC.ECMR.BIT.RE = 1;
+		ETHERC.ECMR.BIT.TE = 1;
 
 		/* Enable EDMAC receive */
 		EDMAC.EDRRR.LONG = 0x1;
@@ -316,13 +327,13 @@ long x;
 	/* Initialise the Rx descriptors. */
 	for( x = 0; x < emacNUM_RX_DESCRIPTORS; x++ )
 	{
-		pxDescriptor = &( xRxDescriptors[ x ] );
-		pxDescriptor->buf_p = &( xEthernetBuffers[ x ][ 0 ] );
+		pxDescriptor = &( xRxDescriptors.xDescriptorArray[ x ] );
+		pxDescriptor->buf_p = &( xEthernetBuffers.xDataBuffers[ x ][ 0 ] );
 
 		pxDescriptor->bufsize = UIP_BUFSIZE;
 		pxDescriptor->size = 0;
 		pxDescriptor->status = ACT;
-		pxDescriptor->next = &xRxDescriptors[ x + 1 ];	
+		pxDescriptor->next = &xRxDescriptors.xDescriptorArray[ x + 1 ];	
 		
 		/* Mark this buffer as in use. */
 		ucBufferInUse[ x ] = pdTRUE;
@@ -330,12 +341,12 @@ long x;
 
 	/* The last descriptor points back to the start. */
 	pxDescriptor->status |= DL;
-	pxDescriptor->next = &xRxDescriptors[ 0 ];
+	pxDescriptor->next = &xRxDescriptors.xDescriptorArray[ 0 ];
 	
 	/* Initialise the Tx descriptors. */
 	for( x = 0; x < emacNUM_TX_BUFFERS; x++ )
 	{
-		pxDescriptor = &( xTxDescriptors[ x ] );
+		pxDescriptor = &( xTxDescriptors.xDescriptorArray[ x ] );
 		
 		/* A buffer is not allocated to the Tx descriptor until a send is
 		actually required. */
@@ -344,15 +355,15 @@ long x;
 		pxDescriptor->bufsize = UIP_BUFSIZE;
 		pxDescriptor->size = 0;
 		pxDescriptor->status = 0;
-		pxDescriptor->next = &xTxDescriptors[ x + 1 ];	
+		pxDescriptor->next = &xTxDescriptors.xDescriptorArray[ x + 1 ];	
 	}
 
 	/* The last descriptor points back to the start. */
 	pxDescriptor->status |= DL;
-	pxDescriptor->next = &( xTxDescriptors[ 0 ] );
+	pxDescriptor->next = &( xTxDescriptors.xDescriptorArray[ 0 ] );
 	
 	/* Use the first Rx descriptor to start with. */
-	xCurrentRxDesc = &( xRxDescriptors[ 0 ] );
+	xCurrentRxDesc = &( xRxDescriptors.xDescriptorArray[ 0 ] );
 }
 /*-----------------------------------------------------------*/
 
@@ -371,7 +382,7 @@ unsigned long ulAttempts = 0;
 			if( ucBufferInUse[ x ] == pdFALSE )
 			{
 				ucBufferInUse[ x ] = pdTRUE;
-				pucReturn = ( unsigned char * ) &( xEthernetBuffers[ x ][ 0 ] );
+				pucReturn = ( unsigned char * ) &( xEthernetBuffers.xDataBuffers[ x ][ 0 ] );
 				break;
 			}
 		}
@@ -402,7 +413,7 @@ unsigned long ul;
 	/* Return a buffer to the pool of free buffers. */
 	for( ul = 0; ul < emacNUM_BUFFERS; ul++ )
 	{
-		if( &( xEthernetBuffers[ ul ][ 0 ] ) == ( void * ) pucBuffer )
+		if( &( xEthernetBuffers.xDataBuffers[ ul ][ 0 ] ) == ( void * ) pucBuffer )
 		{
 			ucBufferInUse[ ul ] = pdFALSE;
 			break;
@@ -461,33 +472,12 @@ unsigned long ulReturn = 0;
 }
 /*-----------------------------------------------------------*/
 
-static void prvSetupPortPinsAndReset( void )
+static void prvResetMAC( void )
 {
-	/* Initialisation code taken from Renesas example project. */
-	
-	PFC.PACRL4.BIT.PA12MD = 0x7;		/* Set TX_CLK input      (EtherC) */
-	PFC.PACRL3.BIT.PA11MD = 0x7;		/* Set TX_EN output      (EtherC) */
-	PFC.PACRL3.BIT.PA10MD = 0x7;		/* Set MII_TXD0 output   (EtherC) */
-	PFC.PACRL3.BIT.PA9MD  = 0x7;		/* Set MII_TXD1 output   (EtherC) */
-	PFC.PACRL3.BIT.PA8MD  = 0x7;		/* Set MII_TXD2 output   (EtherC) */
-	PFC.PACRL2.BIT.PA7MD  = 0x7;		/* Set MII_TXD3 output   (EtherC) */
-	PFC.PACRL2.BIT.PA6MD  = 0x7;		/* Set TX_ER output      (EtherC) */
-	PFC.PDCRH4.BIT.PD31MD = 0x7;		/* Set RX_DV input       (EtherC) */
-	PFC.PDCRH4.BIT.PD30MD = 0x7;		/* Set RX_ER input       (EtherC) */
-	PFC.PDCRH4.BIT.PD29MD = 0x7;		/* Set MII_RXD3 input    (EtherC) */
-	PFC.PDCRH4.BIT.PD28MD = 0x7;		/* Set MII_RXD2 input    (EtherC) */
-	PFC.PDCRH3.BIT.PD27MD = 0x7;		/* Set MII_RXD1 input    (EtherC) */
-	PFC.PDCRH3.BIT.PD26MD = 0x7;		/* Set MII_RXD0 input    (EtherC) */
-	PFC.PDCRH3.BIT.PD25MD = 0x7;		/* Set RX_CLK input      (EtherC) */
-	PFC.PDCRH3.BIT.PD24MD = 0x7;		/* Set CRS input         (EtherC) */
-	PFC.PDCRH2.BIT.PD23MD = 0x7;		/* Set COL input         (EtherC) */
-	PFC.PDCRH2.BIT.PD22MD = 0x7;		/* Set WOL output        (EtherC) */
-	PFC.PDCRH2.BIT.PD21MD = 0x7;		/* Set EXOUT output      (EtherC) */
-	PFC.PDCRH2.BIT.PD20MD = 0x7;		/* Set MDC output        (EtherC) */
-	PFC.PDCRH1.BIT.PD19MD = 0x7;		/* Set LINKSTA input     (EtherC) */
-	PFC.PDCRH1.BIT.PD18MD = 0x7;		/* Set MDIO input/output (EtherC) */
+	/* Ensure the EtherC and EDMAC are enabled. */
+	SYSTEM.MSTPCRB.BIT.MSTPB15 = 0;
+	vTaskDelay( 100 / portTICK_RATE_MS );
 	
-	STB.CR4.BIT._ETHER = 0x0;	
 	EDMAC.EDMR.BIT.SWR = 1;	
 	
 	/* Crude wait for reset to complete. */
@@ -500,33 +490,29 @@ static void prvConfigureEtherCAndEDMAC( void )
 	/* Initialisation code taken from Renesas example project. */
 	
 	/* TODO:    Check   bit 5   */
-	EtherC.ECSR.LONG = 0x00000037;				/* Clear all EtherC statuS BFR, PSRTO, LCHNG, MPD, ICD */
+	ETHERC.ECSR.LONG = 0x00000037;				/* Clear all ETHERC statuS BFR, PSRTO, LCHNG, MPD, ICD */
+
+	/* Set the EDMAC interrupt priority. */
+	_IPR( _ETHER_EINT ) = configKERNEL_INTERRUPT_PRIORITY;
 
 	/* TODO:    Check   bit 5   */
-	EtherC.ECSIPR.LONG = 0x00000020;			/* Disable EtherC status change interrupt */
-	EtherC.RFLR.LONG = 1518;					/* Ether payload is 1500+ CRC */
-	EtherC.IPGR.LONG = 0x00000014;				/* Intergap is 96-bit time */
+	/* Enable interrupts of interest only. */
+	EDMAC.EESIPR.LONG = emacTX_END_INTERRUPT | emacRX_END_INTERRUPT;
+	ETHERC.RFLR.LONG = 1518;					/* Ether payload is 1500+ CRC */
+	ETHERC.IPGR.LONG = 0x00000014;				/* Intergap is 96-bit time */
 
 	/* EDMAC */
-	EDMAC.EESR.LONG = 0x47FF0F9F;				/* Clear all EtherC and EDMAC status bits */
+	EDMAC.EESR.LONG = 0x47FF0F9F;				/* Clear all ETHERC and EDMAC status bits */
 	EDMAC.RDLAR = ( void * ) xCurrentRxDesc;	/* Initialaize Rx Descriptor List Address */
-	EDMAC.TDLAR = &( xTxDescriptors[ 0 ] );		/* Initialaize Tx Descriptor List Address */
+	EDMAC.TDLAR = &( xTxDescriptors.xDescriptorArray[ 0 ] );		/* Initialaize Tx Descriptor List Address */
 	EDMAC.TRSCER.LONG = 0x00000000;				/* Copy-back status is RFE & TFE only   */
 	EDMAC.TFTR.LONG = 0x00000000;				/* Threshold of Tx_FIFO */
 	EDMAC.FDR.LONG = 0x00000000;				/* Transmit fifo & receive fifo is 256 bytes */
 	EDMAC.RMCR.LONG = 0x00000003;				/* Receive function is normal mode(continued) */
-
-	/* Set the EDMAC interrupt priority - the interrupt priority must be
-	configKERNEL_INTERRUPT_PRIORITY no matter which peripheral is used to 
-	generate the tick interrupt. */
-	INTC.IPR19.BIT._EDMAC = portKERNEL_INTERRUPT_PRIORITY;
-	EDMAC.EESIPR.LONG = emacTX_END_INTERRUPT | emacRX_END_INTERRUPT;	/* Enable Rx and Tx end interrupts. */
-
-	/* Clear the interrupt flag. */
-	CMT0.CMCSR.BIT.CMF = 0;
 }
 /*-----------------------------------------------------------*/
 
+#pragma interrupt ( vEMAC_ISR_Handler( vect = VECT_ETHER_EINT, enable ) )
 void vEMAC_ISR_Handler( void )
 {
 unsigned long ul = EDMAC.EESR.LONG;
@@ -541,7 +527,7 @@ static long ulTxEndInts = 0;
 		if( ulTxEndInts >= 2 )
 		{
 			/* Only return the buffer to the pool once both Txes have completed. */
-			prvReturnBuffer( ( void * ) xTxDescriptors[ 0 ].buf_p );
+			prvReturnBuffer( ( void * ) xTxDescriptors.xDescriptorArray[ 0 ].buf_p );
 			ulTxEndInts = 0;
 		}
 		EDMAC.EESR.LONG = emacTX_END_INTERRUPT;
diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC_ISR.src b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC_ISR.src
deleted file mode 100644
index 598901f1b..000000000
--- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC_ISR.src
+++ /dev/null
@@ -1,79 +0,0 @@
-;/*
-;    FreeRTOS V6.0.5 - Copyright (C) 2010 Real Time Engineers Ltd.
-;
-;    ***************************************************************************
-;    *                                                                         *
-;    * If you are:                                                             *
-;    *                                                                         *
-;    *    + New to FreeRTOS,                                                   *
-;    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *
-;    *    + Looking for basic training,                                        *
-;    *    + Wanting to improve your FreeRTOS skills and productivity           *
-;    *                                                                         *
-;    * then take a look at the FreeRTOS eBook                                  *
-;    *                                                                         *
-;    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *
-;    *                  http://www.FreeRTOS.org/Documentation                  *
-;    *                                                                         *
-;    * A pdf reference manual is also available.  Both are usually delivered   *
-;    * to your inbox within 20 minutes to two hours when purchased between 8am *
-;    * and 8pm GMT (although please allow up to 24 hours in case of            *
-;    * exceptional circumstances).  Thank you for your support!                *
-;    *                                                                         *
-;    ***************************************************************************
-;
-;    This file is part of the FreeRTOS distribution.
-;
-;    FreeRTOS is free software; you can redistribute it and/or modify it under
-;    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 exception 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 FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-;    more details. You should have received a copy of the GNU General Public 
-;    License and the FreeRTOS license exception along with FreeRTOS; if not it 
-;    can be viewed here: http://www.freertos.org/a00114.html and also obtained 
-;    by writing to Richard Barry, contact details for whom are available on the
-;    FreeRTOS WEB site.
-;
-;    1 tab == 4 spaces!
-;
-;    http://www.FreeRTOS.org - Documentation, latest information, license and
-;    contact details.
-;
-;    http://www.SafeRTOS.com - A version that is certified for use in safety
-;    critical systems.
-;
-;    http://www.OpenRTOS.com - Commercial support, development, porting,
-;    licensing and training services.
-;*/
-
-	.import _vEMAC_ISR_Handler
-	.import _pxCurrentTCB
-	.export _vEMAC_ISR_Wrapper
-
-	.INCLUDE "ISR_Support.inc"
-
-    .section    P
-
-;-----------------------------------------------------------
-	
-_vEMAC_ISR_Wrapper:
-
-	portSAVE_CONTEXT
-
-	mov.l	#_vEMAC_ISR_Handler, r0
-	jsr		@r0
-	nop
-
-	portRESTORE_CONTEXT
-	
-;-----------------------------------------------------------
-
-
-
-	.end
-