mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-28 19:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci: use opcode in handle_command_complete_event

Browse Source
This commit is contained in:
Matthias Ringwald 2022-05-09 14:41:55 +02:00
parent afbf1cd74e
commit c70df5f87e
1 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/hci.c
View File

@ -2741,75 +2741,73 @@ static void handle_command_complete_event(uint8_t * packet, uint16_t size){
static void handle_command_status_event(uint8_t * packet, uint16_t size) { static void handle_command_status_event(uint8_t * packet, uint16_t size) {
UNUSED(size); UNUSED(size);
bd_addr_type_t addr_type;
hci_connection_t * conn;
// get num cmd packets - limit to 1 to reduce complexity // get num cmd packets - limit to 1 to reduce complexity
hci_stack->num_cmd_packets = packet[3] ? 1 : 0; hci_stack->num_cmd_packets = packet[3] ? 1 : 0;
// check command status to detected failed outgoing connections // get opcode and command status
bool create_connection_cmd = false; uint16_t opcode = hci_event_command_status_get_command_opcode(packet);
#if defined(ENABLE_CLASSIC) || defined(ENABLE_LE_CENTRAL) || defined(ENABLE_LE_ISOCHRONOUS_STREAMS)
uint8_t status = hci_event_command_status_get_status(packet);
#endif
#if defined(ENABLE_CLASSIC) || defined(ENABLE_LE_CENTRAL)
bd_addr_type_t addr_type;
#endif
switch (opcode){
#ifdef ENABLE_CLASSIC #ifdef ENABLE_CLASSIC
if (HCI_EVENT_IS_COMMAND_STATUS(packet, hci_create_connection)){ case HCI_OPCODE_HCI_CREATE_CONNECTION:
create_connection_cmd = true; case HCI_OPCODE_HCI_ACCEPT_SYNCHRONOUS_CONNECTION:
}
if (HCI_EVENT_IS_COMMAND_STATUS(packet, hci_accept_synchronous_connection)){
create_connection_cmd = true;
}
#endif #endif
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_LE_CENTRAL
if (HCI_EVENT_IS_COMMAND_STATUS(packet, hci_le_create_connection)){ case HCI_OPCODE_HCI_LE_CREATE_CONNECTION:
create_connection_cmd = true;
}
#endif #endif
if (create_connection_cmd) { #if defined(ENABLE_CLASSIC) || defined(ENABLE_LE_CENTRAL)
uint8_t status = hci_event_command_status_get_status(packet); addr_type = hci_stack->outgoing_addr_type;
addr_type = hci_stack->outgoing_addr_type;
conn = hci_connection_for_bd_addr_and_type(hci_stack->outgoing_addr, addr_type);
log_info("command status (create connection), status %x, connection %p, addr %s, type %x", status, conn, bd_addr_to_str(hci_stack->outgoing_addr), addr_type);
// reset outgoing address info // reset outgoing address info
memset(hci_stack->outgoing_addr, 0, 6); memset(hci_stack->outgoing_addr, 0, 6);
hci_stack->outgoing_addr_type = BD_ADDR_TYPE_UNKNOWN; hci_stack->outgoing_addr_type = BD_ADDR_TYPE_UNKNOWN;
// on error // on error
if (status != ERROR_CODE_SUCCESS){ if (status != ERROR_CODE_SUCCESS){
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_LE_CENTRAL
if (hci_is_le_connection_type(addr_type)){ if (hci_is_le_connection_type(addr_type)){
hci_stack->le_connecting_state = LE_CONNECTING_IDLE; hci_stack->le_connecting_state = LE_CONNECTING_IDLE;
hci_stack->le_connecting_request = LE_CONNECTING_IDLE; hci_stack->le_connecting_request = LE_CONNECTING_IDLE;
} }
#endif #endif
// error => outgoing connection failed // error => outgoing connection failed
if (conn != NULL){ hci_connection_t * conn = hci_connection_for_bd_addr_and_type(hci_stack->outgoing_addr, addr_type);
hci_handle_connection_failed(conn, status); if (conn != NULL){
} hci_handle_connection_failed(conn, status);
}
}
#ifdef ENABLE_CLASSIC
if (HCI_EVENT_IS_COMMAND_STATUS(packet, hci_inquiry)){
uint8_t status = hci_event_command_status_get_status(packet);
log_info("command status (inquiry), status %x", status);
if (status == ERROR_CODE_SUCCESS) {
hci_stack->inquiry_state = GAP_INQUIRY_STATE_ACTIVE;
} else {
hci_stack->inquiry_state = GAP_INQUIRY_STATE_IDLE;
}
}
#endif /* ENABLE_CLASSIC */
#ifdef ENABLE_BLE
#ifdef ENABLE_LE_ISOCHRONOUS_STREAMS
if (HCI_EVENT_IS_COMMAND_STATUS(packet, hci_le_create_cis) || HCI_EVENT_IS_COMMAND_STATUS(packet, hci_le_accept_cis_request)){
uint8_t status = hci_event_command_status_get_status(packet);
if (status == ERROR_CODE_SUCCESS){
hci_iso_stream_requested_confirm();
} else {
hci_iso_stream_requested_finalize();
} }
} }
break;
#endif
#ifdef ENABLE_CLASSIC
case HCI_OPCODE_HCI_INQUIRY:
if (status == ERROR_CODE_SUCCESS) {
hci_stack->inquiry_state = GAP_INQUIRY_STATE_ACTIVE;
} else {
hci_stack->inquiry_state = GAP_INQUIRY_STATE_IDLE;
}
break;
#endif
#ifdef ENABLE_LE_ISOCHRONOUS_STREAMS
case HCI_OPCODE_HCI_LE_CREATE_CIS:
case HCI_OPCODE_HCI_LE_ACCEPT_CIS_REQUEST:
if (status == ERROR_CODE_SUCCESS){
hci_iso_stream_requested_confirm();
} else {
hci_iso_stream_requested_finalize();
}
break;
#endif /* ENABLE_LE_ISOCHRONOUS_STREAMS */ #endif /* ENABLE_LE_ISOCHRONOUS_STREAMS */
#endif /* ENABLE_BLE */ default:
break;
}
} }
#ifdef ENABLE_BLE #ifdef ENABLE_BLE