Refactor btm_devctl reset sequence
* Controller bring up on blockable thread now
* Removed some duplicate and commands during controller bring up
* The code to make commands for controller bring up is smaller and better
diff --git a/stack/hcic/hciblecmds.c b/stack/hcic/hciblecmds.c
index 860fb7a..fa46dec 100644
--- a/stack/hcic/hciblecmds.c
+++ b/stack/hcic/hciblecmds.c
@@ -35,68 +35,6 @@
#if (defined BLE_INCLUDED) && (BLE_INCLUDED == TRUE)
-BOOLEAN btsnd_hcic_ble_set_evt_mask (BT_EVENT_MASK event_mask)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_SET_EVENT_MASK)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_SET_EVENT_MASK;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_BLE_SET_EVENT_MASK);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_SET_EVENT_MASK);
- ARRAY8_TO_STREAM (pp, event_mask);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
-
-BOOLEAN btsnd_hcic_ble_read_buffer_size (void)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_BLE_READ_BUFFER_SIZE);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
-BOOLEAN btsnd_hcic_ble_read_local_spt_feat (void)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_BLE_READ_LOCAL_SPT_FEAT);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_ble_set_local_used_feat (UINT8 feat_set[8])
{
BT_HDR *p;
@@ -391,26 +329,6 @@
return (TRUE);
}
-BOOLEAN btsnd_hcic_ble_read_white_list_size (void)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_BLE_READ_WHITE_LIST_SIZE);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_ble_clear_white_list (void)
{
BT_HDR *p;
@@ -707,26 +625,6 @@
return (TRUE);
}
-BOOLEAN btsnd_hcic_ble_read_supported_states (void)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_BLE_READ_SUPPORTED_STATES);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_ble_receiver_test(UINT8 rx_freq)
{
BT_HDR *p;
@@ -806,35 +704,13 @@
p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
p->offset = 0;
- UINT16_TO_STREAM (pp, HCI_READ_LE_HOST_SUPPORTED);
+ UINT16_TO_STREAM (pp, HCI_READ_LE_HOST_SUPPORT);
UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
return (TRUE);
}
-BOOLEAN btsnd_hcic_ble_write_host_supported (UINT8 le_host_spt, UINT8 simul_le_host_spt)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_WRITE_LE_HOST_SUPPORTED)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_WRITE_LE_HOST_SUPPORTED;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_WRITE_LE_HOST_SUPPORTED);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_WRITE_LE_HOST_SUPPORTED);
- UINT8_TO_STREAM (pp, le_host_spt);
- UINT8_TO_STREAM (pp, simul_le_host_spt);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
#if (defined BLE_LLT_INCLUDED) && (BLE_LLT_INCLUDED == TRUE)
BOOLEAN btsnd_hcic_ble_rc_param_req_reply( UINT16 handle,
diff --git a/stack/hcic/hcicmds.c b/stack/hcic/hcicmds.c
index 3b2e1f5..6130c38 100644
--- a/stack/hcic/hcicmds.c
+++ b/stack/hcic/hcicmds.c
@@ -1065,27 +1065,6 @@
return (TRUE);
}
-BOOLEAN btsnd_hcic_set_event_mask(UINT8 local_controller_id, BT_EVENT_MASK event_mask)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_SET_EVENT_MASK)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_SET_EVENT_MASK;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_SET_EVENT_MASK);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_SET_EVENT_MASK);
- ARRAY8_TO_STREAM (pp, event_mask);
-
- btu_hcif_send_cmd (local_controller_id, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_set_event_mask_page_2 (UINT8 local_controller_id, BT_EVENT_MASK event_mask)
{
BT_HDR *p;
@@ -1107,34 +1086,6 @@
return (TRUE);
}
-BOOLEAN btsnd_hcic_reset (UINT8 local_controller_id)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_RESET)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_RESET;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_RESET);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_RESET);
-
- btu_hcif_send_cmd (local_controller_id, p);
-/* If calling from LMP_TEST or ScriptEngine, then send HCI command immediately */
-#if (!defined (LMP_TEST) && !defined(BTISE))
- if (local_controller_id == LOCAL_BR_EDR_CONTROLLER_ID)
- {
- btm_acl_reset_paging ();
- btm_acl_set_discing (FALSE);
- }
-#endif
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_set_event_filter (UINT8 filt_type, UINT8 filt_cond_type,
UINT8 *filt_cond, UINT8 filt_cond_len)
{
@@ -1997,32 +1948,6 @@
return (TRUE);
}
-BOOLEAN btsnd_hcic_set_host_buf_size (UINT16 acl_len, UINT8 sco_len,
- UINT16 acl_num, UINT16 sco_num)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_SET_HOST_BUF_SIZE)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_SET_HOST_BUF_SIZE;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_HOST_BUFFER_SIZE);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_SET_HOST_BUF_SIZE);
-
- UINT16_TO_STREAM (pp, acl_len);
- UINT8_TO_STREAM (pp, sco_len);
- UINT16_TO_STREAM (pp, acl_num);
- UINT16_TO_STREAM (pp, sco_num);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_host_num_xmitted_pkts (UINT8 num_handles, UINT16 *handle,
UINT16 *num_pkts)
{
@@ -2319,29 +2244,6 @@
}
#endif /* BTM_EIR_SERVER_INCLUDED == TRUE */
-/**** Simple Pairing Commands ****/
-BOOLEAN btsnd_hcic_write_simple_pairing_mode (UINT8 mode)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_W_SIMP_PAIR)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_W_SIMP_PAIR;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_WRITE_SIMPLE_PAIRING_MODE);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_W_SIMP_PAIR);
-
- UINT8_TO_STREAM (pp, mode);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_read_simple_pairing_mode (void)
{
BT_HDR *p;
@@ -2737,108 +2639,6 @@
** End of Lisbon Commands
**************************/
-BOOLEAN btsnd_hcic_read_local_ver (UINT8 local_controller_id)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_READ_LOCAL_VERSION_INFO);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (local_controller_id, p);
- return (TRUE);
-}
-
-BOOLEAN btsnd_hcic_read_local_supported_cmds (UINT8 local_controller_id)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_READ_LOCAL_SUPPORTED_CMDS);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (local_controller_id, p);
- return (TRUE);
-}
-
-BOOLEAN btsnd_hcic_read_local_features (void)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_READ_LOCAL_FEATURES);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
-BOOLEAN btsnd_hcic_read_local_ext_features (UINT8 page_num)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_LOCAL_EXT_FEATURES)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_LOCAL_EXT_FEATURES;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_READ_LOCAL_EXT_FEATURES);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_LOCAL_EXT_FEATURES);
-
- UINT8_TO_STREAM (pp, page_num);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
-BOOLEAN btsnd_hcic_read_buffer_size (void)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_READ_BUFFER_SIZE);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_read_country_code (void)
{
BT_HDR *p;
@@ -2859,26 +2659,6 @@
return (TRUE);
}
-BOOLEAN btsnd_hcic_read_bd_addr (void)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_READ_CMD)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_READ_CMD;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_READ_BD_ADDR);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_READ_CMD);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_read_fail_contact_count (UINT8 local_controller_id, UINT16 handle)
{
BT_HDR *p;