Merge branch 'master' into feature/esp32s2beta_update

components/esp32s2beta/CMakeLists.txt

@@ -1,69 +1,73 @@
-if(BOOTLOADER_BUILD AND CONFIG_IDF_TARGET_ESP32S2BETA)
+idf_build_get_property(target IDF_TARGET)
+if(NOT "${target}" STREQUAL "esp32s2beta")
+    return()
+endif()
+
+if(BOOTLOADER_BUILD)
     # For bootloader, all we need from esp32s2beta is headers
-    set(COMPONENT_ADD_INCLUDEDIRS include)
-    set(COMPONENT_REQUIRES ${IDF_COMPONENTS} soc) #unfortunately rom/uart uses SOC registers directly
-    set(COMPONENT_SRCS )
-    register_component()
-    idf_build_get_property(target IDF_TARGET)
-    set(scripts "ld/esp32s2beta.peripherals.ld")
-    target_linker_script(${COMPONENT_LIB} "${scripts}")
-elseif(CONFIG_IDF_TARGET_ESP32S2BETA)
+    idf_component_register(INCLUDE_DIRS include)
+    target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32s2beta.peripherals.ld")
+else()
     # Regular app build
 
-    set(COMPONENT_SRCS "brownout.c"
-                   "cache_err_int.c"
-                   "clk.c"
-                   "cpu_start.c"
-                   "crosscore_int.c"
-                   "dport_access.c"
-                   "dport_panic_highint_hdl.S"
-                   "esp_adapter.c"
-                   "esp_timer_esp32s2beta.c"
-                   "hw_random.c"
-                   "int_wdt.c"
-                   "intr_alloc.c"
-                   "panic.c"
-                   "pm_esp32s2beta.c"
-                   "pm_trace.c"
-                   "sleep_modes.c"
-                   "spiram.c"
-                   "spiram_psram.c"
-                   "system_api.c"
-                   "task_wdt.c")
-    set(COMPONENT_ADD_INCLUDEDIRS "include")
+    set(srcs "brownout.c"
+             "cache_err_int.c"
+             "clk.c"
+             "cpu_start.c"
+             "crosscore_int.c"
+             "dport_access.c"
+             "dport_panic_highint_hdl.S"
+             "esp_adapter.c"
+             "esp_timer_esp32s2beta.c"
+             "hw_random.c"
+             "int_wdt.c"
+             "intr_alloc.c"
+             "panic.c"
+             "pm_esp32s2beta.c"
+             "pm_trace.c"
+             "sleep_modes.c"
+             "spiram.c"
+             "spiram_psram.c"
+             "system_api.c"
+             "task_wdt.c")
+    set(include_dirs "include")
 
-    set(COMPONENT_REQUIRES driver esp_event efuse soc) #unfortunately rom/uart uses SOC registers directly
+    set(requires driver esp_event efuse soc) #unfortunately rom/uart uses SOC registers directly
 
     # driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t
     # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function.
-    set(COMPONENT_PRIV_REQUIRES
+    set(priv_requires
         app_trace app_update bootloader_support log mbedtls nvs_flash
         pthread smartconfig_ack spi_flash vfs wpa_supplicant espcoredump esp_common esp_wifi)
 
-    set(COMPONENT_ADD_LDFRAGMENTS linker.lf ld/esp32s2beta_fragments.lf)
+    set(fragments linker.lf ld/esp32s2beta_fragments.lf)
 
-    register_component()
+    idf_component_register(SRCS "${srcs}"
+                        INCLUDE_DIRS "${include_dirs}"
+                        LDFRAGMENTS "${fragments}"
+                        REQUIRES "${requires}"
+                        PRIV_REQUIRES "${priv_requires}"
+                        REQUIRED_IDF_TARGETS esp32s2beta)
 
-    target_linker_script(${COMPONENT_LIB} "${CMAKE_CURRENT_BINARY_DIR}/esp32s2beta_out.ld")
+    target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/esp32s2beta_out.ld")
 
     # Rely on user code to define app_main
-    target_link_libraries(${COMPONENT_LIB} "-u app_main")
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-u app_main")
 
     # Process the template file through the linker script generation mechanism, and use the output for linking the
     # final binary
-    target_linker_script(${COMPONENT_LIB} "${CMAKE_CURRENT_LIST_DIR}/ld/esp32s2beta.project.ld.in" PROCESS)
+    target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_LIST_DIR}/ld/esp32s2beta.project.ld.in" PROCESS "${CMAKE_CURRENT_BINARY_DIR}/ld/esp32.project.ld")
 
-    target_linker_script(${COMPONENT_LIB} "ld/esp32s2beta.peripherals.ld")
-    target_link_libraries(${COMPONENT_LIB} gcc)
-    target_link_libraries(${COMPONENT_LIB} "-u call_user_start_cpu0")
+    target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32s2beta.peripherals.ld")
+    target_link_libraries(${COMPONENT_LIB} PUBLIC gcc)
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-u call_user_start_cpu0")
 
     #ld_include_panic_highint_hdl is added as an undefined symbol because otherwise the
     #linker will ignore panic_highint_hdl.S as it has no other files depending on any
     #symbols in it.
-    target_link_libraries(${COMPONENT_LIB} "-u ld_include_panic_highint_hdl")
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-u ld_include_panic_highint_hdl")
 
-    idf_build_get_property(sdkconfig_header SDKCONFIG_HEADER)
-    get_filename_component(config_dir ${sdkconfig_header} DIRECTORY)
+    idf_build_get_property(config_dir CONFIG_DIR)    
     # Preprocess esp32s2beta.ld linker script to include configuration, becomes esp32s2beta_out.ld
     set(LD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ld)
     add_custom_command(

components/esp32s2beta/esp_adapter.c

@@ -33,6 +33,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
 #include "esp_log.h"
+#include "esp_event.h"
 #include "esp_heap_caps.h"
 #include "esp_private/wifi_os_adapter.h"
 #include "esp_private/wifi.h"
@@ -46,7 +47,6 @@
 #include "nvs.h"
 #include "os.h"
 #include "esp_smartconfig.h"
-#include "smartconfig_ack.h"
 #include "esp_coexist_internal.h"
 #include "esp_coexist_adapter.h"
 #if CONFIG_IDF_TARGET_ESP32S2BETA
@@ -372,6 +372,15 @@ static int32_t task_get_max_priority_wrapper(void)
     return (int32_t)(configMAX_PRIORITIES);
 }
 
+static int32_t esp_event_post_wrapper(const char* event_base, int32_t event_id, void* event_data, size_t event_data_size, uint32_t ticks_to_wait)
+{
+    if (ticks_to_wait == OSI_FUNCS_TIME_BLOCKING) {
+        return (int32_t)esp_event_post(event_base, event_id, event_data, event_data_size, portMAX_DELAY);
+    } else {
+        return (int32_t)esp_event_post(event_base, event_id, event_data, event_data_size, ticks_to_wait);
+    }
+}
+
 static void IRAM_ATTR timer_arm_wrapper(void *timer, uint32_t tmout, bool repeat)
 {
     ets_timer_arm(timer, tmout, repeat);
@@ -426,11 +435,6 @@ static void * IRAM_ATTR zalloc_internal_wrapper(size_t size)
     return ptr;
 }
 
-static void sc_ack_send_wrapper(void *param)
-{
-    return sc_ack_send((sc_ack_t *)param);
-}
-
 static uint32_t coex_status_get_wrapper(void)
 {
 #if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE
@@ -548,6 +552,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._task_get_max_priority = task_get_max_priority_wrapper,
     ._malloc = malloc,
     ._free = free,
+    ._event_post = esp_event_post_wrapper,
     ._get_free_heap_size = esp_get_free_heap_size,
     ._rand = esp_random,
     ._dport_access_stall_other_cpu_start_wrap = esp_empty_wrapper,
@@ -597,8 +602,6 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._modem_sleep_exit = esp_modem_sleep_exit,
     ._modem_sleep_register = esp_modem_sleep_register,
     ._modem_sleep_deregister = esp_modem_sleep_deregister,
-    ._sc_ack_send = sc_ack_send_wrapper,
-    ._sc_ack_send_stop = sc_ack_send_stop,
     ._coex_status_get = coex_status_get_wrapper,
     ._coex_wifi_request = coex_wifi_request_wrapper,
     ._coex_wifi_release = coex_wifi_release_wrapper,

components/esp32s2beta/panic.c

@@ -29,6 +29,7 @@
 #include "soc/timer_group_struct.h"
 #include "soc/timer_group_reg.h"
 #include "soc/cpu.h"
+#include "soc/soc_memory_layout.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"