From c5c7a192b969a1008ec609a8d4ef07278941c35e Mon Sep 17 00:00:00 2001 From: Chen Jian Hua Date: Fri, 25 Apr 2025 20:33:27 +0800 Subject: [PATCH 1/2] fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(edf923e) - Fixed MIC error disconnection when pairing with iOS devices (cherry picked from commit 0df0b53b0a94828a2ed24fd198b4401ec7e311a6) Co-authored-by: chenjianhua --- components/bt/controller/lib_esp32c3_family | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld | 4 ++-- components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family index f23a340e82..db872ab162 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit f23a340e82d6a4be40f83214385a98c5bd30ccdd +Subproject commit db872ab1620e1656f51d7a69c5a0576a6f369501 diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld index ad01c1cb21..f10ea08a21 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld @@ -421,10 +421,10 @@ r_llc_ll_reject_ind_pdu_send = 0x40000f3c; r_llc_ll_start_enc_rsp_ack_handler = 0x40000f40; r_llc_ll_terminate_ind_ack = 0x40000f44; r_llc_ll_unknown_ind_handler = 0x40000f48; -/* r_llc_llcp_send = 0x40000f4c; */ +r_llc_llcp_send = 0x40000f4c; r_llc_llcp_state_set = 0x40000f50; r_llc_llcp_trans_timer_set = 0x40000f54; -r_llc_llcp_tx_check = 0x40000f58; +/* r_llc_llcp_tx_check = 0x40000f58; */ r_llc_loc_con_upd_proc_err_cb = 0x40000f64; r_llc_loc_dl_upd_proc_continue = 0x40000f68; r_llc_loc_encrypt_proc_continue = 0x40000f6c; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld index a8c0ca2da4..b30cb34ef0 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld @@ -421,10 +421,10 @@ r_llc_ll_reject_ind_pdu_send = 0x40003d98; r_llc_ll_start_enc_rsp_ack_handler = 0x40003da4; r_llc_ll_terminate_ind_ack = 0x40003db0; r_llc_ll_unknown_ind_handler = 0x40003dbc; -/* r_llc_llcp_send = 0x40003dc8; */ +r_llc_llcp_send = 0x40003dc8; r_llc_llcp_state_set = 0x40003dd4; r_llc_llcp_trans_timer_set = 0x40003de0; -r_llc_llcp_tx_check = 0x40003dec; +/* r_llc_llcp_tx_check = 0x40003dec; */ /* r_llc_loc_ch_map_proc_continue = 0x40003df8; */ r_llc_loc_con_upd_proc_err_cb = 0x40003e10; r_llc_loc_dl_upd_proc_continue = 0x40003e1c; From 1987d84eb8bfe21f8413763f300355740c0d3b88 Mon Sep 17 00:00:00 2001 From: chenjianhua Date: Mon, 28 Apr 2025 12:01:44 +0800 Subject: [PATCH 2/2] fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(edf923e) - Fixed ble lib linkage issue --- components/bt/controller/lib_esp32c3_family | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.eco7_bt_funcs.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family index db872ab162..b09bf658a7 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit db872ab1620e1656f51d7a69c5a0576a6f369501 +Subproject commit b09bf658a78c1c234d5ba7b3174f0dca7dd80c6b diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7_bt_funcs.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7_bt_funcs.ld index 33b0ed595d..b23f631a02 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7_bt_funcs.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7_bt_funcs.ld @@ -18,7 +18,6 @@ r_lld_con_terminate_max_evt_update = 0x40001c5c; r_llc_pref_param_compute_eco = 0x40001ce8; r_llc_hci_con_upd_info_send_eco = 0x40001cec; r_llc_rem_encrypt_proc_continue_eco = 0x40001cf0; -r_llc_start_eco = 0x40001cf8; r_lld_ext_adv_dynamic_aux_pti_process_eco = 0x40001cfc; r_lld_adv_start_eco = 0x40001d04; r_lld_con_evt_canceled_cbk_eco = 0x40001d08; @@ -127,4 +126,5 @@ r_hci_register_vendor_desc_tab = 0x40000d9c; r_lld_scan_process_pkt_rx_adv_rep = 0x40001284; r_register_esp_vendor_cmd_handler = 0x40001400; r_llc_llcp_pdu_handler_get_overwrite = 0x40001d5c; +r_llc_start_eco = 0x40001cf8; */