From eee102f4ee44e8950ba5cf56feddd89b5944b5e3 Mon Sep 17 00:00:00 2001 From: gongyantao Date: Tue, 14 May 2024 09:59:20 +0800 Subject: [PATCH 1/2] fix(bt/ble): fix some issues in bluetooth controller 1: fix assert 1024 issue when bt tx and wifi coexist on esp32 2: fix ble scan backoff 3: parse out the correct packet types from host parameters for hci command hci_enhanced_setup_synchronous_connection --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index 43ecd22ec6..45e3280535 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 43ecd22ec6b5b484709693ae8e86478a7f130f17 +Subproject commit 45e328053591081abcd387ec2eecc8add43f4b15 From b6028aa34e592aff01c6467c40e1877996efbbab Mon Sep 17 00:00:00 2001 From: Jin Cheng Date: Tue, 2 Apr 2024 09:18:18 +0800 Subject: [PATCH 2/2] fix(bt/controller): Parse out the correct packet types from Host parameters - For HCI command HCI_Enhanced_Setup_Synchronous_Connection --- components/esp_rom/esp32/ld/esp32.rom.ld | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index 6db4cdcfce..eaf7329859 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.ld @@ -1473,7 +1473,7 @@ PROVIDE ( uart_tx_switch = 0x40009028 ); /* These functions are part of the ROM GPIO driver. We do not use them; the provided esp-idf functions -replace them and this way we can re-use the fixed RAM addresses these routines need. +replace them and this way we can reuse the fixed RAM addresses these routines need. */ /* <-- So you don't read over it: This comment disables the next lines. PROVIDE ( gpio_init = 0x40009c20 ); @@ -1622,6 +1622,7 @@ PROVIDE ( ld_acl_sniff_trans_sched = 0x40033734 ); PROVIDE ( lc_pwr_decr_ind_handler = 0x4002859c ); PROVIDE ( lc_pwr_incr_ind_handler = 0x400284a8 ); PROVIDE ( lc_pwr_max_ind_handler = 0x40028690 ); +PROVIDE ( lc_setup_sync_param_check = 0x4002354c ); PROVIDE ( lm_sync_conf = 0x3ffb8348 ); PROVIDE ( lm_nb_sync_active = 0x3ffb8346 );