Merge branch 'bugfix/fix_ble_cannot_create_conn_v5.3' into 'release/v5.3'

jack0c · jack0c · commit b81f35157b64 · 2024-07-26T11:54:58.000+08:00
fix(ble/bluedroid): Fixed BLE cannot create connection(v5.3)

See merge request espressif/esp-idf!32306
diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c
@@ -5419,6 +5419,10 @@ void bta_dm_ble_scan (tBTA_DM_MSG *p_data)
             status = (status == BTM_CMD_STARTED ? BTA_SUCCESS : BTA_FAILURE);
             p_data->ble_scan.p_stop_scan_cback(status);
         }
+
+        // reset BLE scan link state when stop scan
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_ACTIVE_SCAN_BIT);
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_PASSIVE_SCAN_BIT);
     }
 }
 
diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c b/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c
@@ -4009,6 +4009,9 @@ static void btm_ble_stop_discover(void)
         if(btsnd_hcic_ble_set_scan_enable (BTM_BLE_SCAN_DISABLE, BTM_BLE_DUPLICATE_ENABLE)) {
             osi_sem_take(&scan_enable_sem, OSI_SEM_MAX_TIMEOUT);
         }
+        /* reset status */
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_ACTIVE_SCAN_BIT);
+        btm_ble_clear_topology_mask(BTM_BLE_STATE_PASSIVE_SCAN_BIT);
     }
 
     if (p_scan_cb) {

Original file line number	Diff line number	Diff line change
`@@ -5419,6 +5419,10 @@ void bta_dm_ble_scan (tBTA_DM_MSG *p_data)`
`5419`	`5419`	`status = (status == BTM_CMD_STARTED ? BTA_SUCCESS : BTA_FAILURE);`
`5420`	`5420`	`p_data->ble_scan.p_stop_scan_cback(status);`
`5421`	`5421`	`}`
	`5422`	`+`
	`5423`	`+ // reset BLE scan link state when stop scan`
	`5424`	`+ btm_ble_clear_topology_mask(BTM_BLE_STATE_ACTIVE_SCAN_BIT);`
	`5425`	`+ btm_ble_clear_topology_mask(BTM_BLE_STATE_PASSIVE_SCAN_BIT);`
`5422`	`5426`	`}`
`5423`	`5427`	`}`
`5424`	`5428`
Original file line number	Diff line number	Diff line change
`@@ -4009,6 +4009,9 @@ static void btm_ble_stop_discover(void)`
`4009`	`4009`	`if(btsnd_hcic_ble_set_scan_enable (BTM_BLE_SCAN_DISABLE, BTM_BLE_DUPLICATE_ENABLE)) {`
`4010`	`4010`	`osi_sem_take(&scan_enable_sem, OSI_SEM_MAX_TIMEOUT);`
`4011`	`4011`	`}`
	`4012`	`+ /* reset status */`
	`4013`	`+ btm_ble_clear_topology_mask(BTM_BLE_STATE_ACTIVE_SCAN_BIT);`
	`4014`	`+ btm_ble_clear_topology_mask(BTM_BLE_STATE_PASSIVE_SCAN_BIT);`
`4012`	`4015`	`}`
`4013`	`4016`
`4014`	`4017`	`if (p_scan_cb) {`