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

Merge branch 'bugfix/ble_light_sleep_error_on_esp32c2' into 'release/v5.0'

Browse Source 
Bugfix/ble light sleep error on esp32c2

See merge request espressif/esp-idf!20237
This commit is contained in:
Jiang Jiang Jian
2022-09-21 10:53:29 +08:00
parent 870dfdf53b 549eb762d8
commit 4bcf814855
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/bt/controller/esp32c2/bt.c
View File

@@ -171,6 +171,8 @@ static DRAM_ATTR bool s_btdm_allow_light_sleep;
// pm_lock to prevent light sleep when using main crystal as Bluetooth low power clock // pm_lock to prevent light sleep when using main crystal as Bluetooth low power clock
static DRAM_ATTR esp_pm_lock_handle_t s_light_sleep_pm_lock; static DRAM_ATTR esp_pm_lock_handle_t s_light_sleep_pm_lock;
#define BTDM_MIN_TIMER_UNCERTAINTY_US (200) #define BTDM_MIN_TIMER_UNCERTAINTY_US (200)
#else
static bool s_bt_phy_enabled = false;
#endif /* #ifdef CONFIG_PM_ENABLE */ #endif /* #ifdef CONFIG_PM_ENABLE */
#ifdef CONFIG_BT_LE_WAKEUP_SOURCE_BLE_RTC_TIMER #ifdef CONFIG_BT_LE_WAKEUP_SOURCE_BLE_RTC_TIMER
@@ -431,7 +433,8 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg)
esp_pm_lock_release(s_pm_lock); esp_pm_lock_release(s_pm_lock);
s_pm_lock_acquired = false; s_pm_lock_acquired = false;
} }
#else
s_bt_phy_enabled = false;
#endif // CONFIG_PM_ENABLE #endif // CONFIG_PM_ENABLE
} }
@@ -445,6 +448,8 @@ IRAM_ATTR void controller_wakeup_cb(void *arg)
s_pm_lock_acquired = true; s_pm_lock_acquired = true;
esp_pm_lock_acquire(s_pm_lock); esp_pm_lock_acquire(s_pm_lock);
} }
#else
s_bt_phy_enabled = true;
#endif //CONFIG_PM_ENABLE #endif //CONFIG_PM_ENABLE
} }
@@ -468,6 +473,8 @@ void controller_sleep_init(void)
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
s_btdm_allow_light_sleep = false; s_btdm_allow_light_sleep = false;
#else
s_bt_phy_enabled = true;
#endif // CONFIG_PM_ENABLE #endif // CONFIG_PM_ENABLE
#ifdef CONFIG_BT_LE_SLEEP_ENABLE #ifdef CONFIG_BT_LE_SLEEP_ENABLE
@@ -550,6 +557,7 @@ void controller_sleep_deinit(void)
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
#ifdef CONFIG_BT_LE_WAKEUP_SOURCE_BLE_RTC_TIMER #ifdef CONFIG_BT_LE_WAKEUP_SOURCE_BLE_RTC_TIMER
r_ble_rtc_wake_up_state_clr(); r_ble_rtc_wake_up_state_clr();
esp_sleep_disable_bt_wakeup();
#endif #endif
esp_sleep_pd_config(ESP_PD_DOMAIN_XTAL, ESP_PD_OPTION_AUTO); esp_sleep_pd_config(ESP_PD_DOMAIN_XTAL, ESP_PD_OPTION_AUTO);
@@ -582,7 +590,15 @@ void controller_sleep_deinit(void)
s_btdm_slp_tmr = NULL; s_btdm_slp_tmr = NULL;
} }
#endif #endif
s_pm_lock_acquired = false; if (s_pm_lock_acquired) {
esp_phy_disable();
s_pm_lock_acquired = false;
}
#else
if (s_bt_phy_enabled) {
esp_phy_disable();
s_bt_phy_enabled = false;
}
#endif #endif
} }
@@ -731,7 +747,6 @@ esp_err_t esp_bt_controller_deinit(void)
npl_freertos_mempool_deinit(); npl_freertos_mempool_deinit();
esp_phy_disable();
esp_phy_pd_mem_deinit(); esp_phy_pd_mem_deinit();
ble_controller_status = ESP_BT_CONTROLLER_STATUS_IDLE; ble_controller_status = ESP_BT_CONTROLLER_STATUS_IDLE;