hci: swap write page timeout with write scan enable

This commit is contained in:
Matthias Ringwald 2021-09-28 14:03:32 +02:00
parent 6fad2c3769
commit 7ffc99325d
2 changed files with 7 additions and 7 deletions

View File

@ -1947,13 +1947,13 @@ static void hci_initializing_event_handler(const uint8_t * packet, uint16_t size
case HCI_INIT_W4_WRITE_INQUIRY_MODE:
// skip write secure connections host support if not supported or disabled
if (!hci_stack->secure_connections_enable || (hci_stack->local_supported_commands[1u] & 0x02u) == 0u) {
hci_stack->substate = HCI_INIT_WRITE_SCAN_ENABLE;
hci_stack->substate = HCI_INIT_WRITE_PAGE_TIMEOUT;
return;
}
break;
#ifdef ENABLE_SCO_OVER_HCI
case HCI_INIT_W4_WRITE_SCAN_ENABLE:
case HCI_INIT_W4_WRITE_PAGE_TIMEOUT:
// skip write synchronous flow control if not supported
if (hci_stack->local_supported_commands[0] & 0x04) break;
hci_stack->substate = HCI_INIT_W4_WRITE_SYNCHRONOUS_FLOW_CONTROL_ENABLE;
@ -1985,7 +1985,7 @@ static void hci_initializing_event_handler(const uint8_t * packet, uint16_t size
#else /* !ENABLE_SCO_OVER_HCI */
case HCI_INIT_W4_WRITE_SCAN_ENABLE:
case HCI_INIT_W4_WRITE_PAGE_TIMEOUT:
#ifdef ENABLE_SCO_OVER_PCM
if (hci_stack->manufacturer == BLUETOOTH_COMPANY_ID_BROADCOM_CORPORATION) {
hci_stack->substate = HCI_INIT_BCM_WRITE_SCO_PCM_INT;

View File

@ -710,14 +710,14 @@ typedef enum hci_init_state{
HCI_INIT_WRITE_SIMPLE_PAIRING_MODE,
HCI_INIT_W4_WRITE_SIMPLE_PAIRING_MODE,
HCI_INIT_WRITE_PAGE_TIMEOUT,
HCI_INIT_W4_WRITE_PAGE_TIMEOUT,
HCI_INIT_WRITE_SCAN_ENABLE,
HCI_INIT_W4_WRITE_SCAN_ENABLE,
HCI_INIT_WRITE_INQUIRY_MODE,
HCI_INIT_W4_WRITE_INQUIRY_MODE,
HCI_INIT_WRITE_SECURE_CONNECTIONS_HOST_ENABLE,
HCI_INIT_W4_WRITE_SECURE_CONNECTIONS_HOST_ENABLE,
HCI_INIT_WRITE_SCAN_ENABLE,
HCI_INIT_W4_WRITE_SCAN_ENABLE,
HCI_INIT_WRITE_PAGE_TIMEOUT,
HCI_INIT_W4_WRITE_PAGE_TIMEOUT,
// SCO over HCI
HCI_INIT_WRITE_SYNCHRONOUS_FLOW_CONTROL_ENABLE,