From 6fbcd9f8239b280a9f3b746c7876122f583fa15c Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Sat, 19 May 2018 21:13:51 +0800 Subject: [PATCH] feat(lwip): Restructure lwip folder to support different platform --- components/lwip/CMakeLists.txt | 20 ++++++++----------- components/lwip/component.mk | 18 +++++++++++++---- .../port/{ => esp8266}/freertos/sys_arch.c | 0 .../port => port/esp8266/include}/arch/cc.h | 0 .../port => port/esp8266/include}/arch/perf.h | 0 .../esp8266/include}/arch/sys_arch.h | 0 .../port => port/esp8266/include}/lwipopts.h | 0 .../port/{ => esp8266}/netif/ethernetif.c | 0 8 files changed, 22 insertions(+), 16 deletions(-) rename components/lwip/port/{ => esp8266}/freertos/sys_arch.c (100%) rename components/lwip/{include/lwip/port => port/esp8266/include}/arch/cc.h (100%) rename components/lwip/{include/lwip/port => port/esp8266/include}/arch/perf.h (100%) rename components/lwip/{include/lwip/port => port/esp8266/include}/arch/sys_arch.h (100%) rename components/lwip/{include/lwip/port => port/esp8266/include}/lwipopts.h (100%) rename components/lwip/port/{ => esp8266}/netif/ethernetif.c (100%) diff --git a/components/lwip/CMakeLists.txt b/components/lwip/CMakeLists.txt index f72b6a8c..8cb4d748 100644 --- a/components/lwip/CMakeLists.txt +++ b/components/lwip/CMakeLists.txt @@ -1,24 +1,20 @@ set(COMPONENT_ADD_INCLUDEDIRS - include - lwip/src/include - lwip/src/include/lwip - lwip/src/include/posix - lwip/src/include/lwip include/lwip/apps - include/lwip/port - apps) + lwip/src/include + lwip/src/include/posix + port/esp8266/include) set(COMPONENT_SRCDIRS + apps/dhcpserver + apps/multi-threads lwip/src/api lwip/src/apps/sntp - lwip/src/netif lwip/src/core lwip/src/core/ipv4 lwip/src/core/ipv6 - port/freertos - port/netif - apps/dhcpserver - apps/multi-threads) + lwip/src/netif + port/esp8266/freertos + port/esp8266/netif) set(COMPONENT_REQUIRES tcpip_adapter esp8266 freertos) diff --git a/components/lwip/component.mk b/components/lwip/component.mk index d8b79f0e..39c0a5b6 100644 --- a/components/lwip/component.mk +++ b/components/lwip/component.mk @@ -1,10 +1,20 @@ # # Component Makefile # -COMPONENT_ADD_INCLUDEDIRS += lwip/src/include lwip/src/include/lwip lwip/src/include/posix lwip/include/lwip \ - include/lwip/apps include/lwip/port apps +COMPONENT_ADD_INCLUDEDIRS += include/lwip/apps \ + lwip/src/include \ + lwip/src/include/posix \ + port/esp8266/include -COMPONENT_SRCDIRS += lwip/src/api lwip/src/apps/sntp lwip/src/netif lwip/src/core lwip/src/core/ipv4 lwip/src/core/ipv6 \ - port/freertos port/netif apps/dhcpserver apps/multi-threads +COMPONENT_SRCDIRS += apps/dhcpserver \ + apps/multi-threads \ + lwip/src/api \ + lwip/src/apps/sntp \ + lwip/src/core \ + lwip/src/core/ipv4 \ + lwip/src/core/ipv6 \ + lwip/src/netif \ + port/esp8266/freertos \ + port/esp8266/netif CFLAGS += -Wno-address #lots of LWIP source files evaluate macros that check address of stack variables \ No newline at end of file diff --git a/components/lwip/port/freertos/sys_arch.c b/components/lwip/port/esp8266/freertos/sys_arch.c similarity index 100% rename from components/lwip/port/freertos/sys_arch.c rename to components/lwip/port/esp8266/freertos/sys_arch.c diff --git a/components/lwip/include/lwip/port/arch/cc.h b/components/lwip/port/esp8266/include/arch/cc.h similarity index 100% rename from components/lwip/include/lwip/port/arch/cc.h rename to components/lwip/port/esp8266/include/arch/cc.h diff --git a/components/lwip/include/lwip/port/arch/perf.h b/components/lwip/port/esp8266/include/arch/perf.h similarity index 100% rename from components/lwip/include/lwip/port/arch/perf.h rename to components/lwip/port/esp8266/include/arch/perf.h diff --git a/components/lwip/include/lwip/port/arch/sys_arch.h b/components/lwip/port/esp8266/include/arch/sys_arch.h similarity index 100% rename from components/lwip/include/lwip/port/arch/sys_arch.h rename to components/lwip/port/esp8266/include/arch/sys_arch.h diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/port/esp8266/include/lwipopts.h similarity index 100% rename from components/lwip/include/lwip/port/lwipopts.h rename to components/lwip/port/esp8266/include/lwipopts.h diff --git a/components/lwip/port/netif/ethernetif.c b/components/lwip/port/esp8266/netif/ethernetif.c similarity index 100% rename from components/lwip/port/netif/ethernetif.c rename to components/lwip/port/esp8266/netif/ethernetif.c