From 189bdb2bf8fb5f2713172a00a7b539b6de09e19e Mon Sep 17 00:00:00 2001 From: muhaidong Date: Fri, 4 Mar 2022 19:34:46 +0800 Subject: [PATCH] esp_wifi: fix not update phy according to country code. 1. Fixed not update phy according to country code. 2. Fixed crashed when esp_wifi_set_ant_gpio() called 3. Fixed a bug when ftm used with ps enabled 4. Fixed a potential issue to allocate PSRAM to wifi stack where internal RAM is required 5. Fixed potential fail to scan AP after receiving disassoc/deauth from AP on esp32s2 y --- components/esp_wifi/esp32s2/esp_adapter.c | 2 ++ components/esp_wifi/include/esp_private/wifi_os_adapter.h | 2 +- components/esp_wifi/lib | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/esp_wifi/esp32s2/esp_adapter.c b/components/esp_wifi/esp32s2/esp_adapter.c index 1c73dbfd2a..130cd1c5f1 100644 --- a/components/esp_wifi/esp32s2/esp_adapter.c +++ b/components/esp_wifi/esp32s2/esp_adapter.c @@ -697,6 +697,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = { ._wifi_apb80m_release = wifi_apb80m_release_wrapper, ._phy_disable = esp_phy_disable, ._phy_enable = esp_phy_enable, + ._phy_common_clock_enable = esp_phy_common_clock_enable, + ._phy_common_clock_disable = esp_phy_common_clock_disable, ._phy_update_country_info = esp_phy_update_country_info, ._read_mac = esp_read_mac, ._timer_arm = timer_arm_wrapper, diff --git a/components/esp_wifi/include/esp_private/wifi_os_adapter.h b/components/esp_wifi/include/esp_private/wifi_os_adapter.h index b583e91626..9a3b92e070 100644 --- a/components/esp_wifi/include/esp_private/wifi_os_adapter.h +++ b/components/esp_wifi/include/esp_private/wifi_os_adapter.h @@ -85,7 +85,7 @@ typedef struct { void (* _wifi_apb80m_release)(void); void (* _phy_disable)(void); void (* _phy_enable)(void); -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 void (* _phy_common_clock_enable)(void); void (* _phy_common_clock_disable)(void); #endif diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 603c80b581..3417df5582 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 603c80b5814f449af4acfef3dc9aa02351b7a5ce +Subproject commit 3417df55828856c1deda1edc3078baa532069e03