feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_esp32_some_bugs_v4.1' into 'release/v4.1'

Browse Source 
Fixed BLE ASSERT_PARAM(32 0) in rwble.c at line 384 on ESP32(backport v4.1)

See merge request espressif/esp-idf!20764
This commit is contained in:
Jiang Jiang Jian
2022-10-26 10:55:58 +08:00
parent af9e3e827f 901828c1d8
commit 8da39d82ca
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/lib

Submodule components/bt/controller/lib updated: c98341759b...6ca6561fe5

2
components/bt/host/bluedroid/Kconfig.in
View File

@@ -977,7 +977,7 @@ config BT_SMP_ENABLE
config BT_BLE_ACT_SCAN_REP_ADV_SCAN config BT_BLE_ACT_SCAN_REP_ADV_SCAN
bool "Report adv data and scan response individually when BLE active scan" bool "Report adv data and scan response individually when BLE active scan"
depends on BT_BLUEDROID_ENABLED && (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY) depends on BT_BLUEDROID_ENABLED && BT_BLE_ENABLED
default n default n
help help
Originally, when doing BLE active scan, Bluedroid will not report adv to application layer Originally, when doing BLE active scan, Bluedroid will not report adv to application layer

5
components/bt/host/bluedroid/stack/btm/btm_ble_gap.c
View File

@@ -3584,8 +3584,7 @@ static void btm_ble_process_adv_pkt_cont(BD_ADDR bda, UINT8 addr_type, UINT8 evt
0x04 Scan Response (SCAN_RSP) 0x04 Scan Response (SCAN_RSP)
0x05-0xFF Reserved for future use 0x05-0xFF Reserved for future use
*/ */
//if scan duplicate is enabled, the adv packet without scan response is allowed to report to higher layer // The adv packet without scan response is allowed to report to higher layer
if(p_le_inq_cb->scan_duplicate_filter == BTM_BLE_SCAN_DUPLICATE_ENABLE) {
/* /*
Bluedroid will put the advertising packet and scan response into a packet and send it to the higher layer. Bluedroid will put the advertising packet and scan response into a packet and send it to the higher layer.
If two advertising packets are not with the same address, or can't be combined into a packet, then the first advertising If two advertising packets are not with the same address, or can't be combined into a packet, then the first advertising
@@ -3598,7 +3597,7 @@ static void btm_ble_process_adv_pkt_cont(BD_ADDR bda, UINT8 addr_type, UINT8 evt
if (same_addr != 0 || (same_addr == 0 && evt_type != BTM_BLE_SCAN_RSP_EVT)) { if (same_addr != 0 || (same_addr == 0 && evt_type != BTM_BLE_SCAN_RSP_EVT)) {
btm_ble_process_last_adv_pkt(); btm_ble_process_last_adv_pkt();
} }
}
p_i = btm_inq_db_find (bda); p_i = btm_inq_db_find (bda);