Merge branch 'bugfix/fix_phy_63' into 'master'

Fixed extended adv address setting after adv restart on esp32c3 Closes BLERP-86 and BLERP-107 See merge request espressif/esp-idf!26157
espressif · Sep 28, 2023 · 492c819 · 492c819
2 parents d7bb1b2 + 42b85df
commit 492c819
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -966,7 +966,9 @@ r_llc_loc_dl_upd_proc_continue = 0x40000f68;
 r_llc_loc_encrypt_proc_continue = 0x40000f6c;
 r_llc_loc_encrypt_proc_err_cb = 0x40000f70;
 r_llc_loc_feats_exch_proc_continue = 0x40000f74;
+/*
 r_llc_loc_phy_upd_proc_continue = 0x40000f78;
+*/
 r_llc_loc_phy_upd_proc_err_cb = 0x40000f7c;
 r_llc_msg_handler_tab_p_get = 0x40000f80;
 r_llc_pref_param_compute = 0x40000f84;
@@ -1145,13 +1147,17 @@ r_lld_process_cca_data = 0x4000120c;
 r_lld_ral_search = 0x40001210;
 r_lld_read_clock = 0x40001214;
 r_lld_res_list_add = 0x40001218;
+/*
 r_lld_res_list_clear = 0x4000121c;
+*/
 r_lld_res_list_is_empty = 0x40001220;
 r_lld_res_list_local_rpa_get = 0x40001224;
 r_lld_res_list_peer_rpa_get = 0x40001228;
 r_lld_res_list_peer_update = 0x4000122c;
 r_lld_res_list_priv_mode_update = 0x40001230;
+/*
 r_lld_res_list_rem = 0x40001234;
+*/
 r_lld_reset_reg = 0x40001238;
 r_lld_rpa_renew = 0x4000123c;
 r_lld_rpa_renew_evt_canceled_cbk = 0x40001240;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1239,7 +1239,9 @@ r_llc_loc_dl_upd_proc_continue = 0x40003e1c;
 r_llc_loc_encrypt_proc_continue = 0x40003e28;
 r_llc_loc_encrypt_proc_err_cb = 0x40003e34;
 r_llc_loc_feats_exch_proc_continue = 0x40003e40;
+/*
 r_llc_loc_phy_upd_proc_continue = 0x40003e4c;
+*/
 r_llc_loc_phy_upd_proc_err_cb = 0x40003e58;
 r_llc_msg_handler_tab_p_get = 0x40003e64;
 r_llc_pref_param_compute = 0x40003e70;
@@ -1418,13 +1420,17 @@ r_lld_process_cca_data = 0x40004608;
 r_lld_ral_search = 0x40004614;
 r_lld_read_clock = 0x40004620;
 r_lld_res_list_add = 0x4000462c;
+/*
 r_lld_res_list_clear = 0x40004638;
+*/
 r_lld_res_list_is_empty = 0x40004644;
 r_lld_res_list_local_rpa_get = 0x40004650;
 r_lld_res_list_peer_rpa_get = 0x4000465c;
 r_lld_res_list_peer_update = 0x40004668;
 r_lld_res_list_priv_mode_update = 0x40004674;
+/*
 r_lld_res_list_rem = 0x40004680;
+*/
 r_lld_reset_reg = 0x4000468c;
 r_lld_rpa_renew = 0x40004698;
 r_lld_rpa_renew_evt_canceled_cbk = 0x400046a4;