From 1b3672489789c4aeb29fb8cc1269be7cc96f7b06 Mon Sep 17 00:00:00 2001
From: chenjianhua <chenjianhua@espressif.com>
Date: Mon, 3 Jun 2024 11:14:46 +0800
Subject: [PATCH] fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(0738a61)

- Fixed BT BB interrupt allocation
- Refactor the prefix of assert print
- Fixed HCI LE set privacy mode command handle
---
 components/bt/controller/lib_esp32c3_family       | 2 +-
 components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 2 +-
 components/esp_rom/esp32c3/ld/esp32c3.rom.ld      | 4 ++--
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family
index 1a086eab61..29d5555ca1 160000
--- a/components/bt/controller/lib_esp32c3_family
+++ b/components/bt/controller/lib_esp32c3_family
@@ -1 +1 @@
-Subproject commit 1a086eab61e78fa243d67c33206ece4022129ee1
+Subproject commit 29d5555ca1febeb132f5a13556893f3419d2d640
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
index e45a80e496..b2710d0da5 100644
--- 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;
@@ -215,6 +214,7 @@ 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;
 */
 
 
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index b454cd5986..77b4cfbdc6 100644
--- 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
index ea7f4737ba..6e6187961d 100644
--- 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;