Merge branch 'bugfix/fix_bleqabr23_486' into 'master'

fix(bt/bluedroid): Fixed BLE disconnect event report when disconnecting

See merge request espressif/esp-idf!25370
pull/12131/head
Wang Meng Yang 2023-08-22 21:17:33 +08:00
commit 8466930ac2
3 zmienionych plików z 44 dodań i 1 usunięć

Wyświetl plik

@ -5092,7 +5092,7 @@ void bta_dm_ble_update_conn_params (tBTA_DM_MSG *p_data)
*******************************************************************************/ *******************************************************************************/
void bta_dm_ble_disconnect (tBTA_DM_MSG *p_data) void bta_dm_ble_disconnect (tBTA_DM_MSG *p_data)
{ {
L2CA_RemoveFixedChnl(L2CAP_ATT_CID, p_data->ble_disconnect.remote_bda); L2CA_BleDisconnect(p_data->ble_disconnect.remote_bda);
} }
/******************************************************************************* /*******************************************************************************

Wyświetl plik

@ -1215,6 +1215,19 @@ extern BOOLEAN L2CA_EnableUpdateBleConnParams (BD_ADDR rem_bda, BOOLEAN enable);
** **
*******************************************************************************/ *******************************************************************************/
extern UINT8 L2CA_GetBleConnRole (BD_ADDR bd_addr); extern UINT8 L2CA_GetBleConnRole (BD_ADDR bd_addr);
/*******************************************************************************
**
** Function L2CA_BleDisconnect
**
** Description This function use to disconnect LE connection.
**
** Parameters BD Address of remote
**
** Returns TRUE if disconnect successfully.
**
*******************************************************************************/
extern BOOLEAN L2CA_BleDisconnect (BD_ADDR rem_bda);
#endif /* (BLE_INCLUDED == TRUE) */ #endif /* (BLE_INCLUDED == TRUE) */
/******************************************************************************* /*******************************************************************************

Wyświetl plik

@ -1949,6 +1949,36 @@ BOOLEAN L2CA_RemoveFixedChnl (UINT16 fixed_cid, BD_ADDR rem_bda)
return (TRUE); return (TRUE);
} }
#if BLE_INCLUDED == TRUE
BOOLEAN L2CA_BleDisconnect (BD_ADDR rem_bda)
{
tL2C_LCB *p_lcb;
tGATT_TCB *p_tcb;
p_lcb = l2cu_find_lcb_by_bd_addr (rem_bda, BT_TRANSPORT_LE);
if (p_lcb == NULL) {
return FALSE;
}
if (p_lcb->link_state != LST_CONNECTED) {
return FALSE;
}
p_lcb->disc_reason = HCI_ERR_CONN_CAUSE_LOCAL_HOST;
p_lcb->link_state = LST_DISCONNECTING;
btsnd_hcic_disconnect (p_lcb->handle, HCI_ERR_PEER_USER);
p_tcb = gatt_find_tcb_by_addr(rem_bda, BT_TRANSPORT_LE);
if (p_tcb == NULL) {
return FALSE;
}
gatt_set_ch_state(p_tcb, GATT_CH_CLOSING);
return TRUE;
}
#endif
/******************************************************************************* /*******************************************************************************
** **
** Function L2CA_SetFixedChannelTout ** Function L2CA_SetFixedChannelTout