Skip to content

Commit 22dcdce

Browse files
committed
Merge branch 'bugfix/btdm_scan_result_of_adv_type_wrong' into 'master'
component/bt: Fix bug:scan result of adv type is wrong See merge request idf/esp-idf!1897
2 parents 7ade59d + 79fd3f4 commit 22dcdce

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

components/bt/bluedroid/bta/dm/bta_dm_act.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2645,7 +2645,7 @@ static UINT8 bta_dm_authorize_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NA
26452645
return BTM_NOT_AUTHORIZED;
26462646
}
26472647
}
2648-
2648+
26492649

26502650

26512651

@@ -4182,6 +4182,8 @@ static void bta_dm_observe_results_cb (tBTM_INQ_RESULTS *p_inq, UINT8 *p_eir)
41824182
result.inq_res.flag = p_inq->flag;
41834183
result.inq_res.adv_data_len = p_inq->adv_data_len;
41844184
result.inq_res.scan_rsp_len = p_inq->scan_rsp_len;
4185+
memcpy(result.inq_res.dev_class, p_inq->dev_class, sizeof(DEV_CLASS));
4186+
result.inq_res.ble_evt_type = p_inq->ble_evt_type;
41854187

41864188
/* application will parse EIR to find out remote device name */
41874189
result.inq_res.p_eir = p_eir;
@@ -4338,7 +4340,7 @@ static UINT8 bta_dm_ble_smp_cback (tBTM_LE_EVT event, BD_ADDR bda, tBTM_LE_EVT_D
43384340
} else {
43394341
sec_event.auth_cmpl.success = TRUE;
43404342
if (!p_data->complt.smp_over_br) {
4341-
4343+
43424344
}
43434345
}
43444346

@@ -5394,7 +5396,7 @@ static void bta_ble_energy_info_cmpl(tBTM_BLE_TX_TIME_MS tx_time,
53945396
if (BTA_SUCCESS == st) {
53955397
ctrl_state = bta_dm_pm_obtain_controller_state();
53965398
}
5397-
#endif
5399+
#endif
53985400
if (bta_dm_cb.p_energy_info_cback) {
53995401
bta_dm_cb.p_energy_info_cback(tx_time, rx_time, idle_time, energy_used, ctrl_state, st);
54005402
}

0 commit comments

Comments
 (0)