diff --git a/examples/Serial2Ethernet/EWARM54/Serial2Ethernet.dep b/examples/Serial2Ethernet/EWARM54/Serial2Ethernet.dep index 5cbe2de..809a84a 100644 --- a/examples/Serial2Ethernet/EWARM54/Serial2Ethernet.dep +++ b/examples/Serial2Ethernet/EWARM54/Serial2Ethernet.dep @@ -10,28 +10,21 @@ $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\util.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\socket.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\w5200.o - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\atcmd.o + $TOOLKIT_DIR$\inc\stdint.h $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.h $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.h - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.h - $PROJ_DIR$\..\STM32F1xx\stm32f10x_conf.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h - $TOOLKIT_DIR$\inc\xlocaleuse.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h - $TOOLKIT_DIR$\inc\stdint.h $TOOLKIT_DIR$\inc\intrinsics.h $TOOLKIT_DIR$\inc\DLib_Defaults.h + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_gpio.o $TOOLKIT_DIR$\inc\xencoding_limits.h $TOOLKIT_DIR$\inc\DLib_Product.h - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_gpio.o - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\system_stm32f10x.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_rcc.o + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\system_stm32f10x.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_spi.o - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_usart.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\wizplatform.o + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_usart.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Serial2Ethernet.bin + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\cmdrun.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\atcmd.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\wizspi.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\main.o @@ -39,29 +32,29 @@ $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\dns.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_it.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\startup_stm32f10x_md.o - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\cmdrun.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_gpio.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\util.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\socket.pbi + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\wizspi.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\w5200.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\sockutil.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\core_cm3.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\misc.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_flash.pbi - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\wizspi.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_rcc.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_spi.pbi + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\dhcp.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_usart.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\system_stm32f10x.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\wizplatform.pbi - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\dhcp.pbi + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\cmdrun.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\dns.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_it.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\main.pbi $PROJ_DIR$\..\out-EWARM54-W5200EVB\Serial2Ethernet.out $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\Serial2Ethernet.pbd - $TOOLKIT_DIR$\inc\stdio.h $TOOLKIT_DIR$\inc\stdlib.h + $TOOLKIT_DIR$\inc\stdio.h $TOOLKIT_DIR$\inc\xmtx.h $TOOLKIT_DIR$\inc\DLib_Threads.h $TOOLKIT_DIR$\inc\ycheck.h @@ -74,29 +67,20 @@ $TOOLKIT_DIR$\inc\ysizet.h $TOOLKIT_DIR$\inc\string.h $TOOLKIT_DIR$\inc\wchar.h - $PROJ_DIR$\..\..\..\library\host\wizspi.h - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.h - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.h $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c - $PROJ_DIR$\..\src\main.c - $PROJ_DIR$\..\src\wizconfig.h $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\sockutil.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\stm32f10x_flash.o - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\cmdrun.o $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\core_cm3.o - $PROJ_DIR$\..\..\..\library\common\common.h + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\misc.o + $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + $PROJ_DIR$\..\..\..\library\common\common.h $PROJ_DIR$\..\..\..\library\common\types.h $PROJ_DIR$\..\..\..\library\common\util.c $PROJ_DIR$\..\..\..\library\common\util.h $PROJ_DIR$\..\..\..\library\device\w5200\socket.c $PROJ_DIR$\..\..\..\library\device\w5200\w5200.c $PROJ_DIR$\..\..\..\library\device\w5200\w5200.h - $PROJ_DIR$\..\..\..\library\device\w5500\socket.c - $PROJ_DIR$\..\..\..\library\device\w5500\w5500.c - $PROJ_DIR$\..\..\..\library\device\w5500\w5500.h $PROJ_DIR$\..\..\..\library\device\socket.h $PROJ_DIR$\..\..\..\library\device\sockutil.c $PROJ_DIR$\..\..\..\library\device\sockutil.h @@ -104,7 +88,7 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\misc.h - $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\misc.o + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_flash.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c @@ -118,78 +102,64 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\system_stm32f10x.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\w5200_evb.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\wizplatform.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\system_stm32f10x.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\w5500_evb.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\wizplatform.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\system_stm32f10x.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\w7200_evb.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\wizplatform.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c $PROJ_DIR$\..\..\..\library\host\wizplatform.h + $PROJ_DIR$\..\..\..\library\host\wizspi.h + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.h + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.h + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c + $PROJ_DIR$\..\src\main.c + $PROJ_DIR$\..\src\wizconfig.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h + $PROJ_DIR$\..\out-EWARM54-W5200EVB\Obj\atcmd.o + $TOOLKIT_DIR$\inc\xlocaleuse.h - $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c + [ROOT_NODE] - BICOMP - 26 - - - ICCARM - 4 + ILINK + 45 - - - BICOMP - 5 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 7 - - - $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c + $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c - BICOMP - 33 + ICCARM + 107 - ICCARM - 78 + BICOMP + 19 BICOMP - 7 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 5 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 66 - [ROOT_NODE] + $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - ILINK - 52 + ICCARM + 41 - - - - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - BICOMP - 50 - - - ICCARM - 31 + 18 BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 66 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 @@ -198,7 +168,7 @@ OBJCOPY - 25 + 17 @@ -207,153 +177,96 @@ BILINK - 26 33 39 48 49 51 40 36 38 41 34 50 43 44 45 46 35 37 47 42 + 19 18 32 37 42 44 33 28 31 34 26 43 35 36 38 39 27 30 40 29 - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c - - BICOMP - 48 - ICCARM - 29 - - - - - BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 24 - - - - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - BICOMP - 49 - - - ICCARM - 30 + 43 - - - BICOMP - 72 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 - - - $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c - - BICOMP - 50 - ICCARM - 31 + 63 - - - - $PROJ_DIR$\..\src\main.c - BICOMP - 51 - - - ICCARM - 28 + 34 BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 72 5 + 84 106 79 4 51 52 8 11 10 50 7 82 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + $PROJ_DIR$\..\..\..\library\common\util.c - - BICOMP - 41 - ICCARM - 77 - - - - - BICOMP - 100 11 95 14 58 59 16 18 17 57 15 13 + 1 - - - - $PROJ_DIR$\..\..\..\library\common\util.c - BICOMP - 35 - - - ICCARM - 1 + 27 BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 $PROJ_DIR$\..\..\..\library\device\w5200\socket.c - - BICOMP - 36 - ICCARM 2 + + BICOMP + 28 + BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 $PROJ_DIR$\..\..\..\library\device\w5200\w5200.c - - BICOMP - 37 - ICCARM 3 + + BICOMP + 30 + BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 @@ -361,18 +274,18 @@ $PROJ_DIR$\..\..\..\library\device\sockutil.c - BICOMP - 38 + ICCARM + 62 - ICCARM - 76 + BICOMP + 31 BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 @@ -380,18 +293,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.c - BICOMP - 39 + ICCARM + 64 - ICCARM - 79 + BICOMP + 32 BICOMP - 14 58 59 16 18 17 57 + 4 51 52 8 11 10 50 @@ -399,18 +312,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c - BICOMP - 40 + ICCARM + 65 - ICCARM - 98 + BICOMP + 33 BICOMP - 97 11 95 14 58 59 16 18 17 57 15 13 + 81 106 79 4 51 52 8 11 10 50 7 82 @@ -419,7 +332,7 @@ AARM - 32 + 25 @@ -427,18 +340,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c - BICOMP - 34 + ICCARM + 9 - ICCARM - 19 + BICOMP + 26 BICOMP - 102 11 95 14 58 59 16 18 17 57 15 13 104 + 86 106 79 4 51 52 8 11 10 50 7 82 88 @@ -446,18 +359,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c - BICOMP - 43 + ICCARM + 12 - ICCARM - 21 + BICOMP + 35 BICOMP - 104 11 95 14 58 59 16 18 17 57 15 13 + 88 106 79 4 51 52 8 11 10 50 7 82 @@ -465,18 +378,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c - BICOMP - 44 + ICCARM + 14 - ICCARM - 22 + BICOMP + 36 BICOMP - 106 11 95 14 58 59 16 18 17 57 15 13 104 + 90 106 79 4 51 52 8 11 10 50 7 82 88 @@ -484,18 +397,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - BICOMP - 45 + ICCARM + 16 - ICCARM - 23 + BICOMP + 38 BICOMP - 108 11 95 14 58 59 16 18 17 57 15 13 104 + 92 106 79 4 51 52 8 11 10 50 7 82 88 @@ -503,18 +416,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\system_stm32f10x.c - BICOMP - 46 + ICCARM + 13 - ICCARM - 20 + BICOMP + 39 BICOMP - 11 95 14 58 59 16 18 17 57 15 13 + 106 79 4 51 52 8 11 10 50 7 82 @@ -522,18 +435,18 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\wizplatform.c - BICOMP - 47 + ICCARM + 15 - ICCARM - 24 + BICOMP + 40 BICOMP - 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 68 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 @@ -541,43 +454,103 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c - BICOMP - 42 + ICCARM + 20 - ICCARM - 27 + BICOMP + 29 BICOMP - 68 80 75 82 110 11 95 14 58 59 16 18 17 57 15 13 87 54 65 55 66 61 64 63 60 56 12 62 67 84 91 93 119 70 + 98 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 - - $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - ICCARM - - - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - ICCARM - - + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - ICCARM - - + + + ICCARM + 22 + + + BICOMP + 37 + + + + + BICOMP + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 + + + + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + + + ICCARM + 23 + + + BICOMP + 42 + + + + + BICOMP + 102 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 + + + + + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c + + + ICCARM + 24 + + + BICOMP + 43 + + + + + BICOMP + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 + + + + + $PROJ_DIR$\..\src\main.c + + + ICCARM + 21 + + + BICOMP + 44 + + + + + BICOMP + 68 105 69 94 106 79 4 51 52 8 11 10 50 7 82 98 74 48 58 47 59 54 57 56 53 49 108 55 60 71 75 77 97 100 102 5 + + + + + $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c ICCARM - $PROJ_DIR$\..\src\main.c + $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c ICCARM @@ -660,6 +633,22 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c ICCARM + + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + ICCARM + + + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + ICCARM + + + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c + ICCARM + + + $PROJ_DIR$\..\src\main.c + ICCARM + [MULTI_TOOL] ILINK @@ -669,66 +658,59 @@ WIZ_W5500 $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c + $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\cmdrun.o + $TOOLKIT_DIR$\inc\stdint.h $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.h $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.h - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.h - $PROJ_DIR$\..\STM32F1xx\stm32f10x_conf.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h - $TOOLKIT_DIR$\inc\xlocaleuse.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h - $TOOLKIT_DIR$\inc\stdint.h - $TOOLKIT_DIR$\inc\intrinsics.h - $TOOLKIT_DIR$\inc\DLib_Defaults.h - $TOOLKIT_DIR$\inc\xencoding_limits.h - $TOOLKIT_DIR$\inc\DLib_Product.h - $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\cmdrun.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\atcmd.o + $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\sockutil.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\socket.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_flash.o - $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\sockutil.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\system_stm32f10x.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\misc.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\w5500.o + $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\wizspi.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\core_cm3.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\util.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_gpio.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_rcc.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_spi.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_usart.o - $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\wizspi.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\wizplatform.o + $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\cmdrun.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\atcmd.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\main.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\dhcp.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\dns.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_it.o $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\startup_stm32f10x_md.o - $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\cmdrun.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_gpio.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\util.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\socket.pbi + $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\wizspi.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\w5500.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\sockutil.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\core_cm3.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\misc.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_flash.pbi - $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\wizspi.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_rcc.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_spi.pbi + $PROJ_DIR$\..\out-EWARM54-W5500EVB\Serial2Ethernet.bin $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_usart.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\system_stm32f10x.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\wizplatform.pbi - $PROJ_DIR$\..\out-EWARM54-W5500EVB\Serial2Ethernet.bin $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\dhcp.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\dns.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\stm32f10x_it.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\main.pbi $PROJ_DIR$\..\out-EWARM54-W5500EVB\Serial2Ethernet.out $PROJ_DIR$\..\out-EWARM54-W5500EVB\Obj\Serial2Ethernet.pbd - $TOOLKIT_DIR$\inc\stdio.h + $TOOLKIT_DIR$\inc\intrinsics.h + $TOOLKIT_DIR$\inc\DLib_Defaults.h + $TOOLKIT_DIR$\inc\xencoding_limits.h + $TOOLKIT_DIR$\inc\DLib_Product.h $TOOLKIT_DIR$\inc\stdlib.h + $TOOLKIT_DIR$\inc\stdio.h $TOOLKIT_DIR$\inc\xmtx.h $TOOLKIT_DIR$\inc\DLib_Threads.h $TOOLKIT_DIR$\inc\ycheck.h @@ -741,22 +723,13 @@ $TOOLKIT_DIR$\inc\ysizet.h $TOOLKIT_DIR$\inc\string.h $TOOLKIT_DIR$\inc\wchar.h - $PROJ_DIR$\..\..\..\library\host\wizspi.h - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.h - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.h $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c - $PROJ_DIR$\..\src\main.c - $PROJ_DIR$\..\src\wizconfig.h - $PROJ_DIR$\..\..\..\library\common\common.h + $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + $PROJ_DIR$\..\..\..\library\common\common.h $PROJ_DIR$\..\..\..\library\common\types.h $PROJ_DIR$\..\..\..\library\common\util.c $PROJ_DIR$\..\..\..\library\common\util.h - $PROJ_DIR$\..\..\..\library\device\w5200\socket.c - $PROJ_DIR$\..\..\..\library\device\w5200\w5200.c - $PROJ_DIR$\..\..\..\library\device\w5200\w5200.h $PROJ_DIR$\..\..\..\library\device\w5500\socket.c $PROJ_DIR$\..\..\..\library\device\w5500\w5500.c $PROJ_DIR$\..\..\..\library\device\w5500\w5500.h @@ -767,6 +740,7 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\misc.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_flash.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c @@ -777,81 +751,66 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_spi.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_usart.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\system_stm32f10x.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\w5200_evb.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\wizplatform.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\system_stm32f10x.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\w5500_evb.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\wizplatform.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\system_stm32f10x.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\w7200_evb.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\wizplatform.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c $PROJ_DIR$\..\..\..\library\host\wizplatform.h + $PROJ_DIR$\..\..\..\library\host\wizspi.h + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.h + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.h + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c + $PROJ_DIR$\..\src\main.c + $PROJ_DIR$\..\src\wizconfig.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h + $TOOLKIT_DIR$\inc\xlocaleuse.h - $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c + [ROOT_NODE] - BICOMP - 31 - - - ICCARM - 16 + ILINK + 46 - - - BICOMP - 1 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 3 - - - $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c + $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c - BICOMP - 37 + ICCARM + 5 - ICCARM - 15 + BICOMP + 21 BICOMP - 3 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 3 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 67 - [ROOT_NODE] + $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - ILINK - 57 + ICCARM + 1 - - - - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - BICOMP - 55 - - - ICCARM - 35 + 20 BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 67 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 @@ -860,7 +819,7 @@ OBJCOPY - 52 + 38 @@ -869,352 +828,371 @@ BILINK - 31 37 43 53 54 56 44 40 42 45 38 55 47 48 49 50 39 41 51 46 + 21 20 33 42 43 45 34 29 32 35 27 44 36 37 39 40 28 31 41 30 - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c - - BICOMP - 53 - ICCARM - 33 + 25 - - BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 44 - + - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c - BICOMP - 54 + ICCARM + 8 - ICCARM - 34 + BICOMP + 35 BICOMP - 77 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 85 107 80 2 56 57 49 51 50 55 48 83 - $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c + $PROJ_DIR$\..\..\..\library\common\util.c - BICOMP - 55 + ICCARM + 14 - ICCARM - 35 + BICOMP + 28 + + + BICOMP + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 + + - $PROJ_DIR$\..\src\main.c + $PROJ_DIR$\..\..\..\library\device\w5500\socket.c - BICOMP - 56 + ICCARM + 7 - ICCARM - 32 + BICOMP + 29 BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 77 1 + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + $PROJ_DIR$\..\..\..\library\device\w5500\w5500.c - BICOMP - 45 + ICCARM + 11 - ICCARM - 18 + BICOMP + 31 BICOMP - 100 7 96 10 63 64 12 14 13 62 11 9 + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\common\util.c + $PROJ_DIR$\..\..\..\library\device\sockutil.c - BICOMP - 39 + ICCARM + 6 - ICCARM - 24 + BICOMP + 32 BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\device\w5500\socket.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.c - BICOMP - 40 + ICCARM + 13 - ICCARM - 17 + BICOMP + 33 BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 2 56 57 49 51 50 55 - $PROJ_DIR$\..\..\..\library\device\w5500\w5500.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c - BICOMP - 41 + ICCARM + 10 - ICCARM - 22 + BICOMP + 34 BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 82 107 80 2 56 57 49 51 50 55 48 83 - $PROJ_DIR$\..\..\..\library\device\sockutil.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s - BICOMP - 42 + AARM + 26 + + + + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c + ICCARM - 19 + 15 + + + BICOMP + 27 BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 87 107 80 2 56 57 49 51 50 55 48 83 89 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c - BICOMP - 43 + ICCARM + 16 - ICCARM - 23 + BICOMP + 36 BICOMP - 10 63 64 12 14 13 62 + 89 107 80 2 56 57 49 51 50 55 48 83 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c - BICOMP - 44 + ICCARM + 17 - ICCARM - 21 + BICOMP + 37 BICOMP - 98 7 96 10 63 64 12 14 13 62 11 9 + 91 107 80 2 56 57 49 51 50 55 48 83 89 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - AARM - 36 + ICCARM + 18 + + + BICOMP + 39 + + + BICOMP + 93 107 80 2 56 57 49 51 50 55 48 83 89 + + - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\system_stm32f10x.c - BICOMP - 38 + ICCARM + 9 - ICCARM - 25 + BICOMP + 40 BICOMP - 102 7 96 10 63 64 12 14 13 62 11 9 104 + 107 80 2 56 57 49 51 50 55 48 83 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\wizplatform.c - BICOMP - 47 + ICCARM + 19 - ICCARM - 26 + BICOMP + 41 BICOMP - 104 7 96 10 63 64 12 14 13 62 11 9 + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c - BICOMP - 48 + ICCARM + 12 - ICCARM - 27 + BICOMP + 30 BICOMP - 106 7 96 10 63 64 12 14 13 62 11 9 104 + 99 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - BICOMP - 49 + ICCARM + 23 - ICCARM - 28 + BICOMP + 42 BICOMP - 108 7 96 10 63 64 12 14 13 62 11 9 104 + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\system_stm32f10x.c + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - BICOMP - 50 + ICCARM + 24 - ICCARM - 20 + BICOMP + 43 BICOMP - 7 96 10 63 64 12 14 13 62 11 9 + 103 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\wizplatform.c + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - BICOMP - 51 + ICCARM + 25 - ICCARM - 30 + BICOMP + 44 BICOMP - 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 73 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c + $PROJ_DIR$\..\src\main.c - BICOMP - 46 + ICCARM + 22 - ICCARM - 29 + BICOMP + 45 BICOMP - 73 81 80 83 113 7 96 10 63 64 12 14 13 62 11 9 91 59 70 60 71 66 69 68 65 61 8 67 72 85 92 94 119 75 + 69 106 70 95 107 80 2 56 57 49 51 50 55 48 83 99 75 53 63 52 64 59 62 61 58 54 108 60 65 72 76 78 98 101 103 3 @@ -1226,22 +1204,6 @@ $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c ICCARM - - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - ICCARM - - - $PROJ_DIR$\..\src\main.c - ICCARM - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c ICCARM @@ -1322,6 +1284,22 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c ICCARM + + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + ICCARM + + + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + ICCARM + + + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c + ICCARM + + + $PROJ_DIR$\..\src\main.c + ICCARM + [MULTI_TOOL] ILINK @@ -1331,42 +1309,18 @@ WIZ_W7200 $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_gpio.pbi + $TOOLKIT_DIR$\inc\stdint.h $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.h $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.h - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.h - $PROJ_DIR$\..\STM32F1xx\stm32f10x_conf.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h - $TOOLKIT_DIR$\inc\xlocaleuse.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h - $TOOLKIT_DIR$\inc\stdint.h - $TOOLKIT_DIR$\inc\intrinsics.h - $TOOLKIT_DIR$\inc\DLib_Defaults.h - $TOOLKIT_DIR$\inc\xencoding_limits.h - $TOOLKIT_DIR$\inc\DLib_Product.h - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_flash.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_rcc.pbi - $TOOLKIT_DIR$\inc\stdio.h - $TOOLKIT_DIR$\inc\stdlib.h - $TOOLKIT_DIR$\inc\xmtx.h - $TOOLKIT_DIR$\inc\DLib_Threads.h - $TOOLKIT_DIR$\inc\ycheck.h - $TOOLKIT_DIR$\inc\yvals.h - $TOOLKIT_DIR$\inc\xtls.h - $TOOLKIT_DIR$\inc\DLib_Product_string.h - $TOOLKIT_DIR$\inc\xlocale_c.h - $TOOLKIT_DIR$\inc\xlocale.h - $TOOLKIT_DIR$\inc\ctype.h - $TOOLKIT_DIR$\inc\ysizet.h - $TOOLKIT_DIR$\inc\string.h - $TOOLKIT_DIR$\inc\wchar.h + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_flash.pbi + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_gpio.pbi + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\wizplatform.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_spi.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\system_stm32f10x.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_usart.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\wizspi.pbi - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\wizplatform.pbi + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\atcmd.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Serial2Ethernet.bin $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\dhcp.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\dns.pbi @@ -1374,9 +1328,8 @@ $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\main.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Serial2Ethernet.out $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\Serial2Ethernet.pbd - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_gpio.o - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\atcmd.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\socket.o + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_rcc.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\cmdrun.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\util.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\misc.o @@ -1384,44 +1337,69 @@ $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\sockutil.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\core_cm3.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_flash.o - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_rcc.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\system_stm32f10x.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_spi.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_usart.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\wizspi.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\wizplatform.o + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\cmdrun.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\atcmd.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\main.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\dhcp.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\dns.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_it.o $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\startup_stm32f10x_md.o - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\cmdrun.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\util.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\socket.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\w5200.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\sockutil.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\core_cm3.pbi $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\misc.pbi - $PROJ_DIR$\..\..\..\library\host\wizspi.h - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.h - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.h - $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c - $PROJ_DIR$\..\src\main.c - $PROJ_DIR$\..\src\wizconfig.h - $PROJ_DIR$\..\..\..\library\common\common.h + $TOOLKIT_DIR$\inc\intrinsics.h + $TOOLKIT_DIR$\inc\DLib_Defaults.h + $TOOLKIT_DIR$\inc\xencoding_limits.h + $TOOLKIT_DIR$\inc\DLib_Product.h + $TOOLKIT_DIR$\inc\stdlib.h + $TOOLKIT_DIR$\inc\stdio.h + $TOOLKIT_DIR$\inc\xmtx.h + $TOOLKIT_DIR$\inc\DLib_Threads.h + $TOOLKIT_DIR$\inc\ycheck.h + $TOOLKIT_DIR$\inc\yvals.h + $TOOLKIT_DIR$\inc\xtls.h + $TOOLKIT_DIR$\inc\DLib_Product_string.h + $TOOLKIT_DIR$\inc\xlocale_c.h + $TOOLKIT_DIR$\inc\xlocale.h + $TOOLKIT_DIR$\inc\ctype.h + $TOOLKIT_DIR$\inc\ysizet.h + $TOOLKIT_DIR$\inc\string.h + $TOOLKIT_DIR$\inc\wchar.h + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\stm32f10x_gpio.o + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_fsmc.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_adc.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_bkp.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_can.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_cec.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_crc.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_dac.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_dbgmcu.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_dma.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_exti.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_i2c.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_tim.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_iwdg.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_pwr.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_rtc.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_sdio.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_wwdg.h + $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + $PROJ_DIR$\..\..\..\library\common\common.h $PROJ_DIR$\..\..\..\library\common\types.h $PROJ_DIR$\..\..\..\library\common\util.c $PROJ_DIR$\..\..\..\library\common\util.h $PROJ_DIR$\..\..\..\library\device\w5200\socket.c $PROJ_DIR$\..\..\..\library\device\w5200\w5200.c $PROJ_DIR$\..\..\..\library\device\w5200\w5200.h - $PROJ_DIR$\..\..\..\library\device\w5500\socket.c - $PROJ_DIR$\..\..\..\library\device\w5500\w5500.c - $PROJ_DIR$\..\..\..\library\device\w5500\w5500.h $PROJ_DIR$\..\..\..\library\device\socket.h $PROJ_DIR$\..\..\..\library\device\sockutil.c $PROJ_DIR$\..\..\..\library\device\sockutil.h @@ -1429,6 +1407,7 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\misc.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_flash.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c @@ -1439,34 +1418,47 @@ $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_spi.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\inc\stm32f10x_usart.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\system_stm32f10x.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\w5200_evb.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\wizplatform.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\system_stm32f10x.c - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\w5500_evb.h - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\wizplatform.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\system_stm32f10x.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\w7200_evb.h $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\wizplatform.c $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c $PROJ_DIR$\..\..\..\library\host\wizplatform.h - - - $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c - + $PROJ_DIR$\..\..\..\library\host\wizspi.h + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.h + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + $PROJ_DIR$\..\STM32F1xx\stm32f10x_conf.h + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c + $PROJ_DIR$\..\src\main.c + $PROJ_DIR$\..\src\wizconfig.h + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h + $TOOLKIT_DIR$\inc\xlocaleuse.h + + + [ROOT_NODE] + - BICOMP - 60 + ILINK + 18 + + + + $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c + ICCARM - 45 + 12 + + + BICOMP + 35 BICOMP - 2 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 4 + 2 85 122 86 111 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 98 115 91 52 62 51 63 58 61 60 57 53 124 59 64 88 92 94 114 117 83 @@ -1474,520 +1466,345 @@ $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - BICOMP - 66 + ICCARM + 22 - ICCARM - 47 + BICOMP + 34 BICOMP - 4 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 83 85 122 86 111 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 98 115 91 52 62 51 63 58 61 60 57 53 124 59 64 88 92 94 114 117 - [ROOT_NODE] + $PROJ_DIR$\..\out-EWARM54-W7200EVB\Serial2Ethernet.out - ILINK - 42 + OBJCOPY + 13 - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c - - BICOMP - 40 - ICCARM - 64 + 28 - - BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 - - - - - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Serial2Ethernet.out - - - OBJCOPY - 37 + 5 - - - $PROJ_DIR$\..\out-EWARM54-W7200EVB\Obj\Serial2Ethernet.pbd - BILINK - 60 66 71 38 39 41 72 68 70 16 1 40 17 32 34 33 67 69 36 35 + BICOMP + 101 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 66 103 76 78 79 105 80 81 107 77 109 82 98 - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c + $PROJ_DIR$\..\..\..\library\common\util.c - BICOMP - 38 + ICCARM + 23 - ICCARM - 62 + BICOMP + 41 BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 85 122 86 111 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 98 115 91 52 62 51 63 58 61 60 57 53 124 59 64 88 92 94 114 117 - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c + $PROJ_DIR$\..\..\..\library\device\w5200\socket.c - BICOMP - 39 + ICCARM + 20 - ICCARM - 63 + BICOMP + 42 BICOMP - 77 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 85 122 86 111 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 98 115 91 52 62 51 63 58 61 60 57 53 124 59 64 88 92 94 114 117 - $PROJ_DIR$\..\port-STM32F1xx\stm32f10x_it.c + $PROJ_DIR$\..\..\..\library\device\w5200\w5200.c - - BICOMP - 40 - ICCARM - 64 + 25 - - - - $PROJ_DIR$\..\src\main.c - BICOMP - 41 - - - ICCARM - 61 + 43 BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 77 2 + 85 122 86 111 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 98 115 91 52 62 51 63 58 61 60 57 53 124 59 64 88 92 94 114 117 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + $PROJ_DIR$\..\..\..\library\device\sockutil.c - BICOMP - 16 + ICCARM + 26 - ICCARM - 53 + BICOMP + 44 BICOMP - 100 8 96 11 22 23 13 15 14 21 12 10 + 85 122 86 111 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 98 115 91 52 62 51 63 58 61 60 57 53 124 59 64 88 92 94 114 117 - $PROJ_DIR$\..\..\..\library\common\util.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.c - BICOMP - 67 + ICCARM + 27 - ICCARM - 48 + BICOMP + 45 BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 1 55 56 48 50 49 54 - $PROJ_DIR$\..\..\..\library\device\w5200\socket.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c - BICOMP - 68 + ICCARM + 24 - ICCARM + BICOMP 46 BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 98 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 - $PROJ_DIR$\..\..\..\library\device\w5200\w5200.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s - BICOMP - 69 + AARM + 40 + + + + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c + ICCARM - 50 + 65 + + + BICOMP + 6 BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 103 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 76 78 79 105 80 81 107 77 109 82 98 - $PROJ_DIR$\..\..\..\library\device\sockutil.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c - BICOMP - 70 + ICCARM + 21 - ICCARM - 51 + BICOMP + 4 BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 105 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 80 81 107 77 109 82 98 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c - BICOMP - 71 + ICCARM + 30 - ICCARM - 52 + BICOMP + 8 BICOMP - 11 22 23 13 15 14 21 + 107 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 77 109 82 98 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - BICOMP - 72 + ICCARM + 31 - ICCARM - 49 + BICOMP + 10 BICOMP - 98 8 96 11 22 23 13 15 14 21 12 10 + 109 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 82 98 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s + $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\system_stm32f10x.c - AARM - 65 + ICCARM + 29 - - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c - BICOMP - 1 - - - ICCARM - 44 + 9 BICOMP - 102 8 96 11 22 23 13 15 14 21 12 10 104 + 123 96 1 55 56 48 50 49 54 47 99 119 67 68 69 70 71 72 73 74 75 101 66 103 76 78 79 105 80 81 107 77 109 82 98 - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\wizplatform.c - - BICOMP - 17 - ICCARM - 54 + 33 - - BICOMP - 104 8 96 11 22 23 13 15 14 21 12 10 + 7 - + - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c + $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c - BICOMP + ICCARM 32 - - ICCARM - 56 - - - BICOMP - 106 8 96 11 22 23 13 15 14 21 12 10 104 + 11 - + - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - - BICOMP - 34 - ICCARM - 57 + 37 - - BICOMP - 108 8 96 11 22 23 13 15 14 21 12 10 104 + 14 - + - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\system_stm32f10x.c + $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - - BICOMP - 33 - ICCARM - 55 + 38 - - BICOMP - 8 96 11 22 23 13 15 14 21 12 10 + 15 - + - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\wizplatform.c + $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - - BICOMP - 36 - ICCARM - 59 + 39 - - BICOMP - 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 73 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 16 - + - $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c + $PROJ_DIR$\..\src\main.c - - BICOMP - 35 - ICCARM - 58 + 36 - - BICOMP - 73 81 80 83 116 8 96 11 22 23 13 15 14 21 12 10 88 18 29 19 30 25 28 27 24 20 9 26 31 85 92 94 119 75 + 17 - + - - $PROJ_DIR$\..\..\..\library\appmod\atcmd\atcmd.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\appmod\atcmd\cmdrun.c - ICCARM - - - $PROJ_DIR$\..\STM32F1xx\stm32f10x_it.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\protocol\DHCP\dhcp.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\protocol\DNS\dns.c - ICCARM - - - $PROJ_DIR$\..\src\main.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\common\util.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\device\w5200\socket.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\device\w5200\w5200.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\device\w5500\socket.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\device\w5500\w5500.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\device\sockutil.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\CMSIS\CM3\CoreSupport\core_cm3.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\misc.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\stmlib\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\system_stm32f10x.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5200\wizplatform.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\system_stm32f10x.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W5500\wizplatform.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\system_stm32f10x.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\WIZ_W7200\wizplatform.c - ICCARM - - - $PROJ_DIR$\..\..\..\library\host\STM32F10x\wizspi.c - ICCARM - - - [MULTI_TOOL] - ILINK - diff --git a/examples/Serial2Ethernet/EWARM54/settings/Serial2Ethernet.wsdt b/examples/Serial2Ethernet/EWARM54/settings/Serial2Ethernet.wsdt index edb94cd..18ed498 100644 --- a/examples/Serial2Ethernet/EWARM54/settings/Serial2Ethernet.wsdt +++ b/examples/Serial2Ethernet/EWARM54/settings/Serial2Ethernet.wsdt @@ -24,7 +24,7 @@ - + TabID-12191-6165 @@ -36,7 +36,7 @@ - 0 + 0 TabID-11020-10486 @@ -46,7 +46,7 @@ - 0 + 0 @@ -59,7 +59,7 @@ - iaridepm.enu1-2-2542364-2-2219266211799341902353965699229-2-21911036-2-210381931003868248072211799341902 + iaridepm.enu1-2-2542364-2-2219266211799341902353965699229-2-21911036-2-210381931003868248072211799341902 diff --git a/examples/Serial2Ethernet/src/wizconfig.h b/examples/Serial2Ethernet/src/wizconfig.h index 265c946..aaa3423 100644 --- a/examples/Serial2Ethernet/src/wizconfig.h +++ b/examples/Serial2Ethernet/src/wizconfig.h @@ -27,7 +27,7 @@ #define DEFAULT_DNS_ADDR "168.126.63.1" //------------------------------ Etc ------------------------------ -#define WIZ_LOG_LEVEL 0 // 0: No print, 1: Error, 2: Error+Log, 3: Error+Log+Debug +#define WIZ_LOG_LEVEL 3//0 // 0: No print, 1: Error, 2: Error+Log, 3: Error+Log+Debug //#define PRINT_TIME_LOG #endif diff --git a/library/appmod/atcmd/atcmd.c b/library/appmod/atcmd/atcmd.c index cd08921..7324a49 100644 --- a/library/appmod/atcmd/atcmd.c +++ b/library/appmod/atcmd/atcmd.c @@ -47,7 +47,7 @@ static void hdl_nsend(void); static void hdl_nrecv(void); static void hdl_nsock(void); static void hdl_nopt(void); -#if 0 +#if 0 // for wlan static void hdl_wset(void); static void hdl_wstat(void); static void hdl_wscan(void); @@ -110,6 +110,12 @@ void atc_init(void) sockwatch_open(5, atc_async_cb); sockwatch_open(6, atc_async_cb); sockwatch_open(7, atc_async_cb); + + printf("\r\n\r\n\r\n[W,0]\r\n"); + + // ToDo + + printf("[S,0]\r\n"); } /** @@ -139,9 +145,7 @@ void atc_run(void) atci.sendbuf[atci.worklen++] = recv_char; if(atci.worklen >= atci.sendlen) { // �Է��� �Ϸ�Ǹ� - uint8 *ip = (atci.sendflag[0] == VAL_ENABLE) ? atci.sendip : NULL; - uint16 *port = (atci.sendflag[1] == VAL_ENABLE) ? &atci.sendport : NULL; - act_nsend(atci.sendsock, atci.sendbuf, atci.worklen, ip, port); + act_nsend(atci.sendsock, atci.sendbuf, atci.worklen, atci.sendip, &atci.sendport); atci.sendsock = VAL_NONE; } return; @@ -416,6 +420,9 @@ void cmd_resp_dump(int8 idval, int8 *dump) } else { if(idval == VAL_NONE) printf("[D,,%d]\r\n%s\r\n", len, dump); else printf("[D,%d,%d]\r\n%s\r\n", idval, len, dump); + DBG("going to free"); + MEM_FREE(dump); + DBG("free done"); } } @@ -615,7 +622,7 @@ static void hdl_nmac(void) static void hdl_nopen(void) { - int8 type=0, save=0; + int8 type=0; uint8 DstIP[4], *dip = NULL; uint16 SrcPort, DstPort = 0; @@ -644,22 +651,15 @@ static void hdl_nopen(void) CHK_ARG_LEN(atci.tcmd.arg3, 0, 3); CHK_ARG_LEN(atci.tcmd.arg4, 0, 4); } - } //else { // 'S' ������å�̳� �ƴϸ� ���� Ȯ�� ��å�̳� - // CHK_ARG_LEN(atci.tcmd.arg3, 0, 3); - // CHK_ARG_LEN(atci.tcmd.arg4, 0, 4); - //} - - if(atci.tcmd.arg5[0] == 0) { - atci.tcmd.arg5[0] = 'O'; - atci.tcmd.arg5[1] = 0; - } else if(CMP_CHAR_3(atci.tcmd.arg5, 'O', 'S', 'A')) { - RESP_CDR(RET_WRONG_ARG, 5); + } else { // 'S' ������å�̳� �ƴϸ� ���� Ȯ�� ��å�̳� + CHK_ARG_LEN(atci.tcmd.arg3, 0, 3); + CHK_ARG_LEN(atci.tcmd.arg4, 0, 4); } + CHK_ARG_LEN(atci.tcmd.arg5, 0, 5); type = atci.tcmd.arg1[0]; - save = atci.tcmd.arg5[0]; CMD_CLEAR(); - act_nopen_a(type, save, SrcPort, dip, DstPort); + act_nopen_a(type, SrcPort, dip, DstPort); } else CRITICAL_ERRA("wrong sign(%d)", atci.tcmd.sign); } @@ -688,6 +688,8 @@ static void hdl_nsend(void) { int8 num = -1; int32 ret; + uint8 *dip = NULL; + uint16 *dport = NULL; if(atci.tcmd.sign == CMD_SIGN_NONE) RESP_CR(RET_WRONG_SIGN); if(atci.tcmd.sign == CMD_SIGN_QUEST) RESP_CR(RET_WRONG_SIGN); @@ -700,21 +702,22 @@ static void hdl_nsend(void) RESP_CDR(RET_RANGE_OUT, 1); } if(str_check(isdigit, atci.tcmd.arg2) != RET_OK || - (atci.sendlen = atoi((char*)atci.tcmd.arg2)) < 1 || - atci.sendlen > WORK_BUF_SIZE) RESP_CDR(RET_WRONG_ARG, 2); - if(atci.tcmd.arg3[0] == 0) atci.sendflag[0] = VAL_DISABLE; - else if(ip_check(atci.tcmd.arg3, atci.sendip) == RET_OK) - atci.sendflag[0] = VAL_ENABLE; - else RESP_CDR(RET_WRONG_ARG, 3); - - if(atci.tcmd.arg4[0] == 0) atci.sendflag[1] = VAL_DISABLE; - else if(port_check(atci.tcmd.arg4, &atci.sendport) == RET_OK) - atci.sendflag[1] = VAL_ENABLE; - else RESP_CDR(RET_WRONG_ARG, 4); + (atci.sendlen = atoi((char*)atci.tcmd.arg2)) < 1 || + atci.sendlen > WORK_BUF_SIZE) RESP_CDR(RET_RANGE_OUT, 2); + + if(atci.tcmd.arg3[0]) { + if(ip_check(atci.tcmd.arg3, atci.sendip) == RET_OK) dip = atci.sendip; + else RESP_CDR(RET_WRONG_ARG, 3); + } + if(atci.tcmd.arg4[0]) { + if(port_check(atci.tcmd.arg4, &atci.sendport)==RET_OK) dport = &atci.sendport; + else RESP_CDR(RET_WRONG_ARG, 4); + } + CHK_ARG_LEN(atci.tcmd.arg5, 0, 5); CHK_ARG_LEN(atci.tcmd.arg6, 0, 6); CMD_CLEAR(); - ret = act_nsend_chk(num, &atci.sendlen, atci.sendip, &atci.sendport); + ret = act_nsend_chk(num, &atci.sendlen, dip, dport); if(ret != RET_OK) return; atci.sendsock = num; // ��ȿ�� �˻簡 �Ϸ�Ǹ� SEND���� ��ȯ diff --git a/library/appmod/atcmd/cmdrun.c b/library/appmod/atcmd/cmdrun.c index c8ca9af..24d896f 100644 --- a/library/appmod/atcmd/cmdrun.c +++ b/library/appmod/atcmd/cmdrun.c @@ -51,7 +51,7 @@ extern void cmd_resp(int8 retval, int8 idval); static int8 sockstat[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO] = {0,}; // for sock check (0 is ignored) static int16 sockport[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO] = {0,}; // for src port check static int8 sockbusy[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO] = {0,}; // for sock busy check -static int8 udpip[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO][4] = {0,}; // to store UDP Destination address +static uint8 udpip[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO][4] = {0,}; // to store UDP Destination address static int16 udpport[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO] = {0,}; // to store UDP Destination port static int16 tcpleft[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO] = {0,}; // remained data len to send for TCP Resend static int8 recvord[ATC_SOCK_NUM_TOTAL+ATC_SOCK_AO] = {0,}; // for check order of data recv @@ -96,6 +96,21 @@ static int8 event_enqueue(int8 id, int8 event) #define QFULL -1 struct atc_eventq **eqdp; + + +struct atc_eventq *tmp1 = eventqueue; +DBGFA("EVT1-cnt(%d)", eqp_cnt); +while(tmp1) { + LOGFA(", (%d-%d)", tmp1->id, tmp1->event); + tmp1 = tmp1->next; +} +NL1; + + + + + + eqdp = &eventqueue; if(eqp_cnt >= EVENT_QUEUE_SIZE-1) { while((*eqdp)->next) eqdp = &(*eqdp)->next; @@ -110,6 +125,7 @@ static int8 event_enqueue(int8 id, int8 event) (*eqdp)->event = QFULL; eqp_cnt++; } + DBG("EVT FULL"); return RET_NOK; } @@ -124,6 +140,17 @@ static int8 event_enqueue(int8 id, int8 event) (*eqdp)->id = id; (*eqdp)->event = event; eqp_cnt++; + + +struct atc_eventq *tmp2 = eventqueue; +DBGFA("EVT2-cnt(%d)", eqp_cnt); +while(tmp2) { + LOGFA(", (%d-%d)", tmp2->id, tmp2->event); + tmp2 = tmp2->next; +} +NL1; + + return RET_OK; } @@ -133,6 +160,17 @@ static int8 event_dequeue(int8 *id, int8 *event) if(id == NULL || event == NULL) return RET_NOK; + +struct atc_eventq *tmp3 = eventqueue; +DBGFA("EVT3-cnt(%d)", eqp_cnt); +while(tmp3) { + LOGFA(", (%d-%d)", tmp3->id, tmp3->event); + tmp3 = tmp3->next; +} +NL1; + + + if(*id < 0) { if(eqp_cnt == 0) return RET_NOK; eqp = eventqueue; @@ -141,6 +179,15 @@ static int8 event_dequeue(int8 *id, int8 *event) *id = eqp->id; *event = eqp->event; free(eqp); + +struct atc_eventq *tmp44 = eventqueue; +DBGFA("EVT4-cnt(%d)", eqp_cnt); +while(tmp44) { + LOGFA(", (%d-%d)", tmp44->id, tmp44->event); + tmp44 = tmp44->next; +} +NL1; + return RET_OK; } else { eqdp = &eventqueue; @@ -151,6 +198,16 @@ static int8 event_dequeue(int8 *id, int8 *event) *eqdp = (*eqdp)->next; free(eqp); eqp_cnt--; + + +struct atc_eventq *tmp5 = eventqueue; +DBGFA("EVT5-cnt(%d)", eqp_cnt); +while(tmp5) { + LOGFA(", (%d-%d)", tmp5->id, tmp5->event); + tmp5 = tmp5->next; +} +NL1; + return RET_OK; } } @@ -229,7 +286,7 @@ void atc_async_cb(uint8 sock, uint8 item, int32 ret) BITSET(sockstat[sock], SOCK_STAT_CONNECTED); sockwatch_set(sock, WATCH_SOCK_CLS_EVT); sockwatch_set(sock, WATCH_SOCK_RECV); - cmd_resp(RET_ASYNC, sock); + cmd_resp(RET_OK, sock);//cmd_resp(RET_ASYNC, sock);?? } else { DBGA("WATCH_SOCK_CONN_EVT fail - ret(%d)", ret); sock_put(sock); @@ -272,22 +329,28 @@ void atc_async_cb(uint8 sock, uint8 item, int32 ret) { int8 i; + DBGA("WATCH1-sock(%d),recvnum(%d),recvord(%d,%d,%d,%d,%d,%d,%d,%d)", sock, recvnum, recvord[0], + recvord[1], recvord[2], recvord[3], recvord[4], recvord[5], recvord[6], recvord[7]); + if(atci.poll != POLL_MODE_NONE) { - recvnum++; if(recvord[sock] == 0) { + recvnum++; + recvord[sock] = 1; for(i=ATC_SOCK_NUM_START; i<=ATC_SOCK_NUM_END; i++) - if(recvord[i] != 0) recvord[i]++; + if(i != sock && recvord[i] != 0) recvord[i]++; } else { - for(i=ATC_SOCK_NUM_START; i<=ATC_SOCK_NUM_END; i++) - if(recvord[i] != 0 && recvord[i] < recvord[sock]) recvord[i]++; + ERR("wrong recv order"); } - recvord[sock] = 1; + if(atci.poll != POLL_MODE_FULL) EVENT_RESP_SIZE(sock, SOCKEVENT_RECV, GetSocketRxRecvBufferSize(sock)); else event_enqueue(sock, SOCKEVENT_RECV); } else { act_nrecv(sock, WORK_BUF_SIZE); } + + DBGA("WATCH2-sock(%d),recvnum(%d),recvord(%d,%d,%d,%d,%d,%d,%d,%d)", sock, recvnum, recvord[0], + recvord[1], recvord[2], recvord[3], recvord[4], recvord[5], recvord[6], recvord[7]); } break; default: CRITICAL_ERRA("wrong item(0x%x)", item); @@ -416,7 +479,7 @@ void act_nopen_q(void) cmd_resp(RET_NOT_ALLOWED, VAL_NONE); } -void act_nopen_a(int8 type, int8 save, uint16 sport, uint8 *dip, uint16 dport) +void act_nopen_a(int8 type, uint16 sport, uint8 *dip, uint16 dport) { int8 ret, sock, i; @@ -424,44 +487,40 @@ void act_nopen_a(int8 type, int8 save, uint16 sport, uint8 *dip, uint16 dport) if(sockstat[i] != SOCK_STAT_IDLE && sockport[i] == sport) { DBGA("src port(%d) is using now by sock(%d)", sport, i); MAKE_TCMD_DIGIT(atci.tcmd.arg1, 2); - CMD_RESP_RET(RET_WRONG_ARG, VAL_NONE); + CMD_RESP_RET(RET_USING_PORT, VAL_NONE); } } - if(save == 'S' || save == 'A') { - - } - - if(save == 'O' || save == 'A') { - if(type == 'S') { - sock = sock_get(SOCK_STAT_TCP_SRV, sport); - if(sock == RET_NOK) CMD_RESP_RET(RET_NO_SOCK, VAL_NONE); - ret = TCPServerOpen(sock, sport); - if(ret != RET_OK) CMD_RESP_RET(RET_UNSPECIFIED, VAL_NONE); - sockwatch_set(sock, WATCH_SOCK_CONN_EVT); - CMD_RESP_RET(RET_OK, sock); - } else if(type == 'C') { - sock = sock_get(SOCK_STAT_TCP_CLT, sport); - if(sock == RET_NOK) CMD_RESP_RET(RET_NO_SOCK, VAL_NONE); - ret = TCPCltOpenNB(sock, sport, dip, dport); - if(ret != RET_OK) { - DBGA("TCPCltOpenNB fail - ret(%d)", ret); - CMD_RESP_RET(RET_WRONG_ADDR, VAL_NONE); - } - sockwatch_set(sock, WATCH_SOCK_CONN_TRY); - sockbusy[sock] = VAL_TRUE; - CMD_RESP_RET(RET_ASYNC, sock); - } else { - if(dip != NULL) { - memcpy(udpip[sock], dip, 4); - udpport[sock] = dport; - } - sock = sock_get(SOCK_STAT_UDP, sport); - if(sock == RET_NOK) CMD_RESP_RET(RET_NO_SOCK, VAL_NONE); - UDPOpen(sock, sport); - sockwatch_set(sock, WATCH_SOCK_RECV); - CMD_RESP_RET(RET_OK, sock); + if(type == 'S') { + sock = sock_get(SOCK_STAT_TCP_SRV, sport); + if(sock == RET_NOK) CMD_RESP_RET(RET_NO_SOCK, VAL_NONE); + ret = TCPServerOpen(sock, sport); + if(ret != RET_OK) CMD_RESP_RET(RET_UNSPECIFIED, VAL_NONE); + sockwatch_set(sock, WATCH_SOCK_CONN_EVT); + MAKE_TCMD_DIGIT(atci.tcmd.arg1, sock); + CMD_RESP_RET(RET_OK, VAL_NONE); + } else if(type == 'C') { + sock = sock_get(SOCK_STAT_TCP_CLT, sport); + if(sock == RET_NOK) CMD_RESP_RET(RET_NO_SOCK, VAL_NONE); + ret = TCPCltOpenNB(sock, sport, dip, dport); + if(ret != RET_OK) { + DBGA("TCPCltOpenNB fail - ret(%d)", ret); + CMD_RESP_RET(RET_WRONG_ADDR, VAL_NONE); + } + sockwatch_set(sock, WATCH_SOCK_CONN_TRY); + sockbusy[sock] = VAL_TRUE; + CMD_RESP_RET(RET_ASYNC, sock); + } else { + sock = sock_get(SOCK_STAT_UDP, sport); + if(sock == RET_NOK) CMD_RESP_RET(RET_NO_SOCK, VAL_NONE); + if(dip != NULL) { + memcpy(udpip[sock], dip, 4); + udpport[sock] = dport; } + UDPOpen(sock, sport); + sockwatch_set(sock, WATCH_SOCK_RECV); + MAKE_TCMD_DIGIT(atci.tcmd.arg1, sock); + CMD_RESP_RET(RET_OK, VAL_NONE); } } @@ -504,20 +563,22 @@ int8 act_nsend_chk(uint8 sock, uint16 *len, uint8 *dip, uint16 *dport) } } else { // UDP if(dip == NULL) { - if(udpip[sock][0]==0 && udpip[sock][1]==0 && udpip[sock][2]==0 && udpip[sock][3]==0) { - DBG("no prev udpip"); - cmd_resp(RET_WRONG_ADDR, VAL_NONE); + if(udpip[sock][0]==0 && udpip[sock][1]==0 && + udpip[sock][2]==0 && udpip[sock][3]==0) { + DBG("No Predefined Dst IP"); + MAKE_TCMD_DIGIT(atci.tcmd.arg1, 3); + cmd_resp(RET_WRONG_ARG, VAL_NONE); return RET_NOK; - } - else memcpy(dip, udpip[sock], 4); - } else memcpy(udpip[sock], dip, 4); + } else memcpy(atci.sendip, udpip[sock], 4); + } //else memcpy(udpip[sock], dip, 4); if(dport == NULL) { if(udpport[sock] == 0) { - DBG("no prev udpport"); - cmd_resp(RET_WRONG_ADDR, VAL_NONE); + DBG("No Predefined Dst Port"); + MAKE_TCMD_DIGIT(atci.tcmd.arg1, 4); + cmd_resp(RET_WRONG_ARG, VAL_NONE); return RET_NOK; - } else *dport = udpport[sock]; - } else udpport[sock] = *dport; + } else atci.sendport = udpport[sock]; + } //else udpport[sock] = *dport; } availlen = GetSocketTxFreeBufferSize(sock); @@ -560,34 +621,134 @@ void act_nsend(uint8 sock, int8 *buf, uint16 len, uint8 *dip, uint16 *dport) void act_nrecv(int8 sock, uint16 maxlen) { + int8 ret; uint8 dstip[4], i; uint16 dstport; - int32 len; + int32 len=0, offset=0; + + DBGA("DBG1-sock(%d),recvnum(%d),recvord(%d,%d,%d,%d,%d,%d,%d,%d)", sock, recvnum, recvord[0], + recvord[1], recvord[2], recvord[3], recvord[4], recvord[5], recvord[6], recvord[7]); - //DBGA("Asock(%d)", sock); if(sock == VAL_NONE) { - if(recvnum == 0) CMD_RESP_RET(RET_NO_DATA, VAL_NONE); + if(recvnum == 0) { + DBGA("no data - sock(%d)", sock); + ret = RET_NO_DATA; + goto FAIL_RET; + } for(i=ATC_SOCK_NUM_START; i<=ATC_SOCK_NUM_END; i++) { if(recvord[i] == recvnum) { sock = i; break; } } - }//DBGA("Bsock(%d)", sock); + DBGCRTCA(sock < 0, "wrong recv order - sock(%d),recvnum(%d)," + "recvord(%d,%d,%d,%d,%d,%d,%d,%d)", sock, recvnum, recvord[0], recvord[1], + recvord[2], recvord[3], recvord[4], recvord[5], recvord[6], recvord[7]); + } + + DBGA("DBG2-sock(%d),recvnum(%d),recvord(%d,%d,%d,%d,%d,%d,%d,%d)", sock, recvnum, recvord[0], + recvord[1], recvord[2], recvord[3], recvord[4], recvord[5], recvord[6], recvord[7]); - if(sockstat[sock] == SOCK_STAT_IDLE) CMD_RESP_RET(RET_SOCK_CLS, VAL_NONE); + if(sockstat[sock] == SOCK_STAT_IDLE) { + ret = RET_SOCK_CLS; + goto FAIL_RET; + } if(sockstat[sock] & SOCK_STAT_TCP_MASK) { // TCP - if(!(sockstat[sock] & SOCK_STAT_CONNECTED)) CMD_RESP_RET(RET_NOT_CONN, VAL_NONE); - if(GetSocketRxRecvBufferSize(sock) == 0) CMD_RESP_RET(RET_NO_DATA, VAL_NONE); + if(!(sockstat[sock] & SOCK_STAT_CONNECTED)) { + DBGA("not connected - sock(%d)", sock); + ret = RET_NOT_CONN; + goto FAIL_RET; + } + if(GetSocketRxRecvBufferSize(sock) == 0) { + DBGA("no data - sock(%d)", sock); + ret = RET_NO_DATA; + goto FAIL_RET; + } len = TCPRecv(sock, atci.recvbuf, maxlen); } else { // UDP - if(GetSocketRxRecvBufferSize(sock) == 0) CMD_RESP_RET(RET_NO_DATA, VAL_NONE); - len = UDPRecv(sock, atci.recvbuf, maxlen, dstip, &dstport); - if(len == 0) CMD_RESP_RET(RET_NO_DATA, VAL_NONE); - else if(len == SOCKERR_CLOSED) CMD_RESP_RET(RET_SOCK_CLS, VAL_NONE); - else if(len < 0) CMD_RESP_RET(RET_UNSPECIFIED, VAL_NONE); + uint16 bufleft = maxlen; + if(GetSocketRxRecvBufferSize(sock) == 0) { + DBGA("no data - sock(%d)", sock); + ret = RET_NO_DATA; + goto FAIL_RET; + } + do { + DBGCRTC(len + bufleft >= WORK_BUF_SIZE, "buf not enough"); + offset = UDPRecv(sock, &atci.recvbuf[len], bufleft, dstip, &dstport); + if(offset <= 0 || offset > (int32)bufleft) { // Abnormal case - I don't think this could happen but just in case. + if(offset > (int32)bufleft) { + ERRA("buf overflw - off(%d), maxlen(%d)", offset, bufleft); + if(len == 0) { + ret = RET_UNSPECIFIED; + goto FAIL_RET; + } + bufleft = 0; + } else { + ERRA("wrong reaction - ret(%d)", offset); + if(len == 0) { + if(offset == SOCKERR_CLOSED) { + ret = RET_SOCK_CLS; + goto FAIL_RET; + } else if(offset < 0) { + ret = RET_UNSPECIFIED; + goto FAIL_RET; + } else { + ret = RET_NO_DATA; + goto FAIL_RET; + } + } + } + } else { // Normal case + DBGA("UDP Recv - off(%d), len(%d), maxlen(%d)", offset, len, bufleft); + len += offset; + bufleft -= offset; + } + } while(GetSocketRxRecvBufferSize(sock) && bufleft > 0); + } atci.recvbuf[len] = 0; + DBGA("RECV prt-len(%d), max(%d)", len, maxlen); + + if(GetSocketRxRecvBufferSize(sock) == 0) { // If there is no data left. + if(recvord[sock] < recvnum) { + for(i=ATC_SOCK_NUM_START; i<=ATC_SOCK_NUM_END; i++) + if(recvord[i] > recvord[sock]) recvord[i]--; + } + recvord[sock] = 0; + recvnum--; + + if(sockstat[sock] & SOCK_STAT_CONNECTED) sockwatch_set(sock, WATCH_SOCK_RECV); + } else { + EVENT_RESP_SIZE(sock, SOCKEVENT_RECV, GetSocketRxRecvBufferSize(sock)); + // ???? + //if(atci.poll != POLL_MODE_FULL) + // EVENT_RESP_SIZE(sock, SOCKEVENT_RECV, GetSocketRxRecvBufferSize(sock)); + //else event_enqueue(sock, SOCKEVENT_RECV); + } + + + +/* +if(atci.poll != POLL_MODE_NONE) { + if(recvord[sock] == 0) { + recvnum++; + recvord[sock] = 1; + for(i=ATC_SOCK_NUM_START; i<=ATC_SOCK_NUM_END; i++) + if(recvord[i] != 0) recvord[i]++; + } else { + ERR("wrong recv order"); + } + + if(atci.poll != POLL_MODE_FULL) + EVENT_RESP_SIZE(sock, SOCKEVENT_RECV, GetSocketRxRecvBufferSize(sock)); + else event_enqueue(sock, SOCKEVENT_RECV); +} else { + act_nrecv(sock, WORK_BUF_SIZE); +} +*/ + + + MAKE_TCMD_DIGIT(atci.tcmd.arg1, len); if((sockstat[sock] & SOCK_STAT_PROTMASK) == SOCK_STAT_UDP) { @@ -598,6 +759,10 @@ void act_nrecv(int8 sock, uint16 maxlen) printf("%s\r\n", atci.recvbuf); sockwatch_set(sock, WATCH_SOCK_RECV); + +FAIL_RET: + + CMD_RESP_RET(ret, VAL_NONE); } void act_nsock(int8 sock) @@ -612,8 +777,13 @@ void act_nsock(int8 sock) //DBG("NSOCK-start"); for(i=ATC_SOCK_NUM_START; i<=ATC_SOCK_NUM_END; i++) { if(sockstat[i] != SOCK_STAT_IDLE) { - if(sockstat[i] & SOCK_STAT_CONNECTED) cnt_con++; - else cnt_notcon++; + if((sockstat[i] & SOCK_STAT_PROTMASK) == SOCK_STAT_UDP) { + if(udpport[i] != 0) cnt_con++; + else cnt_notcon++; + } else { + if(sockstat[i] & SOCK_STAT_CONNECTED) cnt_con++; + else cnt_notcon++; + } } } //DBGA("NSOCK-con(%d),not(%d)", cnt_con, cnt_notcon); @@ -630,38 +800,56 @@ void act_nsock(int8 sock) dump[cnt_con++] = '\r'; dump[cnt_con++] = '\n'; } - if((sockstat[i]&SOCK_STAT_PROTMASK)==SOCK_STAT_TCP_SRV) type = 'S'; - else if((sockstat[i]&SOCK_STAT_PROTMASK)==SOCK_STAT_TCP_CLT) type='C'; - else type = 'U'; - - if(sockstat[i] & SOCK_STAT_CONNECTED) { - GetDstInfo((uint8)i, tip, &tport); - sprintf((char*)&dump[cnt_con], "%d,%c,%d,%d.%d.%d.%d,%d", i, type, - sockport[i], tip[0], tip[1], tip[2], tip[3], tport); + + if((sockstat[i]&SOCK_STAT_PROTMASK)==SOCK_STAT_UDP) { + if(udpport[i]) { + sprintf((char*)&dump[cnt_con], "%d,%c,%d,%d.%d.%d.%d,%d", i, 'U', sockport[i], + udpip[i][0], udpip[i][1], udpip[i][2], udpip[i][3], udpport[i]); + } else { + sprintf((char*)&dump[cnt_con], "%d,%c,%d", i, 'U', sockport[i]); + } } else { - sprintf((char*)&dump[cnt_con], "%d,%c,%d", i, type, sockport[i]); + if((sockstat[i]&SOCK_STAT_PROTMASK)==SOCK_STAT_TCP_SRV) type = 'S'; + else type='C'; + if(sockstat[i] & SOCK_STAT_CONNECTED) { + GetDstInfo((uint8)i, tip, &tport); + sprintf((char*)&dump[cnt_con], "%d,%c,%d,%d.%d.%d.%d,%d", i, type, + sockport[i], tip[0], tip[1], tip[2], tip[3], tport); + } else { + sprintf((char*)&dump[cnt_con], "%d,%c,%d", i, type, sockport[i]); + } } - cnt_con += strlen((char*)&dump[cnt_con]); } cmd_resp_dump(VAL_NONE, dump); } else if(sock <= ATC_SOCK_NUM_END) { - if(sockstat[sock] == SOCK_STAT_IDLE) + if(sockstat[sock] == SOCK_STAT_IDLE) { sprintf((char*)atci.tcmd.arg1, "%c", 'I'); - else if((sockstat[sock] & SOCK_STAT_PROTMASK) == SOCK_STAT_TCP_SRV) - sprintf((char*)atci.tcmd.arg1, "%c", 'S'); - else if((sockstat[sock] & SOCK_STAT_PROTMASK) == SOCK_STAT_TCP_CLT) - sprintf((char*)atci.tcmd.arg1, "%c", 'C'); - else if((sockstat[sock] & SOCK_STAT_PROTMASK) == SOCK_STAT_UDP) - sprintf((char*)atci.tcmd.arg1, "%c", 'U'); - else CRITICAL_ERRA("wrong sock state(0x%d)", sockstat[sock]); - sprintf((char*)atci.tcmd.arg2, "%d", sockport[sock]); - if(sockstat[sock] & SOCK_STAT_CONNECTED) { - GetDstInfo((uint8)sock, tip, &tport); - sprintf((char*)atci.tcmd.arg3, "%d.%d.%d.%d", tip[0], tip[1], tip[2], tip[3]); - sprintf((char*)atci.tcmd.arg4, "%d", tport); + } else { + if((sockstat[sock] & SOCK_STAT_PROTMASK) == SOCK_STAT_UDP) { + sprintf((char*)atci.tcmd.arg1, "%c", 'U'); + sprintf((char*)atci.tcmd.arg2, "%d", sockport[sock]); + if(udpport[sock]) { + sprintf((char*)atci.tcmd.arg3, "%d.%d.%d.%d", + udpip[sock][0], udpip[sock][1], udpip[sock][2], udpip[sock][3]); + sprintf((char*)atci.tcmd.arg4, "%d", udpport[sock]); + } + } else { + if((sockstat[sock] & SOCK_STAT_PROTMASK) == SOCK_STAT_TCP_SRV) + sprintf((char*)atci.tcmd.arg1, "%c", 'S'); + else if((sockstat[sock] & SOCK_STAT_PROTMASK) == SOCK_STAT_TCP_CLT) + sprintf((char*)atci.tcmd.arg1, "%c", 'C'); + else CRITICAL_ERRA("wrong sock state(0x%d)", sockstat[sock]); + sprintf((char*)atci.tcmd.arg2, "%d", sockport[sock]); + if(sockstat[sock] & SOCK_STAT_CONNECTED) { + GetDstInfo((uint8)sock, tip, &tport); + sprintf((char*)atci.tcmd.arg3, "%d.%d.%d.%d", + tip[0], tip[1], tip[2], tip[3]); + sprintf((char*)atci.tcmd.arg4, "%d", tport); + } + } } CMD_RESP_RET(RET_OK, VAL_NONE); } diff --git a/library/appmod/atcmd/cmdrun.h b/library/appmod/atcmd/cmdrun.h index 667ec7c..2931023 100644 --- a/library/appmod/atcmd/cmdrun.h +++ b/library/appmod/atcmd/cmdrun.h @@ -93,7 +93,6 @@ struct atc_info { atct tcmd; int8 sendsock; uint8 sendip[4]; - uint8 sendflag[2]; uint16 sendport; int8 sendbuf[WORK_BUF_SIZE+1]; int8 recvbuf[WORK_BUF_SIZE+1]; @@ -123,7 +122,7 @@ void act_nstat(int8 num); void act_nmac_q(void); void act_nmac_a(uint8 *mac); void act_nopen_q(void); -void act_nopen_a(int8 type, int8 save, uint16 sport, uint8 *dip, uint16 dport); +void act_nopen_a(int8 type, uint16 sport, uint8 *dip, uint16 dport); void act_ncls(uint8 sock); int8 act_nsend_chk(uint8 sock, uint16 *len, uint8 *dip, uint16 *dport); void act_nsend(uint8 sock, int8 *buf, uint16 len, uint8 *dip, uint16 *dport); diff --git a/library/common/common.h b/library/common/common.h index ff8928b..46c99b9 100644 --- a/library/common/common.h +++ b/library/common/common.h @@ -280,9 +280,13 @@ #if (WIZ_LOG_LEVEL > 2) && !defined(FILE_LOG_SILENCE) #define DBGCRTC(cond_v, fmt) do { if(cond_v) {ERR(fmt); while(1); } } while(0) #define DBGCRTCA(cond_v, fmt, ...) do { if(cond_v) {ERRA(fmt, __VA_ARGS__); while(1); } } while(0) +#define DBGDUMP(data_p, len_v) print_dump(data_p, len_v) +#define DBGFUNC(func_p) func_p #else #define DBGCRTC(cond_v, fmt) #define DBGCRTCA(cond_v, fmt, ...) +#define DBGDUMP(data_p, len_v) +#define DBGFUNC(func_p) #endif #if (WIZ_LOG_LEVEL > 0) && !defined(FILE_LOG_SILENCE) diff --git a/library/common/util.c b/library/common/util.c index 6aa8299..c807e8b 100644 --- a/library/common/util.c +++ b/library/common/util.c @@ -280,6 +280,36 @@ int8 *strsep(register int8 **stringp, register const int8 *delim) /* NOTREACHED */ } +/** + * Print Binary Dump Data. + * @param buf The data to print + * @param len The data length + */ +void print_dump(void *buf, uint16 len) +{ + uint8 *tp = (uint8*)buf; + uint16 i; + uint16 line = len / 0x10; + uint16 left = len % 0x10; + + LOG("==========================================================="); + LOG("-ADDR----0--1--2--3--4--5--6--7----8--9--A--B--C--D--E--F--"); + for(i=0; i= TOTAL_SOCK_NUM) { ERRA("wrong arg - sock(%d)", sock); return RET_NOK; @@ -281,7 +281,7 @@ int8 ip_check(int8 *str, uint8 *ip) { uint8_t cnt=0; int8 tmp[16], *split; - int32 digit; + int32 digit, sumchk = 0; digit = strlen((char*)str); if(digit > 15 || digit < 7) { @@ -294,11 +294,12 @@ int8 ip_check(int8 *str, uint8 *ip) digit = atoi((char*)split); if(digit > 255 || digit < 0) return RET_NOK; if(ip) ip[cnt] = digit; + sumchk += digit; cnt++; split = (int8*)strtok(NULL, "."); } - if(cnt != 4) { //printf("not 4 digit (%d)\r\n", cnt); + if(cnt != 4 || sumchk == 0) { //printf("not 4 digit (%d)\r\n", cnt); return RET_NOK; } diff --git a/library/device/w5200/socket.c b/library/device/w5200/socket.c index fa723c8..66bc2fc 100644 --- a/library/device/w5200/socket.c +++ b/library/device/w5200/socket.c @@ -48,14 +48,14 @@ void device_mem_init(uint8 *tx_size, uint8 *rx_size) int16 i, mul; int16 ssum, rsum; - DBG("device_mem_init()"); + DBG("device_mem_init()"); ssum = 0; rsum = 0; SBUFBASEADDRESS[0] = (uint16)(__DEF_IINCHIP_MAP_TXBUF__); // Set base address of Tx memory for channel #0 RBUFBASEADDRESS[0] = (uint16)(__DEF_IINCHIP_MAP_RXBUF__); // Set base address of Rx memory for channel #0 - for (i = 0 ; i < TOTAL_SOCK_NUM; i++) // Set the size, masking and base address of Tx & Rx memory by each channel + for (i=0; i> 8)); IINCHIP_WRITE((Sn_DPORT0(s) + 1),(uint8)(port & 0x00ff)); + send_data_processing(s, (uint8*)buf, len); // copy data + IINCHIP_WRITE(Sn_CR(s),Sn_CR_SEND); while(IINCHIP_READ(Sn_CR(s))); // wait to process the command... } @@ -734,10 +740,12 @@ int32 UDPRecv(uint8 s, int8 *buf, uint16 len, uint8 *addr, uint16 *port) recv_data_ignore(s, RSR_len); IINCHIP_WRITE(Sn_CR(s),Sn_CR_RECV); while(IINCHIP_READ(Sn_CR(s))); + return SOCKERR_NOT_SPECIFIED; } else { recv_data_processing(s, prebuf, 8); IINCHIP_WRITE(Sn_CR(s),Sn_CR_RECV); + if(addr) { // read peer's IP address, port number. addr[0] = prebuf[0]; addr[1] = prebuf[1]; @@ -759,6 +767,7 @@ int32 UDPRecv(uint8 s, int8 *buf, uint16 len, uint8 *addr, uint16 *port) recv_data_ignore(s, GetSocketRxRecvBufferSize(s)); IINCHIP_WRITE(Sn_CR(s),Sn_CR_RECV); while(IINCHIP_READ(Sn_CR(s))); + return SOCKERR_NOT_SPECIFIED; } RSR_len = tmp_len; @@ -775,6 +784,7 @@ int32 UDPRecv(uint8 s, int8 *buf, uint16 len, uint8 *addr, uint16 *port) case Sn_MR_UDP: recv_data_processing(s, (uint8*)buf, RSR_len); IINCHIP_WRITE(Sn_CR(s),Sn_CR_RECV); + if(tmp_len) { while(IINCHIP_READ(Sn_CR(s))); DBG("Ignore rest data"); diff --git a/library/device/w5200/w5200.c b/library/device/w5200/w5200.c index 76b47b9..9963fbb 100644 --- a/library/device/w5200/w5200.c +++ b/library/device/w5200/w5200.c @@ -501,7 +501,7 @@ void recv_data_processing(uint8 s, uint8 *data, uint16 len) ptr = IINCHIP_READ(Sn_RX_RD0(s)); ptr = ((ptr & 0x00ff) << 8) + IINCHIP_READ(Sn_RX_RD0(s) + 1); - DBGA(" ISR_RX: rd_ptr : %.4x", ptr); + DBGA("ISR_RX: rd_ptr : %.4x", ptr); src_mask = (uint32)ptr & getIINCHIP_RxMASK(s); src_ptr = (uint8 *)(getIINCHIP_RxBASE(s) + src_mask); diff --git a/library/device/w5500/socket.c b/library/device/w5500/socket.c index 6978556..892bb0a 100644 --- a/library/device/w5500/socket.c +++ b/library/device/w5500/socket.c @@ -42,7 +42,7 @@ void device_SW_reset(void) DBGA("MR value is %02x",IINCHIP_READ_COMMON(WIZC_MR)); } -void device_mem_init(uint8 * tx_size, uint8 * rx_size) +void device_mem_init(uint8 *tx_size, uint8 *rx_size) { int16 i, mul; int16 ssum, rsum; @@ -52,47 +52,47 @@ void device_mem_init(uint8 * tx_size, uint8 * rx_size) ssum = 0; rsum = 0; - for (i = 0 ; i < TOTAL_SOCK_NUM; i++) // Set the size, masking and base address of Tx & Rx memory by each channel + for (i=0; imac[0] != 0x00 || netinfo->mac[1] != 0x00 || netinfo->mac[2] != 0x00 || netinfo->mac[3] != 0x00 || netinfo->mac[4] != 0x00 || netinfo->mac[5] != 0x00) - setSHAR(netinfo->mac); // set local MAC address + setSHAR(netinfo->mac); // set local MAC address if(netinfo->ip[0] != 0x00 || netinfo->ip[1] != 0x00 || netinfo->ip[2] != 0x00 || - netinfo->ip[3] != 0x00) setSIPR(netinfo->ip); // set local IP address + netinfo->ip[3] != 0x00) setSIPR(netinfo->ip); // set local IP address if(netinfo->sn[0] != 0x00 || netinfo->sn[1] != 0x00 || netinfo->sn[2] != 0x00 || - netinfo->sn[3] != 0x00) setSUBR(netinfo->sn); // set Subnet mask + netinfo->sn[3] != 0x00) setSUBR(netinfo->sn); // set Subnet mask if(netinfo->gw[0] != 0x00 || netinfo->gw[1] != 0x00 || netinfo->gw[2] != 0x00 || - netinfo->gw[3] != 0x00) setGAR(netinfo->gw); // set Gateway address + netinfo->gw[3] != 0x00) setGAR(netinfo->gw); // set Gateway address if(netinfo->dns[0] != 0x00 || netinfo->dns[1] != 0x00 || netinfo->dns[2] != 0x00 || - netinfo->dns[3] != 0x00){ + netinfo->dns[3] != 0x00){ DNS[0] = netinfo->dns[0]; DNS[1] = netinfo->dns[1]; DNS[2] = netinfo->dns[2]; @@ -127,6 +127,7 @@ void ClsNetInfo(netinfo_member member) { uint8 zero[6] = {0,}; + DBGA("Reset Address(%d)", member); switch(member) { //case NI_MAC_ADDR: // If need, uncomment // setSHAR(zero); @@ -183,7 +184,7 @@ void SetSocketOption(uint8 option_type, uint16 option_value) break; } } - + int8 GetTCPSocketStatus(uint8 s) { if(s > TOTAL_SOCK_NUM) { @@ -211,7 +212,7 @@ int8 GetTCPSocketStatus(uint8 s) else return SOCKERR_WRONG_STATUS; } } - + int8 GetUDPSocketStatus(uint8 s) { if(s > TOTAL_SOCK_NUM) { @@ -234,17 +235,17 @@ int8 GetUDPSocketStatus(uint8 s) else return SOCKERR_WRONG_STATUS; } } - + uint16 GetSocketTxFreeBufferSize(uint8 s) { return getSn_TX_FSR(s); // get socket TX free buf size } - + uint16 GetSocketRxRecvBufferSize(uint8 s) { return getSn_RX_RSR(s); // get socket RX recv buf size } - + int8 TCPServerOpen(uint8 s, uint16 port) { if(s > TOTAL_SOCK_NUM) { @@ -259,7 +260,6 @@ int8 TCPServerOpen(uint8 s, uint16 port) } TCPClose(s); - //IINCHIP_WRITE(Sn_MR(s),Sn_MR_TCP); //IINCHIP_WRITE(Sn_PORT0(s),(uint8)((port & 0xff00) >> 8)); //IINCHIP_WRITE((Sn_PORT0(s) + 1),(uint8)(port & 0x00ff)); @@ -273,14 +273,13 @@ int8 TCPServerOpen(uint8 s, uint16 port) IINCHIP_WRITE_SOCKETREG(s, WIZS_CR, Sn_CR_OPEN); // run sockinit Sn_CR while(IINCHIP_READ_SOCKETREG(s, WIZS_CR)); // wait to process the command... DBGA("Sn_SR = %.2x , Protocol = %.2x", IINCHIP_READ_SOCKETREG(s, WIZS_SR), IINCHIP_READ_SOCKETREG(s, WIZS_MR)); - //if (IINCHIP_READ(Sn_SR(s)) != SOCK_INIT) { //DBGA("wrong status(%d)", IINCHIP_READ(Sn_SR(s))); if(IINCHIP_READ_SOCKETREG(s, WIZS_SR) != SOCK_INIT) { DBGA("wrong status(%d)", IINCHIP_READ_SOCKETREG(s, WIZS_SR)); return SOCKERR_WRONG_STATUS; - } else { + } else { //IINCHIP_WRITE(Sn_CR(s),Sn_CR_LISTEN); //while(IINCHIP_READ(Sn_CR(s))); // wait to process the command... IINCHIP_WRITE_SOCKETREG(s, WIZS_CR, Sn_CR_LISTEN); @@ -324,7 +323,6 @@ int8 TCPCltOpenNB(uint8 s, uint16 sport, uint8 *dip, uint16 dport) } TCPClose(s); - //IINCHIP_WRITE(Sn_MR(s),Sn_MR_TCP); //IINCHIP_WRITE(Sn_PORT0(s),(uint8)((sport & 0xff00) >> 8)); //IINCHIP_WRITE((Sn_PORT0(s) + 1),(uint8)(sport & 0x00ff)); @@ -651,7 +649,7 @@ int32 TCPRecv(uint8 s, int8 *buf, uint16 len) return SOCKERR_WRONG_ARG; } - RSR_len = GetSocketRxRecvBufferSize(s); // Check Receive Buffer of W5500 + RSR_len = GetSocketRxRecvBufferSize(s); // Check Receive Buffer if(RSR_len == 0){ status = getSn_SR(s); if(status == SOCK_CLOSED) return SOCKERR_CLOSED; @@ -672,7 +670,7 @@ int32 TCPRecv(uint8 s, int8 *buf, uint16 len) return RSR_len; } - + int8 UDPOpen(uint8 s, uint16 port) { if(s > TOTAL_SOCK_NUM) { @@ -719,7 +717,7 @@ int8 UDPClose(uint8 s) IINCHIP_WRITE_SOCKETREG(s, WIZS_CR, Sn_CR_CLOSE); while(IINCHIP_READ_SOCKETREG(s, WIZS_CR)); // wait to process the command... IINCHIP_WRITE_SOCKETREG(s, WIZS_IR, 0xFF); // interrupt all clear - + return RET_OK; } @@ -852,13 +850,13 @@ int32 UDPRecv(uint8 s, int8 *buf, uint16 len, uint8 *addr, uint16 *port) IINCHIP_WRITE_SOCKETREG(s, WIZS_CR, Sn_CR_RECV); while(IINCHIP_READ_SOCKETREG(s, WIZS_CR)); - + return SOCKERR_NOT_SPECIFIED; } else { recv_data_processing(s, prebuf, 8); //IINCHIP_WRITE(Sn_CR(s), Sn_CR_RECV); // �����͸� ó���� �� �̰��� ����� ����� IINCHIP_WRITE_SOCKETREG(s, WIZS_CR, Sn_CR_RECV); // �����͸� ó���� �� �̰��� ����� ����� - + if(addr) { // read peer's IP address, port number. addr[0] = prebuf[0]; addr[1] = prebuf[1]; diff --git a/library/protocol/DHCP/dhcp.c b/library/protocol/DHCP/dhcp.c index 927e847..4ebb1d9 100644 --- a/library/protocol/DHCP/dhcp.c +++ b/library/protocol/DHCP/dhcp.c @@ -212,11 +212,6 @@ int8 dhcp_init(uint8 sock, void_func ip_update_hook, void_func ip_conflict_hook, di.sock = sock; if(ip_update_hook) di.ip_update = ip_update_hook; if(ip_conflict_hook) di.ip_conflict = ip_conflict_hook; - - ClsNetInfo(NI_IP_ADDR); - ClsNetInfo(NI_SN_MASK); - ClsNetInfo(NI_GW_ADDR); - ClsNetInfo(NI_DNS_ADDR); // ToDo: Remove setting zero IP & SN (set at start func) @@ -427,7 +422,7 @@ static void dhcp_alarm_cb(int8 arg) // for DHCP auto mode { if(dhcp_alarm == FALSE) return; if(arg == 0) { - if(di.state == DHCP_STATE_IP_CHECK) { + if(di.state == DHCP_STATE_BOUND) { alarm_set(wizpf_tick_conv(FALSE, di.renew_time), dhcp_alarm_cb, 1); alarm_set(wizpf_tick_conv(FALSE, di.rebind_time), dhcp_alarm_cb, 2); } @@ -486,6 +481,10 @@ static void dhcp_run(void) } else if(GetUDPSocketStatus(di.sock) == SOCKSTAT_CLOSED) { if(udp_open_fail == TRUE && !IS_TIME_PASSED(dhcp_run_tick, DHCP_RETRY_DELAY)) goto RET_ALARM; + ClsNetInfo(NI_IP_ADDR); + ClsNetInfo(NI_SN_MASK); + ClsNetInfo(NI_GW_ADDR); + ClsNetInfo(NI_DNS_ADDR); if(UDPOpen(di.sock, DHCP_CLIENT_PORT) == RET_OK) { if(dhcp_async) sockwatch_open(di.sock, dhcp_async_cb); udp_open_fail = FALSE; @@ -601,9 +600,8 @@ static void dhcp_run(void) SET_STATE(DHCP_STATE_BOUND); SetNetInfo(&workinfo); if(di.ip_update) di.ip_update(); - LOGA("DHCP ok - New IP (%d.%d.%d.%d)", workinfo.ip[0], workinfo.ip[1], workinfo.ip[2], workinfo.ip[3]); - UDPClose(di.sock); - if(dhcp_async) sockwatch_close(di.sock); + LOGA("DHCP ok - New IP (%d.%d.%d.%d)", + workinfo.ip[0], workinfo.ip[1], workinfo.ip[2], workinfo.ip[3]); //} else { // SET_STATE(DHCP_STATE_INIT); // ERR("IP Addr conflicted - IP(%d.%d.%d.%d)", workinfo.ip[0], workinfo.ip[1], workinfo.ip[2], workinfo.ip[3]); @@ -613,6 +611,8 @@ static void dhcp_run(void) break; case DHCP_STATE_BOUND: di.action = DHCP_ACT_NONE; + UDPClose(di.sock); + if(dhcp_async) sockwatch_close(di.sock); return; // alarm set is not needed case DHCP_STATE_FAILED: return; // alarm set is not needed @@ -656,6 +656,7 @@ static int8 recv_handler(void) return RET_NOK; } + //DBGFUNC(print_dump(&dm, sizeof(dm))); // For debugging received packet DBGA("DHCP_SIP:%d.%d.%d.%d",di.srv_ip[0],di.srv_ip[1],di.srv_ip[2],di.srv_ip[3]); DBGA("DHCP_RIP:%d.%d.%d.%d",di.srv_ip_real[0],di.srv_ip_real[1],di.srv_ip_real[2],di.srv_ip_real[3]); DBGA("recv_ip:%d.%d.%d.%d",recv_ip[0],recv_ip[1],recv_ip[2],recv_ip[3]);