alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-04 06:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(wifi): Fix bug using CONFIG_WIFI_ENABLED macro

Browse Source
This commit is contained in:
alanmaxwell
2023-10-30 11:54:27 +08:00
parent 7c21207bd3
commit 2eb1a7f933
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_phy/src/phy_common.c
View File

@@ -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); extern void phy_param_track_tot(bool en_wifi, bool en_ble_154);
static esp_timer_handle_t phy_track_pll_timer; 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; static volatile int64_t s_wifi_prev_timestamp;
#endif #endif
#if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED #if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED
@@ -21,7 +21,7 @@ static volatile int64_t s_bt_154_prev_timestamp;
#endif #endif
#define PHY_TRACK_PLL_PERIOD_IN_US 1000000 #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) bool phy_enabled_modem_contains(esp_phy_modem_t modem)
{ {
return (s_phy_modem_flag & modem) != 0; return (s_phy_modem_flag & modem) != 0;
@@ -32,7 +32,7 @@ static void phy_track_pll(void)
{ {
bool wifi_track_pll = false; bool wifi_track_pll = false;
bool ble_154_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)) { if (phy_enabled_modem_contains(PHY_MODEM_WIFI)) {
wifi_track_pll = true; wifi_track_pll = true;
s_wifi_prev_timestamp = esp_timer_get_time(); 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. // 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. // If the duration is larger than PHY_TRACK_PLL_PERIOD_IN_US, then track PLL.
bool need_track_pll = false; 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); need_track_pll = need_track_pll || ((esp_timer_get_time() - s_wifi_prev_timestamp) > PHY_TRACK_PLL_PERIOD_IN_US);
#endif #endif
#if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED #if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED

2
components/esp_phy/test/test_phy_rtc.c
View File

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

2
examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/sdkconfig.defaults
View File

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

2
examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/sdkconfig.defaults
View File

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

2
examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/sdkconfig.defaults
View File

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

2
examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/sdkconfig.defaults
View File

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