Merge branch 'bugfix/fix_some_ble_bugs_240531' into 'master'

Fixed some BLE bugs 240531 on ESP32C3 (0738a61) See merge request espressif/esp-idf!31260
espressif · Jun 12, 2024 · 8057d80 · 8057d80
2 parents cd1ec84 + 1214a96
commit 8057d80
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
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.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -115,7 +115,6 @@ r_lld_con_evt_time_update_eco = 0x40001d0c;
 r_lld_con_start_eco = 0x40001d10;
 r_lld_con_frm_isr_eco = 0x40001d14;
 r_lld_con_tx_eco = 0x40001d18;
-r_lld_scan_evt_start_cbk_eco = 0x40001d20;
 r_lld_ext_scan_dynamic_pti_process_eco = 0x40001d28;
 r_lld_scan_frm_eof_isr_eco = 0x40001d2c;
 r_lld_sync_start_eco = 0x40001d30;
@@ -142,7 +141,6 @@ r_bt_bb_recorrect_is_dead = 0x40001d84;
 r_bt_bb_restart_hw_recorrect = 0x40001d88;
 r_ke_task_handler_pre = 0x40001da0;
 r_ke_task_handler_end = 0x40001da4;
-r_ke_task_handler_get_overwrite = 0x40001da8;
 r_lld_scan_frm_skip_isr_eco = 0x40001db0;
 r_lld_ext_scan_dynamic_pti_reset = 0x40001db4;
 r_llc_rem_phy_upd_proc_continue_eco = 0x40001db8;
@@ -215,6 +213,8 @@ r_lld_scan_start_eco = 0x40001d24;
 r_lld_scan_try_sched_eco = 0x40001dac;
 r_lld_scan_start_hook = 0x40001c74;
 r_lld_init_start_hook = 0x40001cb8;
+r_lld_scan_evt_start_cbk_eco = 0x40001d20;
+r_ke_task_handler_get_overwrite = 0x40001da8;
 */
 
 

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1107,7 +1107,7 @@ 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_priv_mode_update = 0x40001230; */
 r_lld_reset_reg = 0x40001238;
 r_lld_rpa_renew = 0x4000123c;
 r_lld_rpa_renew_evt_canceled_cbk = 0x40001240;
@@ -1246,7 +1246,7 @@ r_rwble_sleep_wakeup_end = 0x4000146c;
 /* r_rwbtdm_isr_wrapper = 0x40001470; */
 r_rwip_active_check = 0x40001474;
 r_rwip_aes_encrypt = 0x40001478;
-r_rwip_assert = 0x4000147c;
+/* r_rwip_assert = 0x4000147c; */
 r_rwip_crypt_evt_handler = 0x40001480;
 r_rwip_crypt_isr_handler = 0x40001484;
 r_rwip_eif_get = 0x40001488;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1357,7 +1357,7 @@ 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_priv_mode_update = 0x40004674; */
 r_lld_reset_reg = 0x4000468c;
 r_lld_rpa_renew = 0x40004698;
 r_lld_rpa_renew_evt_canceled_cbk = 0x400046a4;
@@ -1496,7 +1496,7 @@ r_rwble_sleep_wakeup_end = 0x40004d28;
 /* r_rwbtdm_isr_wrapper = 0x40004d34; */
 r_rwip_active_check = 0x40004d40;
 r_rwip_aes_encrypt = 0x40004d4c;
-r_rwip_assert = 0x40004d58;
+/* r_rwip_assert = 0x40004d58; */
 r_rwip_crypt_evt_handler = 0x40004d64;
 r_rwip_crypt_isr_handler = 0x40004d70;
 r_rwip_eif_get = 0x40004d7c;