From fb02632df3d743ef8d30a79338dc500ece8342f5 Mon Sep 17 00:00:00 2001
From: Zach Johnson <zachoverflow@google.com>
Date: Wed, 7 Jan 2015 09:37:20 -0800
Subject: [PATCH] Remove unused read link policy + friends
Was never called, and the removal of which obviated
a lot of other code.
---
system/stack/btm/btm_acl.c | 128 ---------------------------------
system/stack/btm/btm_devctl.c | 10 ---
system/stack/btm/btm_int.h | 4 --
system/stack/btu/btu_hcif.c | 4 --
system/stack/btu/btu_task.c | 4 --
system/stack/hcic/hcicmds.c | 22 ------
system/stack/include/btm_api.h | 27 -------
system/stack/include/hcimsgs.h | 2 -
8 files changed, 201 deletions(-)
diff --git a/system/stack/btm/btm_acl.c b/system/stack/btm/btm_acl.c
index 705f8ed89df..f4427e8df71 100644
--- a/system/stack/btm/btm_acl.c
+++ b/system/stack/btm/btm_acl.c
@@ -905,104 +905,6 @@ void BTM_SetDefaultLinkPolicy (UINT16 settings)
btsnd_hcic_write_def_policy_set(settings);
}
-
-/*******************************************************************************
-**
-** Function BTM_ReadLinkPolicy
-**
-** Description This function is called to read the link policy settings.
-** The address of link policy results are returned in the callback.
-** (tBTM_LNK_POLICY_RESULTS)
-**
-** Returns status of the operation
-**
-*******************************************************************************/
-tBTM_STATUS BTM_ReadLinkPolicy (BD_ADDR remote_bda, tBTM_CMPL_CB *p_cb)
-{
- tACL_CONN *p;
-
- BTM_TRACE_API ("BTM_ReadLinkPolicy: RemBdAddr: %02x%02x%02x%02x%02x%02x",
- remote_bda[0], remote_bda[1], remote_bda[2],
- remote_bda[3], remote_bda[4], remote_bda[5]);
-
- /* If someone already waiting on the version, do not allow another */
- if (btm_cb.devcb.p_rlinkp_cmpl_cb)
- return(BTM_BUSY);
-
- p = btm_bda_to_acl(remote_bda, BT_TRANSPORT_BR_EDR);
- if (p != (tACL_CONN *)NULL)
- {
- btu_start_timer (&btm_cb.devcb.rlinkp_timer, BTU_TTYPE_BTM_ACL, BTM_DEV_REPLY_TIMEOUT);
- btm_cb.devcb.p_rlinkp_cmpl_cb = p_cb;
-
- if (!btsnd_hcic_read_policy_set (p->hci_handle))
- {
- btu_stop_timer (&btm_cb.devcb.rlinkp_timer);
- btm_cb.devcb.p_rlinkp_cmpl_cb = NULL;
- return(BTM_NO_RESOURCES);
- }
-
- return(BTM_CMD_STARTED);
- }
-
- /* If here, no BD Addr found */
- return(BTM_UNKNOWN_ADDR);
-}
-
-
-/*******************************************************************************
-**
-** Function btm_read_link_policy_complete
-**
-** Description This function is called when the command complete message
-** is received from the HCI for the read local link policy request.
-**
-** Returns void
-**
-*******************************************************************************/
-void btm_read_link_policy_complete (UINT8 *p)
-{
- tBTM_CMPL_CB *p_cb = btm_cb.devcb.p_rlinkp_cmpl_cb;
- tBTM_LNK_POLICY_RESULTS lnkpol;
- UINT16 handle;
- tACL_CONN *p_acl_cb = &btm_cb.acl_db[0];
- UINT16 index;
- BTM_TRACE_DEBUG ("btm_read_link_policy_complete");
- btu_stop_timer (&btm_cb.devcb.rlinkp_timer);
-
- /* If there was a callback address for read local version, call it */
- btm_cb.devcb.p_rlinkp_cmpl_cb = NULL;
-
- if (p_cb)
- {
- STREAM_TO_UINT8 (lnkpol.hci_status, p);
-
- if (lnkpol.hci_status == HCI_SUCCESS)
- {
- lnkpol.status = BTM_SUCCESS;
-
- STREAM_TO_UINT16 (handle, p);
-
- STREAM_TO_UINT16 (lnkpol.settings, p);
-
- /* Search through the list of active channels for the correct BD Addr */
- for (index = 0; index < MAX_L2CAP_LINKS; index++, p_acl_cb++)
- {
- if ((p_acl_cb->in_use) && (handle == p_acl_cb->hci_handle))
- {
- memcpy (lnkpol.rem_bda, p_acl_cb->remote_addr, BD_ADDR_LEN);
- break;
- }
- }
- }
- else
- lnkpol.status = BTM_ERR_PROCESSING;
-
- (*p_cb)(&lnkpol);
- }
-}
-
-
/*******************************************************************************
**
** Function btm_read_remote_version_complete
@@ -1862,36 +1764,6 @@ BOOLEAN BTM_FreeSCN(UINT8 scn)
#endif
-
-/*******************************************************************************
-**
-** Function btm_acl_timeout
-**
-** Description This function is called when a timer list entry expires.
-**
-** Returns void
-**
-*******************************************************************************/
-void btm_acl_timeout (TIMER_LIST_ENT *p_tle)
-{
- UINT32 timer_type = p_tle->param;
-
- BTM_TRACE_DEBUG ("btm_acl_timeout");
- if (timer_type == TT_DEV_RLNKP)
- {
- tBTM_CMPL_CB *p_cb = btm_cb.devcb.p_rlinkp_cmpl_cb;
- tBTM_LNK_POLICY_RESULTS lnkpol;
-
- lnkpol.status = BTM_ERR_PROCESSING;
- lnkpol.settings = 0;
-
- btm_cb.devcb.p_rlinkp_cmpl_cb = NULL;
-
- if (p_cb)
- (*p_cb)(&lnkpol);
- }
-}
-
/*******************************************************************************
**
** Function btm_set_packet_types
diff --git a/system/stack/btm/btm_devctl.c b/system/stack/btm/btm_devctl.c
index 61f23913d39..688f8b9b682 100644
--- a/system/stack/btm/btm_devctl.c
+++ b/system/stack/btm/btm_devctl.c
@@ -87,7 +87,6 @@ void btm_dev_init (void)
btm_cb.devcb.reset_timer.param = (TIMER_PARAM_TYPE)TT_DEV_RESET;
btm_cb.devcb.rln_timer.param = (TIMER_PARAM_TYPE)TT_DEV_RLN;
- btm_cb.devcb.rlinkp_timer.param = (TIMER_PARAM_TYPE)TT_DEV_RLNKP;
btm_cb.btm_acl_pkt_types_supported = BTM_ACL_PKT_TYPES_MASK_DH1 + BTM_ACL_PKT_TYPES_MASK_DM1 +
BTM_ACL_PKT_TYPES_MASK_DH3 + BTM_ACL_PKT_TYPES_MASK_DM3 +
@@ -129,15 +128,6 @@ static void btm_db_reset (void)
(*p_cb)((void *) NULL);
}
- if (btm_cb.devcb.p_rlinkp_cmpl_cb)
- {
- p_cb = btm_cb.devcb.p_rlinkp_cmpl_cb;
- btm_cb.devcb.p_rlinkp_cmpl_cb = NULL;
-
- if (p_cb)
- (*p_cb)((void *) &status);
- }
-
if (btm_cb.devcb.p_rssi_cmpl_cb)
{
p_cb = btm_cb.devcb.p_rssi_cmpl_cb;
diff --git a/system/stack/btm/btm_int.h b/system/stack/btm/btm_int.h
index 3ddaf9ea823..4c312272d22 100644
--- a/system/stack/btm/btm_int.h
+++ b/system/stack/btm/btm_int.h
@@ -143,9 +143,6 @@ typedef struct
TIMER_LIST_ENT rln_timer;
tBTM_CMPL_CB *p_rln_cmpl_cb; /* Callback function to be called when */
/* read local name function complete */
- TIMER_LIST_ENT rlinkp_timer;
- tBTM_CMPL_CB *p_rlinkp_cmpl_cb; /* Callback function to be called when */
- /* read link policy function completes */
TIMER_LIST_ENT rssi_timer;
tBTM_CMPL_CB *p_rssi_cmpl_cb; /* Callback function to be called when */
/* read rssi function completes */
@@ -924,7 +921,6 @@ extern BOOLEAN btm_lookup_eir(BD_ADDR_PTR p_rem_addr);
********************************************
*/
extern void btm_acl_init (void);
-extern void btm_acl_timeout (TIMER_LIST_ENT *p_tle);
extern void btm_acl_created (BD_ADDR bda, DEV_CLASS dc, BD_NAME bdn,
UINT16 hci_handle, UINT8 link_role, tBT_TRANSPORT transport);
extern void btm_acl_removed (BD_ADDR bda, tBT_TRANSPORT transport);
diff --git a/system/stack/btu/btu_hcif.c b/system/stack/btu/btu_hcif.c
index 5fe633a052c..ad0050c32f6 100644
--- a/system/stack/btu/btu_hcif.c
+++ b/system/stack/btu/btu_hcif.c
@@ -832,10 +832,6 @@ static void btu_hcif_hdl_command_complete (UINT16 opcode, UINT8 *p, UINT16 evt_l
btm_delete_stored_link_key_complete (p);
break;
- case HCI_READ_POLICY_SETTINGS:
- btm_read_link_policy_complete (p);
- break;
-
case HCI_READ_LOCAL_NAME:
btm_read_local_name_complete (p, evt_len);
break;
diff --git a/system/stack/btu/btu_task.c b/system/stack/btu/btu_task.c
index f6c187af494..f8268c6c35c 100644
--- a/system/stack/btu/btu_task.c
+++ b/system/stack/btu/btu_task.c
@@ -370,10 +370,6 @@ static void btu_general_alarm_process(TIMER_LIST_ENT *p_tle) {
btm_dev_timeout(p_tle);
break;
- case BTU_TTYPE_BTM_ACL:
- btm_acl_timeout(p_tle);
- break;
-
case BTU_TTYPE_L2CAP_LINK:
case BTU_TTYPE_L2CAP_CHNL:
case BTU_TTYPE_L2CAP_HOLD:
diff --git a/system/stack/hcic/hcicmds.c b/system/stack/hcic/hcicmds.c
index 037fa5ea66e..e9a252f8c5b 100644
--- a/system/stack/hcic/hcicmds.c
+++ b/system/stack/hcic/hcicmds.c
@@ -866,28 +866,6 @@ BOOLEAN btsnd_hcic_switch_role (BD_ADDR bd_addr, UINT8 role)
return (TRUE);
}
-BOOLEAN btsnd_hcic_read_policy_set (UINT16 handle)
-{
- BT_HDR *p;
- UINT8 *pp;
-
- if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_CMD_HANDLE)) == NULL)
- return (FALSE);
-
- pp = (UINT8 *)(p + 1);
-
- p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_CMD_HANDLE;
- p->offset = 0;
-
- UINT16_TO_STREAM (pp, HCI_READ_POLICY_SETTINGS);
- UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_CMD_HANDLE);
-
- UINT16_TO_STREAM (pp, handle);
-
- btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
- return (TRUE);
-}
-
BOOLEAN btsnd_hcic_write_policy_set (UINT16 handle, UINT16 settings)
{
BT_HDR *p;
diff --git a/system/stack/include/btm_api.h b/system/stack/include/btm_api.h
index 4281fd03fa4..01f0851b613 100644
--- a/system/stack/include/btm_api.h
+++ b/system/stack/include/btm_api.h
@@ -720,17 +720,6 @@ typedef void (tBTM_INQ_RESULTS_CB) (tBTM_INQ_RESULTS *p_inq_results, UINT8 *p_ei
** ACL Types
****************/
-/* Structure returned with link policy information (in tBTM_CMPL_CB callback function)
-** in response to BTM_ReadLinkPolicy call.
-*/
-typedef struct
-{
- tBTM_STATUS status;
- UINT8 hci_status;
- BD_ADDR rem_bda;
- UINT16 settings;
-} tBTM_LNK_POLICY_RESULTS;
-
/* Structure returned with Role Switch information (in tBTM_CMPL_CB callback function)
** in response to BTM_SwitchRole call.
*/
@@ -2641,22 +2630,6 @@ extern void BTM_SetDiscoveryParams (UINT16 num_uuid, tSDP_UUID *p_uuid_list,
extern tBTM_STATUS BTM_SetLinkPolicy (BD_ADDR remote_bda,
UINT16 *settings);
-
-/*******************************************************************************
-**
-** Function BTM_ReadLinkPolicy
-**
-** Description This function is called to read the link policy settings.
-** The address of link policy results are returned in the callback.
-** (tBTM_LNK_POLICY_RESULTS)
-**
-** Returns BTM_CMD_STARTED if successfully initiated, otherwise error
-**
-*******************************************************************************/
-extern tBTM_STATUS BTM_ReadLinkPolicy (BD_ADDR remote_bda,
- tBTM_CMPL_CB *p_cb);
-
-
/*******************************************************************************
**
** Function BTM_SetDefaultLinkPolicy
diff --git a/system/stack/include/hcimsgs.h b/system/stack/include/hcimsgs.h
index c2028317aad..1447ccea70f 100644
--- a/system/stack/include/hcimsgs.h
+++ b/system/stack/include/hcimsgs.h
@@ -334,8 +334,6 @@ extern BOOLEAN btsnd_hcic_switch_role (BD_ADDR bd_addr, UINT8 role);
#define HCI_SWITCH_ROLE_OFF 6
/* Switch Role Request */
-extern BOOLEAN btsnd_hcic_read_policy_set(UINT16 handle); /* Read Policy Settings */
-
/* Write Policy Settings */
extern BOOLEAN btsnd_hcic_write_policy_set(UINT16 handle, UINT16 settings);
--
GitLab