From 9d7a7001ac59de727aa7df2b5d415ca4b2c691b7 Mon Sep 17 00:00:00 2001 From: cjin Date: Mon, 26 Sep 2022 15:18:54 +0800 Subject: [PATCH 1/3] fix ble compilation error --- components/bt/controller/esp32c2/bt.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/components/bt/controller/esp32c2/bt.c b/components/bt/controller/esp32c2/bt.c index 42c92c5d00..01a9154f0e 100644 --- a/components/bt/controller/esp32c2/bt.c +++ b/components/bt/controller/esp32c2/bt.c @@ -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) { From 0010f4c3a8ae0217e836053c143688c0db7539f3 Mon Sep 17 00:00:00 2001 From: cjin Date: Mon, 26 Sep 2022 15:29:33 +0800 Subject: [PATCH 2/3] update controller lib for bugfix on light-sleep --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index c039a68dcf..64bf394280 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit c039a68dcf49082c37318568b2e147b61265e772 +Subproject commit 64bf3942806c2b3be17ef20fb7df6dc63ddf6340 diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 6254205e5a..b6dd1b211a 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1224,6 +1224,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; From 719f05306fef805d7478e8d065b8bf42ada02d8d Mon Sep 17 00:00:00 2001 From: zwl Date: Thu, 29 Sep 2022 15:50:28 +0800 Subject: [PATCH 3/3] Fixed the issue that master sends retransmitted data incorrectly on ESP32C2 --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index 64bf394280..90749ea1cb 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 64bf3942806c2b3be17ef20fb7df6dc63ddf6340 +Subproject commit 90749ea1cbbc568bc75a673b0d50b89322066a09 diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index b6dd1b211a..950a08afae 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -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;