Merge branch 'feature/redefine_lwip_file_structure' into 'master'

feat(lwip): Redefine lwip folder structure

See merge request sdk/ESP8266_RTOS_SDK!76

components/lwip/apps/dhcpserver/dhcpserver.c

@@ -18,7 +18,7 @@
 #include "lwip/pbuf.h"
 #include "lwip/udp.h"
 #include "lwip/mem.h"
-#include "lwip/dhcpserver.h"
+#include "dhcpserver/dhcpserver.h"
 
 #ifndef LWIP_OPEN_SRC
 #include "net80211/ieee80211_var.h"

components/lwip/apps/multi-threads/sockets_mt.c

@@ -1,6 +1,10 @@
 
+#include "lwip/opt.h"
+
 #ifdef SOCKETS_MT
 
+#include "../../lwip/src/api/sockets.c"
+
 #ifndef LWIP_SYNC_MT_SLEEP_MS
 	#define LWIP_SYNC_MT_SLEEP_MS 10
 #endif

components/lwip/apps/sntp/sntp_time.c

@@ -5,7 +5,7 @@
  *      Author: LiuHan
  */
 #include "apps/sntp_opts.h"
-#include "apps/sntp_time.h"
+#include "lwip/apps/sntp/sntp_time.h"
 #include "esp_timer.h"
 
 static s8_t sntp_time_timezone = 8;

components/lwip/apps/sntp/time.c

@@ -22,8 +22,8 @@
 #include "esp_timer.h"
 
 #include "lwip/apps/sntp.h"
-#include "lwip/apps/time.h"
+#include "lwip/apps/sntp/time.h"
-#include "lwip/apps/sntp_time.h"
+#include "lwip/apps/sntp/sntp_time.h"
 
 static os_timer_t micros_overflow_timer;
 static uint32 micros_at_last_overflow_tick = 0;

components/lwip/component.mk

@@ -1,9 +1,10 @@
 #
 # Component Makefile
 #
-COMPONENT_ADD_INCLUDEDIRS += include/lwip/ipv4 include/lwip/ipv6 include/lwip/posix include/lwip
+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_SRCDIRS += source/api source/api/multi-threads source/apps source/arch \
+COMPONENT_SRCDIRS += lwip/src/api lwip/src/apps/sntp lwip/src/netif lwip/src/core lwip/src/core/ipv4 lwip/src/core/ipv6 \
-                     source/netif source/core source/core/ipv4 source/core/ipv6
+								port/freertos port/netif apps/dhcpserver apps/sntp apps/multi-threads
 
 CFLAGS += -D_POSIX_SOURCE -DLWIP_OPEN_SRC -DPBUF_RSV_FOR_WLAN -DEBUF_LWIP

components/lwip/lwip/src/api/sockets.c

@@ -2706,6 +2706,4 @@ lwip_fcntl(int s, int cmd, int val)
   return ret;
 }
 
-#include "multi-threads/sockets_mt.c"
-
 #endif /* LWIP_SOCKET */