alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/bt_sleep_state_check_assert_failed' into 'master'

Browse Source 
Bluetooth: fixed the assertion failure in checking hardware sleep state during wake-up

Closes BT-1705

See merge request espressif/esp-idf!14127
This commit is contained in:
Wang Meng Yang 2021-06-24 05:21:37 +00:00
commit d674c94f2e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/bt/controller/esp32c3/bt.c
View File

@ -710,10 +710,6 @@ static void btdm_sleep_exit_phase3_wrapper(void)
}
#endif
if(btdm_sleep_clock_sync()) {
ESP_LOGE(BTDM_LOG_TAG, "sleep eco state err\n");
assert(0);
}
if (btdm_controller_get_sleep_mode() == ESP_BT_SLEEP_MODE_1) {
if (s_lp_stat.phy_enabled == 0) {
esp_phy_enable();
@ -728,6 +724,12 @@ static void btdm_sleep_exit_phase3_wrapper(void)
esp_timer_stop(s_btdm_slp_tmr);
s_lp_stat.wakeup_timer_started = 0;
}
// wait for the sleep state to change
// the procedure duration is at micro-second level or less
while (btdm_sleep_clock_sync()) {
;
}
}
static void IRAM_ATTR btdm_sleep_exit_phase0(void *param)

10
components/bt/controller/esp32s3/bt.c
View File

@ -710,10 +710,6 @@ static void btdm_sleep_exit_phase3_wrapper(void)
}
#endif
if(btdm_sleep_clock_sync()) {
ESP_LOGE(BT_LOG_TAG, "sleep eco state err\n");
assert(0);
}
if (btdm_controller_get_sleep_mode() == ESP_BT_SLEEP_MODE_1) {
if (s_lp_stat.phy_enabled == 0) {
esp_phy_enable();
@ -728,6 +724,12 @@ static void btdm_sleep_exit_phase3_wrapper(void)
esp_timer_stop(s_btdm_slp_tmr);
s_lp_stat.wakeup_timer_started = 0;
}
// wait for the sleep state to change
// the procedure duration is at micro-second level or less
while (btdm_sleep_clock_sync()) {
;
}
}
static void IRAM_ATTR btdm_sleep_exit_phase0(void *param)