libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #906 from ArdaFu/master 

[BSP] Repalce RT_LWIP_IPADDR RT_LWIP_GWADDR RT_LWIP_MSKADDR define
This commit is contained in:
Bernard Xiong 2017-10-27 10:17:28 +08:00 committed by GitHub
parent ebf0b32f52 064f182a0d
commit 192a6db763
12 changed files with 50 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bsp/CME_M7/rtconfig.h
View File

@ -103,23 +103,14 @@
/* the number of simulatenously active TCP connections*/ /* the number of simulatenously active TCP connections*/
#define RT_LWIP_TCP_PCB_NUM 3 #define RT_LWIP_TCP_PCB_NUM 3
/* ip address of target*/ /* ip address of target */
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
/* gateway address of target*/ /* gateway address of target */
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
/* mask address of target*/ /* mask address of target */
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
/* tcp thread options */ /* tcp thread options */
#define RT_LWIP_TCPTHREAD_PRIORITY 12 #define RT_LWIP_TCPTHREAD_PRIORITY 12

15
bsp/at91sam9260/rtconfig.h
View File

@ -177,22 +177,13 @@
/* #define RT_LWIP_DHCP */ /* #define RT_LWIP_DHCP */
/* ip address of target */ /* ip address of target */
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
/* gateway address of target */ /* gateway address of target */
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
/* mask address of target */ /* mask address of target */
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
/* the number of blocks for pbuf */ /* the number of blocks for pbuf */
#define RT_LWIP_PBUF_NUM 16 #define RT_LWIP_PBUF_NUM 16

21
bsp/frdm-k64f/rtconfig.h
View File

@ -115,23 +115,14 @@
/* the number of simulatenously active TCP connections*/ /* the number of simulatenously active TCP connections*/
#define RT_LWIP_TCP_PCB_NUM 5 #define RT_LWIP_TCP_PCB_NUM 5
/* ip address of target*/ /* ip address of target */
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.201"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 201
/* gateway address of target*/ /* gateway address of target */
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
/* mask address of target*/ /* mask address of target */
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
/* tcp thread options */ /* tcp thread options */
#define RT_LWIP_TCPTHREAD_PRIORITY 12 #define RT_LWIP_TCPTHREAD_PRIORITY 12

21
bsp/lm3s8962/rtconfig.h
View File

@ -122,23 +122,14 @@
#define RT_LWIP_DNS #define RT_LWIP_DNS
/* ip address of target*/ /* ip address of target */
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
/* gateway address of target*/ /* gateway address of target */
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
/* mask address of target*/ /* mask address of target */
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
/* tcp thread options */ /* tcp thread options */
#define RT_LWIP_TCPTHREAD_PRIORITY 22 #define RT_LWIP_TCPTHREAD_PRIORITY 22

21
bsp/lm3s9b9x/rtconfig.h
View File

@ -119,23 +119,14 @@
#define RT_LWIP_DNS #define RT_LWIP_DNS
/* ip address of target*/ /* ip address of target */
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
/* gateway address of target*/ /* gateway address of target */
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
/* mask address of target*/ /* mask address of target */
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
/* tcp thread options */ /* tcp thread options */
#define RT_LWIP_TCPTHREAD_PRIORITY 12 #define RT_LWIP_TCPTHREAD_PRIORITY 12

15
bsp/lpc176x/rtconfig.h
View File

@ -191,20 +191,11 @@
// <integer name="RT_LWIP_ETHTHREAD_STACKSIZE" description="the stack size of ethnetif thread" default="512" /> // <integer name="RT_LWIP_ETHTHREAD_STACKSIZE" description="the stack size of ethnetif thread" default="512" />
#define RT_LWIP_ETHTHREAD_STACKSIZE 512 #define RT_LWIP_ETHTHREAD_STACKSIZE 512
// <ipaddr name="RT_LWIP_IPADDR" description="IP address of device" default="192.168.1.30" /> // <ipaddr name="RT_LWIP_IPADDR" description="IP address of device" default="192.168.1.30" />
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
// <ipaddr name="RT_LWIP_GWADDR" description="Gateway address of device" default="192.168.1.1" /> // <ipaddr name="RT_LWIP_GWADDR" description="Gateway address of device" default="192.168.1.1" />
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
// <ipaddr name="RT_LWIP_MSKADDR" description="Mask address of device" default="255.255.255.0" /> // <ipaddr name="RT_LWIP_MSKADDR" description="Mask address of device" default="255.255.255.0" />
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
// </section> // </section>
// <bool name="RT_USING_CMSIS_OS" description="Using CMSIS OS API" default="true" /> // <bool name="RT_USING_CMSIS_OS" description="Using CMSIS OS API" default="true" />

15
bsp/mini2440/rtconfig.h
View File

@ -164,20 +164,11 @@
// <integer name="RT_LWIP_ETHTHREAD_STACKSIZE" description="the stack size of ethnetif thread" default="512" /> // <integer name="RT_LWIP_ETHTHREAD_STACKSIZE" description="the stack size of ethnetif thread" default="512" />
#define RT_LWIP_ETHTHREAD_STACKSIZE 512 #define RT_LWIP_ETHTHREAD_STACKSIZE 512
// <ipaddr name="RT_LWIP_IPADDR" description="IP address of device" default="192.168.1.30" /> // <ipaddr name="RT_LWIP_IPADDR" description="IP address of device" default="192.168.1.30" />
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
// <ipaddr name="RT_LWIP_GWADDR" description="Gateway address of device" default="192.168.1.1" /> // <ipaddr name="RT_LWIP_GWADDR" description="Gateway address of device" default="192.168.1.1" />
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
// <ipaddr name="RT_LWIP_MSKADDR" description="Mask address of device" default="255.255.255.0" /> // <ipaddr name="RT_LWIP_MSKADDR" description="Mask address of device" default="255.255.255.0" />
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
// </section> // </section>
// <section name="RT_USING_MODULE" description="Application module" default="true" > // <section name="RT_USING_MODULE" description="Application module" default="true" >

21
bsp/sam7x/rtconfig.h
View File

@ -118,23 +118,14 @@
/* Using DHCP*/ /* Using DHCP*/
/* #define RT_LWIP_DHCP */ /* #define RT_LWIP_DHCP */
/* ip address of target*/ /* ip address of target */
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
/* gateway address of target*/ /* gateway address of target */
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
/* mask address of target*/ /* mask address of target */
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
/* SECTION: DFS options */ /* SECTION: DFS options */
//#define RT_USING_DFS //#define RT_USING_DFS

21
bsp/stm32f107/rtconfig.h
View File

@ -115,23 +115,14 @@
/* the number of simulatenously active TCP connections*/ /* the number of simulatenously active TCP connections*/
#define RT_LWIP_TCP_PCB_NUM 5 #define RT_LWIP_TCP_PCB_NUM 5
/* ip address of target*/ /* ip address of target */
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
/* gateway address of target*/ /* gateway address of target */
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
/* mask address of target*/ /* mask address of target */
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
/* tcp thread options */ /* tcp thread options */
#define RT_LWIP_TCPTHREAD_PRIORITY 12 #define RT_LWIP_TCPTHREAD_PRIORITY 12

15
bsp/tm4c129x/rtconfig.h
View File

@ -206,20 +206,11 @@
// <integer name="RT_LWIP_ETHTHREAD_STACKSIZE" description="the stack size of ethnetif thread" default="512" /> // <integer name="RT_LWIP_ETHTHREAD_STACKSIZE" description="the stack size of ethnetif thread" default="512" />
#define RT_LWIP_ETHTHREAD_STACKSIZE 512 #define RT_LWIP_ETHTHREAD_STACKSIZE 512
// <ipaddr name="RT_LWIP_IPADDR" description="IP address of device" default="192.168.1.30" /> // <ipaddr name="RT_LWIP_IPADDR" description="IP address of device" default="192.168.1.30" />
#define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_IPADDR1 168
#define RT_LWIP_IPADDR2 1
#define RT_LWIP_IPADDR3 30
// <ipaddr name="RT_LWIP_GWADDR" description="Gateway address of device" default="192.168.1.1" /> // <ipaddr name="RT_LWIP_GWADDR" description="Gateway address of device" default="192.168.1.1" />
#define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_GWADDR1 168
#define RT_LWIP_GWADDR2 1
#define RT_LWIP_GWADDR3 1
// <ipaddr name="RT_LWIP_MSKADDR" description="Mask address of device" default="255.255.255.0" /> // <ipaddr name="RT_LWIP_MSKADDR" description="Mask address of device" default="255.255.255.0" />
#define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_MSKADDR1 255
#define RT_LWIP_MSKADDR2 255
#define RT_LWIP_MSKADDR3 0
// </section> // </section>

1
components/net/lwip-1.4.1/src/arch/sys_arch.c
View File

@ -26,6 +26,7 @@
#include "netif/ethernetif.h" #include "netif/ethernetif.h"
#include "lwip/sio.h" #include "lwip/sio.h"
#include <lwip/init.h> #include <lwip/init.h>
#include "lwip/inet.h"
#include <string.h> #include <string.h>

1
components/net/lwip-1.4.1/src/netif/ethernetif.c
View File

@ -63,6 +63,7 @@
#include "netif/etharp.h" #include "netif/etharp.h"
#include "netif/ethernetif.h" #include "netif/ethernetif.h"
#include "lwip/inet.h"
#define netifapi_netif_set_link_up(n) netifapi_netif_common(n, netif_set_link_up, NULL) #define netifapi_netif_set_link_up(n) netifapi_netif_common(n, netif_set_link_up, NULL)
#define netifapi_netif_set_link_down(n) netifapi_netif_common(n, netif_set_link_down, NULL) #define netifapi_netif_set_link_down(n) netifapi_netif_common(n, netif_set_link_down, NULL)