From 064f182a0d75623ac8d208c932fc74b5168a3893 Mon Sep 17 00:00:00 2001 From: ArdaFu Date: Fri, 27 Oct 2017 10:05:31 +0800 Subject: [PATCH] [bsp]Fix RT_LWIP_IPADDR RT_LWIP_GWADDR RT_LWIP_MSKADDR define, replace multi-bytes MACRO with single string MACRO. --- bsp/CME_M7/rtconfig.h | 21 ++++++--------------- bsp/at91sam9260/rtconfig.h | 15 +++------------ bsp/frdm-k64f/rtconfig.h | 21 ++++++--------------- bsp/lm3s8962/rtconfig.h | 21 ++++++--------------- bsp/lm3s9b9x/rtconfig.h | 21 ++++++--------------- bsp/lpc176x/rtconfig.h | 15 +++------------ bsp/mini2440/rtconfig.h | 15 +++------------ bsp/sam7x/rtconfig.h | 21 ++++++--------------- bsp/stm32f107/rtconfig.h | 21 ++++++--------------- bsp/tm4c129x/rtconfig.h | 15 +++------------ 10 files changed, 48 insertions(+), 138 deletions(-) diff --git a/bsp/CME_M7/rtconfig.h b/bsp/CME_M7/rtconfig.h index 97fa513660..d0e44c8d28 100644 --- a/bsp/CME_M7/rtconfig.h +++ b/bsp/CME_M7/rtconfig.h @@ -103,23 +103,14 @@ /* the number of simulatenously active TCP connections*/ #define RT_LWIP_TCP_PCB_NUM 3 -/* ip address of target*/ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +/* ip address of target */ +#define RT_LWIP_IPADDR "192.168.1.30" -/* gateway address of target*/ -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +/* gateway address of target */ +#define RT_LWIP_GWADDR "192.168.1.1" -/* mask address of target*/ -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +/* mask address of target */ +#define RT_LWIP_MSKADDR "255.255.255.0" /* tcp thread options */ #define RT_LWIP_TCPTHREAD_PRIORITY 12 diff --git a/bsp/at91sam9260/rtconfig.h b/bsp/at91sam9260/rtconfig.h index 07f39ca13a..53ca53359d 100755 --- a/bsp/at91sam9260/rtconfig.h +++ b/bsp/at91sam9260/rtconfig.h @@ -177,22 +177,13 @@ /* #define RT_LWIP_DHCP */ /* ip address of target */ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +#define RT_LWIP_IPADDR "192.168.1.30" /* gateway address of target */ -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +#define RT_LWIP_GWADDR "192.168.1.1" /* mask address of target */ -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +#define RT_LWIP_MSKADDR "255.255.255.0" /* the number of blocks for pbuf */ #define RT_LWIP_PBUF_NUM 16 diff --git a/bsp/frdm-k64f/rtconfig.h b/bsp/frdm-k64f/rtconfig.h index 1cb5eca259..d8e6f6dbc5 100644 --- a/bsp/frdm-k64f/rtconfig.h +++ b/bsp/frdm-k64f/rtconfig.h @@ -115,23 +115,14 @@ /* the number of simulatenously active TCP connections*/ #define RT_LWIP_TCP_PCB_NUM 5 -/* ip address of target*/ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 201 +/* ip address of target */ +#define RT_LWIP_IPADDR "192.168.1.201" -/* gateway address of target*/ -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +/* gateway address of target */ +#define RT_LWIP_GWADDR "192.168.1.1" -/* mask address of target*/ -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +/* mask address of target */ +#define RT_LWIP_MSKADDR "255.255.255.0" /* tcp thread options */ #define RT_LWIP_TCPTHREAD_PRIORITY 12 diff --git a/bsp/lm3s8962/rtconfig.h b/bsp/lm3s8962/rtconfig.h index 22a24106ab..b154688a6d 100644 --- a/bsp/lm3s8962/rtconfig.h +++ b/bsp/lm3s8962/rtconfig.h @@ -122,23 +122,14 @@ #define RT_LWIP_DNS -/* ip address of target*/ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +/* ip address of target */ +#define RT_LWIP_IPADDR "192.168.1.30" -/* gateway address of target*/ -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +/* gateway address of target */ +#define RT_LWIP_GWADDR "192.168.1.1" -/* mask address of target*/ -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +/* mask address of target */ +#define RT_LWIP_MSKADDR "255.255.255.0" /* tcp thread options */ #define RT_LWIP_TCPTHREAD_PRIORITY 22 diff --git a/bsp/lm3s9b9x/rtconfig.h b/bsp/lm3s9b9x/rtconfig.h index b6afc30723..b961c26d6f 100644 --- a/bsp/lm3s9b9x/rtconfig.h +++ b/bsp/lm3s9b9x/rtconfig.h @@ -119,23 +119,14 @@ #define RT_LWIP_DNS -/* ip address of target*/ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +/* ip address of target */ +#define RT_LWIP_IPADDR "192.168.1.30" -/* gateway address of target*/ -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +/* gateway address of target */ +#define RT_LWIP_GWADDR "192.168.1.1" -/* mask address of target*/ -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +/* mask address of target */ +#define RT_LWIP_MSKADDR "255.255.255.0" /* tcp thread options */ #define RT_LWIP_TCPTHREAD_PRIORITY 12 diff --git a/bsp/lpc176x/rtconfig.h b/bsp/lpc176x/rtconfig.h index eb7e3e6401..726b887047 100644 --- a/bsp/lpc176x/rtconfig.h +++ b/bsp/lpc176x/rtconfig.h @@ -191,20 +191,11 @@ // #define RT_LWIP_ETHTHREAD_STACKSIZE 512 // -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +#define RT_LWIP_IPADDR "192.168.1.30" // -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +#define RT_LWIP_GWADDR "192.168.1.1" // -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +#define RT_LWIP_MSKADDR "255.255.255.0" // // diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h index 32ee42c908..475ba91062 100644 --- a/bsp/mini2440/rtconfig.h +++ b/bsp/mini2440/rtconfig.h @@ -164,20 +164,11 @@ // #define RT_LWIP_ETHTHREAD_STACKSIZE 512 // -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +#define RT_LWIP_IPADDR "192.168.1.30" // -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +#define RT_LWIP_GWADDR "192.168.1.1" // -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +#define RT_LWIP_MSKADDR "255.255.255.0" // //
diff --git a/bsp/sam7x/rtconfig.h b/bsp/sam7x/rtconfig.h index a1c31bc3ce..bb3e3546d0 100644 --- a/bsp/sam7x/rtconfig.h +++ b/bsp/sam7x/rtconfig.h @@ -118,23 +118,14 @@ /* Using DHCP*/ /* #define RT_LWIP_DHCP */ -/* ip address of target*/ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +/* ip address of target */ +#define RT_LWIP_IPADDR "192.168.1.30" -/* gateway address of target*/ -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +/* gateway address of target */ +#define RT_LWIP_GWADDR "192.168.1.1" -/* mask address of target*/ -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +/* mask address of target */ +#define RT_LWIP_MSKADDR "255.255.255.0" /* SECTION: DFS options */ //#define RT_USING_DFS diff --git a/bsp/stm32f107/rtconfig.h b/bsp/stm32f107/rtconfig.h index c4cd0c8368..210b165a4d 100644 --- a/bsp/stm32f107/rtconfig.h +++ b/bsp/stm32f107/rtconfig.h @@ -115,23 +115,14 @@ /* the number of simulatenously active TCP connections*/ #define RT_LWIP_TCP_PCB_NUM 5 -/* ip address of target*/ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +/* ip address of target */ +#define RT_LWIP_IPADDR "192.168.1.30" -/* gateway address of target*/ -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +/* gateway address of target */ +#define RT_LWIP_GWADDR "192.168.1.1" -/* mask address of target*/ -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +/* mask address of target */ +#define RT_LWIP_MSKADDR "255.255.255.0" /* tcp thread options */ #define RT_LWIP_TCPTHREAD_PRIORITY 12 diff --git a/bsp/tm4c129x/rtconfig.h b/bsp/tm4c129x/rtconfig.h index 6da197d331..c0c7ffced1 100644 --- a/bsp/tm4c129x/rtconfig.h +++ b/bsp/tm4c129x/rtconfig.h @@ -206,20 +206,11 @@ // #define RT_LWIP_ETHTHREAD_STACKSIZE 512 // -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 30 +#define RT_LWIP_IPADDR "192.168.1.30" // -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 +#define RT_LWIP_GWADDR "192.168.1.1" // -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 +#define RT_LWIP_MSKADDR "255.255.255.0" //