From ee250c0d831de8d820dc7a07d36be12eab28b21d Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Tue, 11 Sep 2018 19:04:28 +0800
Subject: [PATCH] esp32: follow idf meddlings
---
lib/plat/esp32/esp32-fds.c | 8 --------
lib/plat/esp32/esp32-file.c | 8 --------
lib/plat/esp32/esp32-helpers.c | 8 --------
lib/plat/esp32/esp32-init.c | 9 ---------
lib/plat/esp32/esp32-misc.c | 8 --------
lib/plat/esp32/esp32-pipe.c | 9 ---------
lib/plat/esp32/esp32-service.c | 8 --------
lib/plat/esp32/esp32-sockets.c | 8 --------
lib/plat/esp32/private.h | 9 +++++++++
scripts/esp32.mk | 4 ++--
10 files changed, 11 insertions(+), 68 deletions(-)
diff --git a/lib/plat/esp32/esp32-fds.c b/lib/plat/esp32/esp32-fds.c
index e23192e3..7551f1f8 100644
--- a/lib/plat/esp32/esp32-fds.c
+++ b/lib/plat/esp32/esp32-fds.c
@@ -20,14 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-#include <esp_task_wdt.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
void
lws_plat_insert_socket_into_fds(struct lws_context *context, struct lws *wsi)
diff --git a/lib/plat/esp32/esp32-file.c b/lib/plat/esp32/esp32-file.c
index 41bca221..92d7dd58 100644
--- a/lib/plat/esp32/esp32-file.c
+++ b/lib/plat/esp32/esp32-file.c
@@ -20,14 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
int lws_plat_apply_FD_CLOEXEC(int n)
{
diff --git a/lib/plat/esp32/esp32-helpers.c b/lib/plat/esp32/esp32-helpers.c
index cf60784e..9bd4cd4e 100644
--- a/lib/plat/esp32/esp32-helpers.c
+++ b/lib/plat/esp32/esp32-helpers.c
@@ -20,14 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
#include "misc/romfs.h"
#include <esp_ota_ops.h>
diff --git a/lib/plat/esp32/esp32-init.c b/lib/plat/esp32/esp32-init.c
index 8cf4ee1b..eac556d0 100644
--- a/lib/plat/esp32/esp32-init.c
+++ b/lib/plat/esp32/esp32-init.c
@@ -20,15 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
-
int
lws_plat_context_early_init(void)
diff --git a/lib/plat/esp32/esp32-misc.c b/lib/plat/esp32/esp32-misc.c
index 1360d2f5..3dfb0288 100644
--- a/lib/plat/esp32/esp32-misc.c
+++ b/lib/plat/esp32/esp32-misc.c
@@ -20,14 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
unsigned long long time_in_microseconds(void)
{
diff --git a/lib/plat/esp32/esp32-pipe.c b/lib/plat/esp32/esp32-pipe.c
index 2f1cd6ba..c8e11c8c 100644
--- a/lib/plat/esp32/esp32-pipe.c
+++ b/lib/plat/esp32/esp32-pipe.c
@@ -20,15 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
-
int
lws_plat_pipe_create(struct lws *wsi)
diff --git a/lib/plat/esp32/esp32-service.c b/lib/plat/esp32/esp32-service.c
index fcf3488e..2f7f05e2 100644
--- a/lib/plat/esp32/esp32-service.c
+++ b/lib/plat/esp32/esp32-service.c
@@ -20,14 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
int
lws_plat_service(struct lws_context *context, int timeout_ms)
diff --git a/lib/plat/esp32/esp32-sockets.c b/lib/plat/esp32/esp32-sockets.c
index 7a592d79..060d7250 100644
--- a/lib/plat/esp32/esp32-sockets.c
+++ b/lib/plat/esp32/esp32-sockets.c
@@ -20,14 +20,6 @@
*/
#include "core/private.h"
-#include "freertos/timers.h"
-#include <esp_attr.h>
-#include <esp_system.h>
-
-#include "apps/sntp/sntp.h"
-
-#include <lwip/sockets.h>
-#include <esp_task_wdt.h>
int
lws_send_pipe_choked(struct lws *wsi)
diff --git a/lib/plat/esp32/private.h b/lib/plat/esp32/private.h
index 3d32d446..74de11c7 100644
--- a/lib/plat/esp32/private.h
+++ b/lib/plat/esp32/private.h
@@ -39,6 +39,15 @@
#include <signal.h>
#include <sys/socket.h>
+#include "freertos/timers.h"
+#include <esp_attr.h>
+#include <esp_system.h>
+#include <esp_task_wdt.h>
+
+#include "lwip/apps/sntp.h"
+
+#include <lwip/sockets.h>
+
#if defined(LWS_BUILTIN_GETIFADDRS)
#include "./misc/getifaddrs.h"
#endif
diff --git a/scripts/esp32.mk b/scripts/esp32.mk
index f2728a70..4a4de2b6 100644
--- a/scripts/esp32.mk
+++ b/scripts/esp32.mk
@@ -98,14 +98,14 @@ lws_flash_ota: $(LWS_BUILD_PATH)/pack.img
--chip esp32 \
--port $(ESPPORT) \
--baud $(CONFIG_ESPTOOLPY_BAUD) \
- write_flash 0x110000 $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin
+ write_flash 0x120000 $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin
lws_erase_ota:
$(IDF_PATH)/components/esptool_py/esptool/esptool.py \
--chip esp32 \
--port $(ESPPORT) \
--baud $(CONFIG_ESPTOOLPY_BAUD) \
- erase_region 0x110000 0x2f0000
+ erase_region 0x120000 0x2e0000
export A
--
GitLab