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/ble_light_sleep_enter_issue' into 'release/v5.0'

Browse Source 
Bugfix/ble light sleep enter issue

See merge request espressif/esp-idf!20336
This commit is contained in:
Jiang Jiang Jian 2022-09-30 18:22:41 +08:00
commit ec4dd8a3a2
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,14 +561,13 @@ void controller_sleep_deinit(void)
/*lock should release first and then delete*/
if (s_pm_lock_acquired) {
if(s_light_sleep_pm_lock != NULL)
esp_pm_lock_release(s_light_sleep_pm_lock);
}
if (s_light_sleep_pm_lock != NULL) {
esp_pm_lock_release(s_light_sleep_pm_lock);
}
if(s_pm_lock != NULL) {
if (s_pm_lock != NULL) {
esp_pm_lock_release(s_pm_lock);
}
s_pm_lock_acquired = false;
}
}
if (!s_btdm_allow_light_sleep) {

2
components/bt/controller/lib_esp32c2/esp32c2-bt-lib

@ -1 +1 @@
Subproject commit c039a68dcf49082c37318568b2e147b61265e772
Subproject commit 90749ea1cbbc568bc75a673b0d50b89322066a09

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -1168,7 +1168,6 @@ r_ble_lll_conn_process_acked_pdu = 0x4000154c;
r_ble_lll_conn_recv_ack = 0x40001554;
r_ble_lll_conn_recv_valid_packet = 0x40001558;
r_ble_lll_conn_reset_pending_sched = 0x4000155c;
r_ble_lll_conn_rx_pkt_isr = 0x40001560;
r_ble_lll_conn_sched_next_anchor = 0x40001564;
r_ble_lll_conn_sched_next_event = 0x40001568;
r_ble_lll_conn_sm_new = 0x40001574;
@ -1224,6 +1223,7 @@ r_ble_lll_reset = 0x40001644;
r_ble_lll_rfmgmt_controller_sleep_en = 0x40001648;
r_ble_lll_rfmgmt_enable_now = 0x40001658;
r_ble_lll_rfmgmt_is_enabled = 0x40001660;
r_ble_lll_rfmgmt_release = 0x40001664;
r_ble_lll_rfmgmt_release_ev = 0x40001668;
r_ble_lll_rfmgmt_scan_changed = 0x40001670;
r_ble_lll_rfmgmt_sched_changed = 0x40001674;