esp_coex: correct Kconfig name

components/esp_coex/CMakeLists.txt

@@ -1,6 +1,6 @@
 idf_build_get_property(idf_target IDF_TARGET)
 
-if(CONFIG_SW_COEXIST_ENABLE OR CONFIG_EXTERNAL_COEX_ENABLE)
+if(CONFIG_ESP_COEX_SW_COEXIST_ENABLE OR CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE)
     if(CONFIG_APP_NO_BLOBS)
         set(link_binary_libs 0)
         set(ldfragments)
@@ -14,7 +14,7 @@ if(CONFIG_SW_COEXIST_ENABLE OR CONFIG_EXTERNAL_COEX_ENABLE)
         "${idf_target}/esp_coex_adapter.c")
 endif()
 
-if(CONFIG_ESP32_WIFI_ENABLED)
+if(CONFIG_ESP_WIFI_ENABLED)
     list(APPEND srcs "${idf_target}/esp_coex_adapter.c")
 endif()
 
@@ -23,23 +23,18 @@ idf_component_register(SRCS "${srcs}"
                     PRIV_REQUIRES esp_timer driver esp_event
                     LDFRAGMENTS "${ldfragments}")
 
-if(CONFIG_SW_COEXIST_ENABLE OR CONFIG_EXTERNAL_COEX_ENABLE)
+if(CONFIG_ESP_COEX_SW_COEXIST_ENABLE OR CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE)
     idf_build_get_property(build_dir BUILD_DIR)
 
     set(target_name "${idf_target}")
     target_link_directories(${COMPONENT_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}")
 
     if(link_binary_libs)
-        set(blobs coexist)
-
-        foreach(blob ${blobs})
-            add_prebuilt_library(${blob} "${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}/lib${blob}.a"
-                                REQUIRES ${COMPONENT_NAME})
-            set(blob_reqs ${blobs})
-            list(REMOVE_ITEM blob_reqs ${blob}) # remove itself from requirements
-            set_property(TARGET ${blob} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${blob_reqs})
-            target_link_libraries(${COMPONENT_LIB} PUBLIC ${blob})
-        endforeach()
+        set(blob coexist)
+
+        add_prebuilt_library(${blob} "${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}/lib${blob}.a"
+                            REQUIRES ${COMPONENT_NAME})
+        target_link_libraries(${COMPONENT_LIB} PUBLIC ${blob})
     endif()
 
     target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

components/esp_coex/Kconfig

@@ -1,8 +1,6 @@
 
-menu "ESP-COEX"
-    visible if !IDF_TARGET_ESP32H4
-
-    config ESP_WIFI_SW_COEXIST_ENABLE
+menu "Wireless Coexistence"
+    config ESP_COEX_SW_COEXIST_ENABLE
         bool "Software controls WiFi/Bluetooth coexistence"
         depends on (ESP_WIFI_ENABLED && BT_ENABLED) || \
             (ESP_WIFI_ENABLED && IEEE802154_ENABLED)
@@ -15,8 +13,8 @@ menu "ESP-COEX"
             If only Bluetooth is used, it is recommended to disable this option to reduce binary file
             size.
 
-    config ESP_WIFI_EXTERNAL_COEXIST_ENABLE
-        bool "WiFi External Coexistence"
+    config ESP_COEX_EXTERNAL_COEXIST_ENABLE
+        bool "External Coexistence"
         default n
         depends on (!(BT_ENABLED||NIMBLE_ENABLED)&&(!IDF_TARGET_ESP32))
         help

components/esp_coex/include/esp_coexist_i154.h → components/esp_coex/include/esp_coex_i154.h

@@ -6,7 +6,7 @@
 #ifndef __COEXIST_I154_H__
 #define __COEXIST_I154_H__
 
-#ifdef SOC_IEEE802154_SUPPORTED
+#ifdef CONFIG_SOC_IEEE802154_SUPPORTED
 typedef enum {
     IEEE802154_RISK_TX = 1,
     IEEE802154_TX_AT,
@@ -17,7 +17,7 @@ typedef enum {
     IEEE802154_EVENT_MAX,
 } ieee802154_coex_event_t;
 
-void esp_ieee802154_coex_pti_set(ieee802154_coex_event_t event);
+void esp_coex_ieee802154_pti_set(ieee802154_coex_event_t event);
 #endif
 
 #endif

components/esp_coex/include/esp_modem_wrapper.h

@@ -25,22 +25,7 @@ void wifi_int_restore_wrapper(void *wifi_int_mux, uint32_t tmp);
 
 void task_yield_from_isr_wrapper(void);
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-
-void *internal_semphr_create_wrapper(uint32_t max, uint32_t init);
-
-void internal_semphr_delete_wrapper(void *semphr);
-
-int32_t internal_semphr_take_from_isr_wrapper(void *semphr, void *hptw);
-
-int32_t internal_semphr_give_from_isr_wrapper(void *semphr, void *hptw);
-
-int32_t internal_semphr_take_wrapper(void *semphr, uint32_t block_time_tick);
-
-int32_t internal_semphr_give_wrapper(void *semphr);
-
-#else
-
+#if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32S3)
 void * semphr_create_wrapper(uint32_t max, uint32_t init);
 
 void semphr_delete_wrapper(void *semphr);
@@ -52,7 +37,6 @@ int32_t semphr_give_from_isr_wrapper(void *semphr, void *hptw);
 int32_t semphr_take_wrapper(void *semphr, uint32_t block_time_tick);
 
 int32_t semphr_give_wrapper(void *semphr);
-
 #endif
 
 void timer_disarm_wrapper(void *timer);

components/esp_coex/sdkconfig.rename

@@ -1,52 +1,9 @@
 # sdkconfig replacement configurations for deprecated options formatted as
 # CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
 
-CONFIG_SW_COEXIST_ENABLE                CONFIG_ESP_WIFI_SW_COEXIST_ENABLE
-CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE     CONFIG_ESP_WIFI_SW_COEXIST_ENABLE
-CONFIG_EXTERNAL_COEX_ENABLE             CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE
+CONFIG_SW_COEXIST_ENABLE                CONFIG_ESP_COEX_SW_COEXIST_ENABLE
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE     CONFIG_ESP_COEX_SW_COEXIST_ENABLE
+CONFIG_ESP_WIFI_SW_COEXIST_ENABLE       CONFIG_ESP_COEX_SW_COEXIST_ENABLE
 
-# renaming of esp_wifi kconfig options
-CONFIG_ESP32_WIFI_ENABLED               CONFIG_ESP_WIFI_ENABLED
-CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE     CONFIG_ESP_WIFI_SW_COEXIST_ENABLE
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM  CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM
-CONFIG_ESP32_WIFI_RX_BA_WIN             CONFIG_ESP_WIFI_RX_BA_WIN
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED      CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM
-CONFIG_ESP32_WIFI_TX_BUFFER             CONFIG_ESP_WIFI_TX_BUFFER
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER      CONFIG_ESP_WIFI_STATIC_TX_BUFFER
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER     CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE        CONFIG_ESP_WIFI_TX_BUFFER_TYPE
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM  CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM
-CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM   CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
-CONFIG_ESP32_WIFI_CSI_ENABLED           CONFIG_ESP_WIFI_CSI_ENABLED
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED      CONFIG_ESP_WIFI_AMPDU_TX_ENABLED
-CONFIG_ESP32_WIFI_TX_BA_WIN             CONFIG_ESP_WIFI_TX_BA_WIN
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED      CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
-CONFIG_ESP32_WIFI_RX_BA_WIN             CONFIG_ESP_WIFI_RX_BA_WIN
-CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED      CONFIG_ESP_WIFI_AMSDU_TX_ENABLED
-CONFIG_ESP32_WIFI_NVS_ENABLED           CONFIG_ESP_WIFI_NVS_ENABLED
-CONFIG_ESP32_WIFI_TASK_CORE_ID          CONFIG_ESP_WIFI_TASK_CORE_ID
-CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0
-CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1
-CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN
-CONFIG_ESP32_WIFI_MGMT_SBUF_NUM         CONFIG_ESP_WIFI_MGMT_SBUF_NUM
-CONFIG_ESP32_WIFI_IRAM_OPT              CONFIG_ESP_WIFI_IRAM_OPT
-CONFIG_ESP32_WIFI_RX_IRAM_OPT           CONFIG_ESP_WIFI_RX_IRAM_OPT
-CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE       CONFIG_ESP_WIFI_ENABLE_WPA3_SAE
-CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA   CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA
-
-# renaming supplicant kconfig to esp_wifi kconfig
-CONFIG_WPA_MBEDTLS_CRYPTO               CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
-CONFIG_WPA_MBEDTLS_TLS_CLIENT           CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
-CONFIG_WPA_WAPI_PSK                     CONFIG_ESP_WIFI_WAPI_PSK
-CONFIG_WPA_SUITE_B_192                  CONFIG_ESP_WIFI_SUITE_B_192
-CONFIG_WPA_DEBUG_PRINT                  CONFIG_ESP_WIFI_DEBUG_PRINT
-CONFIG_WPA_TESTING_OPTIONS              CONFIG_ESP_WIFI_TESTING_OPTIONS
-CONFIG_WPA_WPS_STRICT                   CONFIG_ESP_WIFI_WPS_STRICT
-CONFIG_WPA_11KV_SUPPORT                 CONFIG_ESP_WIFI_11KV_SUPPORT
-CONFIG_WPA_SCAN_CACHE                   CONFIG_ESP_WIFI_SCAN_CACHE
-CONFIG_WPA_MBO_SUPPORT                  CONFIG_ESP_WIFI_MBO_SUPPORT
-CONFIG_WPA_DPP_SUPPORT                  CONFIG_ESP_WIFI_DPP_SUPPORT
-CONFIG_WPA_11R_SUPPORT                  CONFIG_ESP_WIFI_11R_SUPPORT
-CONFIG_WPA_WPS_SOFTAP_REGISTRAR         CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR
+CONFIG_EXTERNAL_COEX_ENABLE             CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE
+CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE

components/esp_coex/test_md5/test_md5.sh

@@ -61,7 +61,7 @@ echo "Checking libraries for target ${IDF_TARGET}..."
 check_md5 ${IDF_PATH}/components/esp_coex/include/esp_coexist_adapter.h g_coex_adapter_funcs_md5
 
 if [ "${IDF_TARGET}" == "esp32c6" ]; then
-    check_md5 ${IDF_PATH}/components/esp_coex/include/esp_coexist_i154.h g_coex_i154_funcs_md5
+    check_md5 ${IDF_PATH}/components/esp_coex/include/esp_coex_i154.h g_coex_i154_funcs_md5
 fi
 
 if [ $FAILURES -gt 0 ]; then

components/esp_wifi/sdkconfig.rename

@@ -0,0 +1,47 @@
+# sdkconfig replacement configurations for deprecated options formatted as
+# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
+
+# renaming of esp_wifi kconfig options
+CONFIG_ESP32_WIFI_ENABLED               CONFIG_ESP_WIFI_ENABLED
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM  CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM
+CONFIG_ESP32_WIFI_RX_BA_WIN             CONFIG_ESP_WIFI_RX_BA_WIN
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED      CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM
+CONFIG_ESP32_WIFI_TX_BUFFER             CONFIG_ESP_WIFI_TX_BUFFER
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER      CONFIG_ESP_WIFI_STATIC_TX_BUFFER
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER     CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE        CONFIG_ESP_WIFI_TX_BUFFER_TYPE
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM  CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM
+CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM   CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
+CONFIG_ESP32_WIFI_CSI_ENABLED           CONFIG_ESP_WIFI_CSI_ENABLED
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED      CONFIG_ESP_WIFI_AMPDU_TX_ENABLED
+CONFIG_ESP32_WIFI_TX_BA_WIN             CONFIG_ESP_WIFI_TX_BA_WIN
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED      CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
+CONFIG_ESP32_WIFI_RX_BA_WIN             CONFIG_ESP_WIFI_RX_BA_WIN
+CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED      CONFIG_ESP_WIFI_AMSDU_TX_ENABLED
+CONFIG_ESP32_WIFI_NVS_ENABLED           CONFIG_ESP_WIFI_NVS_ENABLED
+CONFIG_ESP32_WIFI_TASK_CORE_ID          CONFIG_ESP_WIFI_TASK_CORE_ID
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM         CONFIG_ESP_WIFI_MGMT_SBUF_NUM
+CONFIG_ESP32_WIFI_IRAM_OPT              CONFIG_ESP_WIFI_IRAM_OPT
+CONFIG_ESP32_WIFI_RX_IRAM_OPT           CONFIG_ESP_WIFI_RX_IRAM_OPT
+CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE       CONFIG_ESP_WIFI_ENABLE_WPA3_SAE
+CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA   CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA
+
+# renaming supplicant kconfig to esp_wifi kconfig
+CONFIG_WPA_MBEDTLS_CRYPTO               CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
+CONFIG_WPA_MBEDTLS_TLS_CLIENT           CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
+CONFIG_WPA_WAPI_PSK                     CONFIG_ESP_WIFI_WAPI_PSK
+CONFIG_WPA_SUITE_B_192                  CONFIG_ESP_WIFI_SUITE_B_192
+CONFIG_WPA_DEBUG_PRINT                  CONFIG_ESP_WIFI_DEBUG_PRINT
+CONFIG_WPA_TESTING_OPTIONS              CONFIG_ESP_WIFI_TESTING_OPTIONS
+CONFIG_WPA_WPS_STRICT                   CONFIG_ESP_WIFI_WPS_STRICT
+CONFIG_WPA_11KV_SUPPORT                 CONFIG_ESP_WIFI_11KV_SUPPORT
+CONFIG_WPA_SCAN_CACHE                   CONFIG_ESP_WIFI_SCAN_CACHE
+CONFIG_WPA_MBO_SUPPORT                  CONFIG_ESP_WIFI_MBO_SUPPORT
+CONFIG_WPA_DPP_SUPPORT                  CONFIG_ESP_WIFI_DPP_SUPPORT
+CONFIG_WPA_11R_SUPPORT                  CONFIG_ESP_WIFI_11R_SUPPORT
+CONFIG_WPA_WPS_SOFTAP_REGISTRAR         CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR

docs/en/api-guides/coexist.rst

@@ -194,7 +194,7 @@ Setting Coexistence Compile-time Options
 
 .. list::
 
-    - After writing the coexistence program, you must check  :ref:`CONFIG_ESP_WIFI_SW_COEXIST_ENABLE` option through menuconfig to open coexistence configuration on software, otherwise the coexistence function mentioned above cannot be used.
+    - After writing the coexistence program, you must check  :ref:`CONFIG_ESP_COEX_SW_COEXIST_ENABLE` option through menuconfig to open coexistence configuration on software, otherwise the coexistence function mentioned above cannot be used.
 
     :esp32: - To ensure better communication performance of Wi-Fi and Bluetooth in the case of coexistence, run the task of the Wi-Fi protocol stack, the task of the Bluetooth Controller and Host protocol stack on different CPUs. You can use :ref:`CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE` and :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` (or :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE`) to put the tasks of the Bluetooth controller and the host protocol stack on the same CPU, and then use :ref:`CONFIG_ESP_WIFI_TASK_CORE_ID` to place the task of the Wi-Fi protocol stack on another CPU.
 

docs/zh_CN/api-guides/coexist.rst

@@ -194,7 +194,7 @@ BLE MESH 共存状态描述
 
 .. list::
 
-    - 在完成共存程序编写的时候，您必须通过 menuconfig 选择 :ref:`CONFIG_ESP_WIFI_SW_COEXIST_ENABLE` 打开软件共存配置选项，否则就无法使用上文中提到的共存功能。
+    - 在完成共存程序编写的时候，您必须通过 menuconfig 选择 :ref:`CONFIG_ESP_COEX_SW_COEXIST_ENABLE` 打开软件共存配置选项，否则就无法使用上文中提到的共存功能。
 
     :esp32: - 为了在共存情况下获得更好的 Wi-Fi 和蓝牙的通信性能，建议将 Wi-Fi 协议栈的 task 和蓝牙 Controller 以及 Host 协议栈的 task 运行在不同的 CPU 上。您可以通过 :ref:`CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE` 和 :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` （或者 :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE` ）选择将蓝牙 controller 以及 host 协议栈的 task 放在同一个 CPU 上，再通过 :ref:`CONFIG_ESP_WIFI_TASK_CORE_ID`  选择将 Wi-Fi 协议栈 task 放在另一个 CPU 上。
 

tools/ci/check_public_headers_exceptions.txt

@@ -98,6 +98,8 @@ components/esp_hw_support/include/esp_private/esp_memprot_internal.h
 ### Here are the files that use CONFIG_XXX values but don't include sdkconfig.h
 #
 components/esp_wifi/include/esp_private/wifi_os_adapter.h
+components/esp_coex/include/esp_coexist_adapter.h
+components/esp_coex/include/esp_coex_i154.h
 ### To be fixed: headers that rely on implicit inclusion
 #
 components/esp_rom/include/esp32/rom/rtc.h
@@ -118,11 +120,9 @@ components/esp_rom/include/esp32s2/rom/opi_flash.h
 components/esp_rom/include/esp32s2/rom/efuse.h
 components/esp_ringbuf/include/freertos/ringbuf.h
 components/esp_wifi/include/esp_wifi_crypto_types.h
-components/esp_coex/include/esp_coexist_internal.h
 components/esp_wifi/include/esp_wifi_netif.h
 components/esp_wifi/include/smartconfig_ack.h
 components/esp_wifi/include/esp_wifi_default.h
-components/esp_coex/include/esp_coexist_adapter.h
 components/esp_event/include/esp_event_base.h
 components/esp_netif/include/esp_netif_sta_list.h
 components/esp_netif/include/esp_netif_defaults.h