From f2e43272a77dba4264828506c98a1d1424576a92 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Sat, 18 Dec 2021 06:36:33 +0000
Subject: [PATCH] esp32: update against Dec 21 idf

Freertos in idf has moved around a bit.
---
 CMakeLists.txt                  | 12 ++++++++++++
 lib/drivers/button/lws-button.c |  4 ++--
 lib/drivers/led/led-gpio.c      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62bb22271..c4cd2949c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,10 @@ if (ESP_PLATFORM)
        include_directories(
 		$ENV{IDF_PATH}/components/esp_hw_support/include/soc/
 		$ENV{IDF_PATH}/components/freertos/include/
+		$ENV{IDF_PATH}/components/freertos/esp_additions/include/
+		$ENV{IDF_PATH}/components/freertos/esp_additions/include/freertos/
+		$ENV{IDF_PATH}/components/freertos/FreeRTOS-Kernel/include/
+		$ENV{IDF_PATH}/components/freertos/FreeRTOS-Kernel/portable/linux/include/
 		$ENV{IDF_PATH}/components/xtensa/${CONFIG_IDF_TARGET}/include/
 		$ENV{IDF_PATH}/components/freertos/include/esp_additions
 		$ENV{IDF_PATH}/components/hal/include
@@ -795,6 +799,14 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
 		set(CMAKE_C_FLAGS "-Wall -Wsign-compare ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" )
 	endif()
 
+	if (PICO_SDK_PATH)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wconversion -Wsign-compare -Wstrict-aliasing -Wundef -nolibc")
+	endif()
+
+	if (ESP_PLATFORM AND (CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3))
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlongcalls")
+	endif()
+
 	if ("${DISABLE_WERROR}" STREQUAL "OFF")
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
 	endif()
diff --git a/lib/drivers/button/lws-button.c b/lib/drivers/button/lws-button.c
index e937db6f6..43456fb54 100644
--- a/lib/drivers/button/lws-button.c
+++ b/lib/drivers/button/lws-button.c
@@ -471,8 +471,8 @@ lws_button_controller_destroy(struct lws_button_state *bcs)
 	lws_button_enable(bcs, 0, 0);
 
 #if defined(LWS_PLAT_TIMER_DELETE)
-	LWS_PLAT_TIMER_DELETE(&bcs->timer);
-	LWS_PLAT_TIMER_DELETE(&bcs->timer_mon);
+	LWS_PLAT_TIMER_DELETE(bcs->timer);
+	LWS_PLAT_TIMER_DELETE(bcs->timer_mon);
 #endif
 
 	lws_free(bcs);
diff --git a/lib/drivers/led/led-gpio.c b/lib/drivers/led/led-gpio.c
index 664a120c7..382c3e630 100644
--- a/lib/drivers/led/led-gpio.c
+++ b/lib/drivers/led/led-gpio.c
@@ -81,7 +81,7 @@ void
 lws_led_gpio_destroy(struct lws_led_state *lcs)
 {
 #if defined(LWS_PLAT_TIMER_DELETE)
-	LWS_PLAT_TIMER_DELETE(&lcs->timer);
+	LWS_PLAT_TIMER_DELETE(lcs->timer);
 #endif
 	lws_free(lcs);
 }