From 657dc39e366b650ffe9e09710fdc03ce72cb3081 Mon Sep 17 00:00:00 2001 From: chenjianhua Date: Thu, 30 Nov 2023 21:11:01 +0800 Subject: [PATCH 1/5] fix(bt/bluedroid): Fixed add RPA to white list --- components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c b/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c index dd6c0a176e..4cb282b79a 100644 --- a/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c +++ b/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c @@ -298,7 +298,7 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBLE_ADDR_ addr_type = p_dev_rec->ble.static_addr_type; } - // white list must be public address or static random address + // The device to be added to white list must be public address or random address if(addr_type == BLE_ADDR_RANDOM) { /* A static address is a 48-bit randomly generated address and shall meet the following requirements: @@ -307,8 +307,7 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBLE_ADDR_ • All bits of the random part of the address shall not be equal to 0 */ invalid_rand_addr_b[0] = invalid_rand_addr_b[0] | BT_STATIC_RAND_ADDR_MASK; - if((bd_addr[0] & BT_STATIC_RAND_ADDR_MASK) == BT_STATIC_RAND_ADDR_MASK - && memcmp(invalid_rand_addr_a, bd_addr, BD_ADDR_LEN) != 0 + if(memcmp(invalid_rand_addr_a, bd_addr, BD_ADDR_LEN) != 0 && memcmp(invalid_rand_addr_b, bd_addr, BD_ADDR_LEN) != 0){ // do nothing } else { From 046197584607b749b500941c1d3cb564c6faa15e Mon Sep 17 00:00:00 2001 From: chenjianhua Date: Tue, 5 Dec 2023 21:10:45 +0800 Subject: [PATCH 2/5] fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(b8f0db9) - Fixed assert when llcp instant passed - Fixed assert for instant passed workaround - Fixed add RPA to white list - Fixed AES encryption for RPA resolution --- components/bt/controller/lib_esp32c3_family | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family index aa07062f55..daf7bf460e 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit aa07062f55b5d9699e5f72761f70f96f71778af0 +Subproject commit daf7bf460ee88a66f3cf86da1cb9ff3877d71d89 diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld index b1be769bb3..bfe351ee31 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld @@ -114,7 +114,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_con_evt_start_cbk_eco = 0x40001d1c; r_lld_scan_evt_start_cbk_eco = 0x40001d20; r_lld_scan_start_eco = 0x40001d24; r_lld_ext_scan_dynamic_pti_process_eco = 0x40001d28; @@ -203,7 +202,6 @@ r_sch_arb_event_start_isr = 0x400014f8; r_sch_plan_set = 0x40001534; r_sch_prog_end_isr = 0x40001538; r_lld_adv_ext_chain_scannable_construct = 0x40001b58; -r_lld_con_tx_prog_new_packet = 0x40001b74; r_lld_scan_process_pkt_rx = 0x40001280; r_llm_le_features_get = 0x400013b0; @@ -218,6 +216,8 @@ r_lld_adv_frm_isr_eco = 0x40001d00; r_lld_res_list_clear = 0x40004638; r_lld_res_list_rem = 0x40004680; r_lld_adv_start_hook = 0x40001c80; +r_lld_con_evt_start_cbk_eco = 0x40001d1c; +r_lld_con_tx_prog_new_packet = 0x40001b74; */ From fa7e4d8e687b69da5c203b6b7cc42ab434148db8 Mon Sep 17 00:00:00 2001 From: shangke Date: Mon, 27 Nov 2023 20:37:11 +0800 Subject: [PATCH 3/5] fix(bt/controller): Fixed some HCI commands parameter --- 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 cddb921d20..06ad44e581 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit cddb921d20418cef04de83ddfe3543463dfbc2bc +Subproject commit 06ad44e581b3141929850cd705c735d0bd3207b0 From 79e80d913432026b809aa5e16e318dde080136dd Mon Sep 17 00:00:00 2001 From: chenjianhua Date: Fri, 24 Nov 2023 20:16:03 +0800 Subject: [PATCH 4/5] fix(bt): Update bt lib for ESP32(fa43201) - Fixed assert for instant passed workaround - Fixed scan evt timeout - Fixed random address setting when scanning --- 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 06ad44e581..d1d4b7635d 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 06ad44e581b3141929850cd705c735d0bd3207b0 +Subproject commit d1d4b7635d01edc40cbd0605376afd804ba4afb9 From 558dca6859cb32c71a66872bda21fd41106b69df Mon Sep 17 00:00:00 2001 From: chenjianhua Date: Fri, 8 Dec 2023 20:04:00 +0800 Subject: [PATCH 5/5] fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(65db61f) - Fixed remove and clear white list --- components/bt/controller/lib_esp32c3_family | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family index daf7bf460e..e4fa791c0d 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit daf7bf460ee88a66f3cf86da1cb9ff3877d71d89 +Subproject commit e4fa791c0db81a4702b78a99be9c561f19260022