From: richardbarry Date: Sun, 5 Sep 2010 20:06:30 +0000 (+0000) Subject: Start to configure the uIP demo for the RX RDK hardware. ping is working, but thus... X-Git-Tag: V6.1.0~54 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5c9ff6dd0291894e4188cd8dc63345848d12c369;p=freertos Start to configure the uIP demo for the RX RDK hardware. ping is working, but thus far the web server is not. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1081 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.Hbp b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.Hbp index 2a473f11a..0d3910dbc 100644 --- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.Hbp +++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.Hbp @@ -1,4 +1,4 @@ [Setting] ToolChain=0 [Section] -WindowSize=341,352 +WindowSize=726,544 diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws index ef666fddb..91b379218 100644 --- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws +++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo.tws @@ -7,7 +7,9 @@ [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 982 516 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 ae232e346..7a3ea5f6f 100644 --- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h +++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h @@ -135,9 +135,9 @@ to exclude the API function. */ #define configMAC_ADDR5 0x11 /* IP address configuration. */ -#define configIP_ADDR0 172 -#define configIP_ADDR1 25 -#define configIP_ADDR2 218 +#define configIP_ADDR0 192 +#define configIP_ADDR1 168 +#define configIP_ADDR2 0 #define configIP_ADDR3 200 /* Netmask configuration. */ diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp index 1aa687967..340acd12c 100644 --- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp +++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.hwp @@ -273,7 +273,7 @@ [LINKAGE_ORDER_Blinky] [GENERAL_DATA_CONFIGURATION_Blinky] [OPTIONS_Debug_Renesas OptLinker] -"Single Shot" "0cb38d9776b4bc10" 5 +"Single Shot" "0413bf9353d4bc10" 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 @@ -337,7 +337,7 @@ " 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 -"[V|VERSION|6] [S|FORM|STYPE] [S|BYTE_COUNT_VALUE|FF] [B|DEBUG|1] [S|ROM|(D,R)|(D_1,R_1)|(D_2,R_2)] [S|CRC|NONE|DEFAULT|00000000] [B|LIST|1] [S|LIST|^"$(CONFIGDIR)\$(PROJECTNAME).map^"] [S|SHOW|METHODCUSTOM|] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).mot^"] [I|SPACE|^"FF^"] [B|OPTIMIZE|0] [S|START|B_1,R_1,B_2,R_2,B,R,SU,SI(01000)|PResetPRG(0FFF80000)|C_1,C_2,C,C$*,D*,P,PIntPRG,W*(0FFF81000)|FIXEDVECT(0FFFFFFD0)] [B|SKIPDEPENDENCY|1] +"[V|VERSION|6] [S|PRELINK|SKIP] [S|FORM|STYPE] [S|BYTE_COUNT_VALUE|FF] [B|DEBUG|1] [S|ROM|(D,R)|(D_1,R_1)|(D_2,R_2)] [S|CRC|NONE|DEFAULT|00000000] [B|LIST|1] [S|LIST|^"$(CONFIGDIR)\$(PROJECTNAME).map^"] [S|SHOW|METHODCUSTOM|] [S|OUTPUT|^"$(CONFIGDIR)\$(PROJECTNAME).mot^"] [I|SPACE|^"FF^"] [B|OPTIMIZE|0] [S|START|B_RX_DESC,B_TX_DESC,B_ETHERNET_BUFFERS,B_1,R_1,B_2,R_2,B,R,SU,SI(01000)|PResetPRG(0FFF80000)|C_1,C_2,C,C$*,D*,P,PIntPRG,W*(0FFF81000)|FIXEDVECT(0FFFFFFD0)] [B|SKIPDEPENDENCY|1] " 5 [EXCLUDED_FILES_Debug] "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX600_RX62N-RDK_Renesas\RTOSDemo\main-blinky.c" diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.nav b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/RTOSDemo.nav index 39863df2d..1977f93ee 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/SessionRX600_E1_E20_SYSTEM.hsf b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/SessionRX600_E1_E20_SYSTEM.hsf index 782f0ebfa..e68dc7d86 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 @@ -8,7 +8,7 @@ "" [GENERAL_DATA] "FIRST_CONNECTION_TAG" "NO" -"MRULABELS_DATAMANAGER_KEY" "00000000|FFFFFFFF|88218|000870B4|000870AE|88204|88208|18b8" +"MRULABELS_DATAMANAGER_KEY" "FFFFFFFF|00000000|1054|fff8cd9e|1050|fff8c484|88218|000870B4|000870AE|88204|88208|18b8" "RESET_CPU_AFTER_DOWNLOAD_TAG" "VARIANT_TRUE_STORE_TAG" "{228DB593-0AB2-4EBE-A098-A2CABF094E46}RamMonitorCtrlViews" "0" "{287A8023-99B5-49E1-A54E-4DDCA43D7959}MapCtrlECX_MAP_FIND_SYMBOL_LIST" "" @@ -30,7 +30,7 @@ "{313F4FC1-6566-11D5-8BBE-0004E2013C71}TclTkCtrlLogFileName" "" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}ECX_MEMORY_COMPARE_END_ADDRESS" "" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}ECX_MEMORY_COMPARE_START_ADDRESS" "" -"{313F4FC2-6566-11D5-8BBE-0004E2013C71}ECX_MEMORY_DISPLAY_DEST_ADDRESS" "88218" +"{313F4FC2-6566-11D5-8BBE-0004E2013C71}ECX_MEMORY_DISPLAY_DEST_ADDRESS" "1054" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}ECX_MEMORY_DISPLAY_END_ADDRESS" "FFFFFFFF" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}ECX_MEMORY_DISPLAY_START_ADDRESS" "00000000" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}ECX_MEMORY_FILL_END_ADDRESS" "" @@ -45,10 +45,10 @@ "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryCtrlViews" "0" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0AutoRefreshEnableTopPane" "0" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0AutoRefreshIntervalTopPane" "100" -"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0DataLength" "1" -"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0DispAddressTopPane" "553134" +"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0DataLength" "4" +"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0DispAddressTopPane" "4180" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0DispCode" "42208" -"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0DispColumnCount" "16" +"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0DispColumnCount" "4" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0IsDispCode" "1" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0IsDispFloat" "0" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewA0IsDispLabel" "0" @@ -64,10 +64,10 @@ "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewAInstanceKey0" "{WK_00000001_MEMORY}RTOSDemoSessionRX600_E1_E20_SYSTEM" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0AutoRefreshEnableTopPane" "0" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0AutoRefreshIntervalTopPane" "100" -"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0DataLength" "1" -"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0DispAddressTopPane" "553134" +"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0DataLength" "4" +"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0DispAddressTopPane" "4180" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0DispCode" "42208" -"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0DispColumnCount" "16" +"{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0DispColumnCount" "4" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0IsDispCode" "1" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0IsDispFloat" "0" "{313F4FC2-6566-11D5-8BBE-0004E2013C71}MemoryWndViewB0IsDispLabel" "0" @@ -89,30 +89,30 @@ "{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" "000000000000BAEC" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000000007" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "0000000000003DA4" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "000000000000EBA8" "{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" "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_14" "0000000000000020" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000001BE4" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "0000000000003DA4" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "0000000000011224" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000000030001" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF9312A" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "0000000000000020" "{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" "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_3" "000000000000EB9C" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "00000000000001A7" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000001C1A" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "0000000000000008" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "0000000000000008" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_COUNT" "26" @@ -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" "0" +"{95A081A1-7001-11D5-B1FD-00A0C9E23A58}RegistersCtrlViews" "1" "{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" @@ -159,9 +159,17 @@ "{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ColWidth12" "200" "{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ColWidth2" "120" "{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ColWidth3" "200" -"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0000" "cErrorText, 10, 0, P, Col, Hex, N" +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0000" "xCurrentRxDesc, 10, 0, P, Col, Hex, N" "{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0000_SCOPE" "Current Scope," -"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEMCnt" "1" +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0001" "xEthernetBuffers, 11, 0, P, Exp, Hex, MN" +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0001_SCOPE" "Current Scope," +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0002" "ulAlignmentVariable, 2, 0, C0001, Col, Hex, MN" +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0003" "cBuffer, 6, 0, C0001, Col, Hex, MN" +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0004" "xRxDescriptors, 6, 0, P, Col, Hex, MN" +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0004_SCOPE" "Current Scope," +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0005" "xTxDescriptors, 6, 0, P, Col, Hex, MN" +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEM0005_SCOPE" "Current Scope," +"{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd0ECX_WATCH_ITEMCnt" "0" "{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd1ColWidth0" "120" "{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd1ColWidth1" "150" "{B266D880-6FA1-11D5-8613-00A024591A38}WatchWnd1ColWidth12" "200" @@ -215,12 +223,36 @@ "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp0" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp1" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp10" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp100" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp101" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp102" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp103" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp104" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp105" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp106" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp107" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp108" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp109" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp11" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp110" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp111" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp112" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp113" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp114" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp115" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp116" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp117" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp118" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp119" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp12" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp120" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp121" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp122" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp123" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp13" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp14" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp15" "0" -"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp16" "1" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp16" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp17" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp18" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp19" "0" @@ -288,15 +320,32 @@ "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp75" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp76" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp77" "0" -"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp78" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp78" "1" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp79" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp8" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp80" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp81" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp82" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp83" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp84" "1" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp85" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp86" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp87" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp88" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp89" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp9" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp90" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp91" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp92" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp93" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp94" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp95" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp96" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp97" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp98" "0" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0Exp99" "0" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0ScrollHorz" "0" -"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0ScrollVert" "16" +"{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd0ScrollVert" "96" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd1ColWidth0" "200" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd1ColWidth1" "100" "{F866DB60-6186-11D5-8BBE-0004E2013C71}IOWnd1ColWidth2" "100" @@ -318,14 +367,14 @@ 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 2 "0.07" 270 0 0 350 200 17 0 "32771|32772|32778|<>|32773|32774|<>|32820|<>|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|<>|32781|32782|<>|32780|32785|32787" "0.0" +"{WK_00000001_CmdLine}" "WINDOW" 59422 0 2 "0.07" 344 0 0 350 200 17 0 "32771|32772|32778|<>|32773|32774|<>|32820|<>|32801|32824" "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|<>|32781|32782|<>|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" 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|<>|42206|42205|42230|42229|42207|<>|42208|42209|42210|49076|42228|42227|<>|42231|42232|42234|42235|<>|42211|<>" "0.0" -"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 0 "0.97" 270 560 340 350 200 18 0 "36756|36757|36758|36759|<>|36746|36747|<>|39531|<>|39500|39534|<>|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|<>|32771|32829|32772|32827|32773|<>|32786|<>|32810|32811" "0.0" +"{WK_00000001_IO}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 3 "0.39" 344 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.35" 344 0 0 350 200 2065 0 "42202|42203|42204|42233|<>|42206|42205|42230|42229|42207|<>|42208|42209|42210|49076|42228|42227|<>|42231|42232|42234|42235|<>|42211|<>" "0.0" +"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 0 "1.00" 344 560 340 350 200 18 0 "36756|36757|36758|36759|<>|36746|36747|<>|39531|<>|39500|39534|<>|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.72" 344 0 0 853 610 17 0 "32781|32783|<>|32771|32829|32772|32827|32773|<>|32786|<>|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" @@ -352,6 +401,7 @@ [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] @@ -374,8 +424,8 @@ "SBK_TAR_EMUE100|Exception" 1 "SBK_TAR_EMUE100|BreakCondition" 1 "SBK_TAR_EMUE100|TaskID" 1 -"SBK_TAR_EMUE100|PC" 1 "SBK_TAR_EMUE100|ExecutionTime" 1 +"SBK_TAR_EMUE100|PC" 1 [STATUSBAR_DEBUGGER_PANESTATE_VD2] [STATUSBAR_DEBUGGER_PANESTATE_VD3] [STATUSBAR_DEBUGGER_PANESTATE_VD4] @@ -403,4 +453,5 @@ [FLASH_DETAILS] "" 0 0 "" 0 "" 0 0 "" 0 0 0 0 0 0 0 "" "" "" "" "" [BREAKPOINTS] +"c:\e\dev\freertos\workingcopy\demo\rx600_rx62n-rdk_renesas\rtosdemo\main-full.c" 436 -450004 1 "{00000000-0000-0000-C000-000000000046}" "" [END] diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c index 2824ca066..5181d452f 100644 --- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c +++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/EMAC.c @@ -55,7 +55,6 @@ #include "iodefine.h" #include "typedefine.h" #include "r_ether.h" -#include "phy.h" /* FreeRTOS includes. */ #include "FreeRTOS.h" @@ -95,28 +94,24 @@ become free. */ /*-----------------------------------------------------------*/ -/* The buffers and descriptors themselves. */ -static union x_RX_Desc -{ - unsigned long long ullAlignmentVariable; - ethfifo xDescriptorArray[ emacNUM_RX_DESCRIPTORS ]; -} xRxDescriptors; +/* The buffers and descriptors themselves. */ +#pragma section _RX_DESC + volatile ethfifo xRxDescriptors[ emacNUM_RX_DESCRIPTORS ]; +#pragma section _TX_DESC + volatile ethfifo xTxDescriptors[ emacNUM_TX_BUFFERS ]; +#pragma section _ETHERNET_BUFFERS + struct + { + unsigned long ulAlignmentVariable; + char cBuffer[ emacNUM_BUFFERS ][ UIP_BUFSIZE ]; + } xEthernetBuffers; +#pragma section -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.xDataBuffers is free, otherwise +contains 0 then the corresponding buffer in xEthernetBuffers is free, otherwise the buffer is in use or about to be used. */ static unsigned char ucBufferInUse[ emacNUM_BUFFERS ]; @@ -128,7 +123,7 @@ static unsigned char ucBufferInUse[ emacNUM_BUFFERS ]; static void prvInitialiseDescriptors( void ); /* - * Return a pointer to a free buffer within xEthernetBuffers.xDataBuffers. + * Return a pointer to a free buffer within xEthernetBuffers. */ static unsigned char *prvGetNextBuffer( void ); @@ -204,7 +199,7 @@ long x; /* Wait until the second transmission of the last packet has completed. */ for( x = 0; x < emacTX_WAIT_ATTEMPTS; x++ ) { - if( ( xTxDescriptors.xDescriptorArray[ 1 ].status & ACT ) != 0 ) + if( ( xTxDescriptors[ 1 ].status & ACT ) != 0 ) { /* Descriptor is still active. */ vTaskDelay( emacTX_WAIT_DELAY_ms ); @@ -216,27 +211,27 @@ long x; } /* Is the descriptor free after waiting for it? */ - if( ( xTxDescriptors.xDescriptorArray[ 1 ].status & ACT ) != 0 ) + if( ( xTxDescriptors[ 1 ].status & ACT ) != 0 ) { /* Something has gone wrong. */ prvResetEverything(); } /* Setup both descriptors to transmit the frame. */ - 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; + xTxDescriptors[ 0 ].buf_p = ( char * ) uip_buf; + xTxDescriptors[ 0 ].bufsize = uip_len; + xTxDescriptors[ 1 ].buf_p = ( char * ) uip_buf; + xTxDescriptors[ 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.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 ); + xTxDescriptors[0].status &= ~( FP1 | FP0 ); + xTxDescriptors[0].status |= ( FP1 | FP0 | ACT ); + xTxDescriptors[1].status &= ~( FP1 | FP0 ); + xTxDescriptors[1].status |= ( FP1 | FP0 | ACT ); EDMAC.EDTRR.LONG = 0x00000001; } @@ -282,15 +277,28 @@ long lReturn; { /* Half duplex link */ case PHY_LINK_100H: + ETHERC.ECMR.BIT.DM = 0; + ETHERC.ECMR.BIT.RTM = 1; + lReturn = pdPASS; + break; + case PHY_LINK_10H: ETHERC.ECMR.BIT.DM = 0; + ETHERC.ECMR.BIT.RTM = 0; lReturn = pdPASS; break; + /* Full duplex link */ case PHY_LINK_100F: + ETHERC.ECMR.BIT.DM = 1; + ETHERC.ECMR.BIT.RTM = 1; + lReturn = pdPASS; + break; + case PHY_LINK_10F: ETHERC.ECMR.BIT.DM = 1; + ETHERC.ECMR.BIT.RTM = 0; lReturn = pdPASS; break; @@ -327,13 +335,13 @@ long x; /* Initialise the Rx descriptors. */ for( x = 0; x < emacNUM_RX_DESCRIPTORS; x++ ) { - pxDescriptor = &( xRxDescriptors.xDescriptorArray[ x ] ); - pxDescriptor->buf_p = &( xEthernetBuffers.xDataBuffers[ x ][ 0 ] ); + pxDescriptor = &( xRxDescriptors[ x ] ); + pxDescriptor->buf_p = &( xEthernetBuffers.cBuffer[ x ][ 0 ] ); pxDescriptor->bufsize = UIP_BUFSIZE; pxDescriptor->size = 0; pxDescriptor->status = ACT; - pxDescriptor->next = &xRxDescriptors.xDescriptorArray[ x + 1 ]; + pxDescriptor->next = &xRxDescriptors[ x + 1 ]; /* Mark this buffer as in use. */ ucBufferInUse[ x ] = pdTRUE; @@ -341,12 +349,12 @@ long x; /* The last descriptor points back to the start. */ pxDescriptor->status |= DL; - pxDescriptor->next = &xRxDescriptors.xDescriptorArray[ 0 ]; + pxDescriptor->next = &xRxDescriptors[ 0 ]; /* Initialise the Tx descriptors. */ for( x = 0; x < emacNUM_TX_BUFFERS; x++ ) { - pxDescriptor = &( xTxDescriptors.xDescriptorArray[ x ] ); + pxDescriptor = &( xTxDescriptors[ x ] ); /* A buffer is not allocated to the Tx descriptor until a send is actually required. */ @@ -355,15 +363,15 @@ long x; pxDescriptor->bufsize = UIP_BUFSIZE; pxDescriptor->size = 0; pxDescriptor->status = 0; - pxDescriptor->next = &xTxDescriptors.xDescriptorArray[ x + 1 ]; + pxDescriptor->next = &xTxDescriptors[ x + 1 ]; } /* The last descriptor points back to the start. */ pxDescriptor->status |= DL; - pxDescriptor->next = &( xTxDescriptors.xDescriptorArray[ 0 ] ); + pxDescriptor->next = &( xTxDescriptors[ 0 ] ); /* Use the first Rx descriptor to start with. */ - xCurrentRxDesc = &( xRxDescriptors.xDescriptorArray[ 0 ] ); + xCurrentRxDesc = &( xRxDescriptors[ 0 ] ); } /*-----------------------------------------------------------*/ @@ -382,7 +390,7 @@ unsigned long ulAttempts = 0; if( ucBufferInUse[ x ] == pdFALSE ) { ucBufferInUse[ x ] = pdTRUE; - pucReturn = ( unsigned char * ) &( xEthernetBuffers.xDataBuffers[ x ][ 0 ] ); + pucReturn = ( unsigned char * ) &( xEthernetBuffers.cBuffer[ x ][ 0 ] ); break; } } @@ -413,7 +421,7 @@ unsigned long ul; /* Return a buffer to the pool of free buffers. */ for( ul = 0; ul < emacNUM_BUFFERS; ul++ ) { - if( &( xEthernetBuffers.xDataBuffers[ ul ][ 0 ] ) == ( void * ) pucBuffer ) + if( &( xEthernetBuffers.cBuffer[ ul ][ 0 ] ) == ( void * ) pucBuffer ) { ucBufferInUse[ ul ] = pdFALSE; break; @@ -503,12 +511,18 @@ static void prvConfigureEtherCAndEDMAC( void ) /* EDMAC */ EDMAC.EESR.LONG = 0x47FF0F9F; /* Clear all ETHERC and EDMAC status bits */ + #ifdef __LIT + EDMAC.EDMR.BIT.DE = 1; + #endif EDMAC.RDLAR = ( void * ) xCurrentRxDesc; /* Initialaize Rx Descriptor List Address */ - EDMAC.TDLAR = &( xTxDescriptors.xDescriptorArray[ 0 ] ); /* Initialaize Tx Descriptor List Address */ + EDMAC.TDLAR = &( xTxDescriptors[ 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) */ + + /* Enable the interrupt... */ + _IEN( _ETHER_EINT ) = 1; } /*-----------------------------------------------------------*/ @@ -527,7 +541,7 @@ static long ulTxEndInts = 0; if( ulTxEndInts >= 2 ) { /* Only return the buffer to the pool once both Txes have completed. */ - prvReturnBuffer( ( void * ) xTxDescriptors.xDescriptorArray[ 0 ].buf_p ); + prvReturnBuffer( ( void * ) xTxDescriptors[ 0 ].buf_p ); ulTxEndInts = 0; } EDMAC.EESR.LONG = emacTX_END_INTERRUPT; @@ -542,3 +556,4 @@ static long ulTxEndInts = 0; EDMAC.EESR.LONG = emacRX_END_INTERRUPT; } } + diff --git a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/uip-conf.h b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/uip-conf.h index 62572085f..70b70337b 100644 --- a/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/uip-conf.h +++ b/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/webserver/uip-conf.h @@ -114,7 +114,7 @@ typedef unsigned short uip_stats_t; * * \hideinitializer */ -#define UIP_CONF_BYTE_ORDER UIP_BIG_ENDIAN +#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN /** * Logging on or off