Skip to content

Commit 1edf45e

Browse files
committed
Merge branch 'bugfix/fix_some_ble_bugs_250331_esp32c3' into 'master'
Fixed some BLE bugs 250331 on esp32c3 Closes BLERP-1682, BLERP-1713, BLERP-1714, BLERP-1715, BLERP-1716, BLERP-1717, BLERP-1718, BLERP-1720, BLERP-1719, BLERP-1721, BLERP-1712, BLERP-1723, BT-3474, BT-3319, BT-3431, and IDFCI-2586 See merge request espressif/esp-idf!38170
2 parents d98c580 + 4602665 commit 1edf45e

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

components/esp_rom/esp32c3/ld/esp32c3.rom.bt_funcs.ld

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -459,7 +459,7 @@ r_llc_ver_proc_err_cb = 0x40000fe4;
459459
r_llcp_pdu_handler_tab_p_get = 0x40000fe8;
460460
r_lld_aa_gen = 0x40000fec;
461461
r_lld_adv_adv_data_set = 0x40000ff0;
462-
r_lld_adv_adv_data_update = 0x40000ff4;
462+
/* r_lld_adv_adv_data_update = 0x40000ff4; */
463463
r_lld_adv_aux_ch_idx_set = 0x40000ff8;
464464
r_lld_adv_aux_evt_canceled_cbk = 0x40000ffc;
465465
r_lld_adv_aux_evt_start_cbk = 0x40001000;
@@ -482,7 +482,7 @@ r_lld_adv_pkt_rx_connect_ind = 0x4000103c;
482482
r_lld_adv_rand_addr_update = 0x40001044;
483483
r_lld_adv_restart = 0x40001048;
484484
r_lld_adv_scan_rsp_data_set = 0x4000104c;
485-
r_lld_adv_scan_rsp_data_update = 0x40001050;
485+
/* r_lld_adv_scan_rsp_data_update = 0x40001050; */
486486
r_lld_adv_set_tx_power = 0x40001054;
487487
r_lld_adv_start = 0x40001058;
488488
r_lld_adv_stop = 0x4000105c;
@@ -662,8 +662,8 @@ r_lld_test_start = 0x40001330;
662662
/* r_lld_test_stop = 0x40001334; */
663663
r_lld_update_rxbuf = 0x40001338;
664664
r_lld_update_rxbuf_isr = 0x4000133c;
665-
r_lld_white_list_add = 0x40001340;
666-
r_lld_white_list_rem = 0x40001344;
665+
/* r_lld_white_list_add = 0x40001340; */
666+
/* r_lld_white_list_rem = 0x40001344; */
667667
r_llm_activity_free_get = 0x40001348;
668668
r_llm_activity_free_set = 0x4000134c;
669669
r_llm_activity_syncing_get = 0x40001350;

components/esp_rom/esp32s3/ld/esp32s3.rom.bt_funcs.ld

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -460,7 +460,7 @@ r_llc_ver_proc_err_cb = 0x40003f90;
460460
r_llcp_pdu_handler_tab_p_get = 0x40003f9c;
461461
r_lld_aa_gen = 0x40003fa8;
462462
r_lld_adv_adv_data_set = 0x40003fb4;
463-
r_lld_adv_adv_data_update = 0x40003fc0;
463+
/* r_lld_adv_adv_data_update = 0x40003fc0; */
464464
r_lld_adv_aux_ch_idx_set = 0x40003fcc;
465465
r_lld_adv_aux_evt_canceled_cbk = 0x40003fd8;
466466
r_lld_adv_aux_evt_start_cbk = 0x40003fe4;
@@ -483,7 +483,7 @@ r_lld_adv_pkt_rx_connect_ind = 0x40004098;
483483
r_lld_adv_rand_addr_update = 0x400040b0;
484484
r_lld_adv_restart = 0x400040bc;
485485
r_lld_adv_scan_rsp_data_set = 0x400040c8;
486-
r_lld_adv_scan_rsp_data_update = 0x400040d4;
486+
/* r_lld_adv_scan_rsp_data_update = 0x400040d4; */
487487
r_lld_adv_set_tx_power = 0x400040e0;
488488
r_lld_adv_start = 0x400040ec;
489489
r_lld_adv_stop = 0x400040f8;
@@ -663,8 +663,8 @@ r_lld_test_start = 0x40004974;
663663
/* r_lld_test_stop = 0x40004980;*/
664664
r_lld_update_rxbuf = 0x4000498c;
665665
r_lld_update_rxbuf_isr = 0x40004998;
666-
r_lld_white_list_add = 0x400049a4;
667-
r_lld_white_list_rem = 0x400049b0;
666+
/* r_lld_white_list_add = 0x400049a4; */
667+
/* r_lld_white_list_rem = 0x400049b0; */
668668
r_llm_activity_free_get = 0x400049bc;
669669
r_llm_activity_free_set = 0x400049c8;
670670
r_llm_activity_syncing_get = 0x400049d4;

0 commit comments

Comments
 (0)