Merge branch 'bugfix/fix_wifi_enabled_macro' into 'master'

fix(wifi): Fix bug using CONFIG_WIFI_ENABLED macro

Closes WIFIBUG-207 and WIFIBUG-123

See merge request espressif/esp-idf!26740

components/esp_phy/lib

@@ -1 +1 @@
-Subproject commit 8673ea44a5aebaf46b7c95251ed3392bce549433
+Subproject commit 9af837d5a581f502d7d5b1b5829a5c008c048be4

components/esp_phy/src/phy_common.c

@@ -13,7 +13,7 @@ static volatile uint16_t s_phy_modem_flag = 0;
 
 extern void phy_param_track_tot(bool en_wifi, bool en_ble_154);
 static esp_timer_handle_t phy_track_pll_timer;
-#if CONFIG_WIFI_ENABLED
+#if CONFIG_ESP_WIFI_ENABLED
 static volatile int64_t s_wifi_prev_timestamp;
 #endif
 #if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED
@@ -21,7 +21,7 @@ static volatile int64_t s_bt_154_prev_timestamp;
 #endif
 #define PHY_TRACK_PLL_PERIOD_IN_US 1000000
 
-#if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED || CONFIG_WIFI_ENABLED
+#if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED || CONFIG_ESP_WIFI_ENABLED
 bool phy_enabled_modem_contains(esp_phy_modem_t modem)
 {
     return (s_phy_modem_flag & modem) != 0;
@@ -32,7 +32,7 @@ static void phy_track_pll(void)
 {
     bool wifi_track_pll = false;
     bool ble_154_track_pll = false;
-#if CONFIG_WIFI_ENABLED
+#if CONFIG_ESP_WIFI_ENABLED
     if (phy_enabled_modem_contains(PHY_MODEM_WIFI)) {
         wifi_track_pll = true;
         s_wifi_prev_timestamp = esp_timer_get_time();
@@ -64,7 +64,7 @@ void phy_track_pll_init(void)
     // Using a variable to record the previously tracked time when PLL was last called.
     // If the duration is larger than PHY_TRACK_PLL_PERIOD_IN_US, then track PLL.
     bool need_track_pll = false;
-#if CONFIG_WIFI_ENABLED
+#if CONFIG_ESP_WIFI_ENABLED
     need_track_pll = need_track_pll || ((esp_timer_get_time() - s_wifi_prev_timestamp) > PHY_TRACK_PLL_PERIOD_IN_US);
 #endif
 #if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED

components/esp_phy/test/test_phy_rtc.c

@@ -46,7 +46,7 @@ static void test_phy_rtc_init(void)
         ret = nvs_flash_init();
     }
     TEST_ESP_OK(ret);
-#if CONFIG_WIFI_ENABLED
+#if CONFIG_ESP_WIFI_ENABLED
     esp_phy_enable(PHY_MODEM_WIFI);
 #endif
 #if CONFIG_BT_ENABLED

examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/sdkconfig.defaults

@@ -5,6 +5,6 @@ CONFIG_BTDM_CTRL_MODE_BLE_ONLY=n
 CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
 CONFIG_BTDM_CTRL_MODE_BTDM=n
 CONFIG_BT_CLASSIC_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_ESP_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y
 CONFIG_BT_BLE_ENABLED=n

examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/sdkconfig.defaults

@@ -5,6 +5,6 @@ CONFIG_BTDM_CTRL_MODE_BLE_ONLY=n
 CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
 CONFIG_BTDM_CTRL_MODE_BTDM=n
 CONFIG_BT_CLASSIC_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_ESP_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y
 CONFIG_BT_BLE_ENABLED=n

examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/sdkconfig.defaults

@@ -5,6 +5,6 @@ CONFIG_BTDM_CTRL_MODE_BLE_ONLY=n
 CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
 CONFIG_BTDM_CTRL_MODE_BTDM=n
 CONFIG_BT_CLASSIC_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_ESP_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y
 CONFIG_BT_BLE_ENABLED=n

examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/sdkconfig.defaults

@@ -5,6 +5,6 @@ CONFIG_BTDM_CTRL_MODE_BLE_ONLY=n
 CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
 CONFIG_BTDM_CTRL_MODE_BTDM=n
 CONFIG_BT_CLASSIC_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_ESP_WIFI_ENABLED=n
 CONFIG_BT_SPP_ENABLED=y
 CONFIG_BT_BLE_ENABLED=n