mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-19 14:26:01 -04:00
Merge 118df6ddaa
into 3c99557eee
This commit is contained in:
commit
902548c9f7
@ -2290,6 +2290,7 @@ UINT8 btm_proc_smp_cback(tSMP_EVT event, BD_ADDR bd_addr, tSMP_EVT_DATA *p_data)
|
|||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
}
|
||||||
if (event == SMP_SC_LOC_OOB_DATA_UP_EVT) {
|
if (event == SMP_SC_LOC_OOB_DATA_UP_EVT) {
|
||||||
tBTM_LE_EVT_DATA evt_data;
|
tBTM_LE_EVT_DATA evt_data;
|
||||||
memcpy(&evt_data.local_oob_data, &p_data->loc_oob_data, sizeof(tSMP_LOC_OOB_DATA));
|
memcpy(&evt_data.local_oob_data, &p_data->loc_oob_data, sizeof(tSMP_LOC_OOB_DATA));
|
||||||
@ -2299,7 +2300,6 @@ UINT8 btm_proc_smp_cback(tSMP_EVT event, BD_ADDR bd_addr, tSMP_EVT_DATA *p_data)
|
|||||||
} else {
|
} else {
|
||||||
BTM_TRACE_ERROR("btm_proc_smp_cback received for unknown device");
|
BTM_TRACE_ERROR("btm_proc_smp_cback received for unknown device");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif ///SMP_INCLUDED == TRUE
|
#endif ///SMP_INCLUDED == TRUE
|
||||||
|
Loading…
Reference in New Issue
Block a user