mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-17 07:19:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci: handle start inquiry failure

Browse Source
This commit is contained in:
Matthias Ringwald 2021-03-11 15:43:35 +01:00
parent bea424a5ab
commit beb3c81d4f
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@ GATT Client: Scan Parameters Service Client
GAP: add gap_set_page_scan_activity and gap_set_page_scan_type
### Fixed
HCI: handle start inquiry failure
### Changed
HCI: config I2S for BCM Controllers if `ENABLE_SCO_OVER_PCM`, reduce bit clock to 256/512 kHz

27
src/hci.c
View File

@ -113,12 +113,13 @@
#endif
// GAP inquiry state: 0 = off, 0x01 - 0x30 = requested duration, 0xfe = active, 0xff = stop requested
#define GAP_INQUIRY_DURATION_MIN 0x01
#define GAP_INQUIRY_DURATION_MAX 0x30
#define GAP_INQUIRY_STATE_ACTIVE 0x80
#define GAP_INQUIRY_STATE_IDLE 0
#define GAP_INQUIRY_STATE_W2_CANCEL 0x81
#define GAP_INQUIRY_STATE_W4_CANCELLED 0x82
#define GAP_INQUIRY_DURATION_MIN 0x01
#define GAP_INQUIRY_DURATION_MAX 0x30
#define GAP_INQUIRY_STATE_IDLE 0x00
#define GAP_INQUIRY_STATE_W4_ACTIVE 0x80
#define GAP_INQUIRY_STATE_ACTIVE 0x81
#define GAP_INQUIRY_STATE_W2_CANCEL 0x82
#define GAP_INQUIRY_STATE_W4_CANCELLED 0x83
// GAP Remote Name Request
#define GAP_REMOTE_NAME_STATE_IDLE 0
@ -2385,6 +2386,18 @@ static void event_handler(uint8_t *packet, uint16_t size){
}
}
}
#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
break;
case HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS:{
@ -3789,7 +3802,7 @@ static bool hci_run_general_gap_classic(void){
// start/stop inquiry
if ((hci_stack->inquiry_state >= GAP_INQUIRY_DURATION_MIN) && (hci_stack->inquiry_state <= GAP_INQUIRY_DURATION_MAX)){
uint8_t duration = hci_stack->inquiry_state;
hci_stack->inquiry_state = GAP_INQUIRY_STATE_ACTIVE;
hci_stack->inquiry_state = GAP_INQUIRY_STATE_W4_ACTIVE;
hci_send_cmd(&hci_inquiry, GAP_IAC_GENERAL_INQUIRY, duration, 0);
return true;
}