Simplify stack/acl/btm_acl::btm_acl_created()

Remove copy once/read never fields:
DEV_CLASS
BD_NAME

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id53d86f370777cc999c4a060aa99a87edd2eb08c

diff --git a/stack/acl/acl.h b/stack/acl/acl.h
index 901461d..a734acd 100644 (file)
--- a/stack/acl/acl.h
+++ b/stack/acl/acl.h
@@ -112,9 +112,8 @@ typedef struct {
   friend void BTM_default_block_role_switch();
   friend void BTM_default_unblock_role_switch();
   friend void acl_set_disconnect_reason(uint8_t acl_disc_reason);
-  friend void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn,
-                              uint16_t hci_handle, uint8_t link_role,
-                              tBT_TRANSPORT transport);
+  friend void btm_acl_created(const RawAddress& bda, uint16_t hci_handle,
+                              uint8_t link_role, tBT_TRANSPORT transport);
   friend void btm_acl_device_down(void);
   friend void btm_acl_encrypt_change(uint16_t handle, uint8_t status,
                                      uint8_t encr_enable);

diff --git a/stack/acl/btm_acl.cc b/stack/acl/btm_acl.cc
index 41e067d..3261724 100644 (file)
--- a/stack/acl/btm_acl.cc
+++ b/stack/acl/btm_acl.cc
@@ -323,9 +323,8 @@ void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data) {
  * Returns          void
  *
  ******************************************************************************/
-void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn,
-                     uint16_t hci_handle, uint8_t link_role,
-                     tBT_TRANSPORT transport) {
+void btm_acl_created(const RawAddress& bda, uint16_t hci_handle,
+                     uint8_t link_role, tBT_TRANSPORT transport) {
   tBTM_SEC_DEV_REC* p_dev_rec = NULL;
   tACL_CONN* p;
   uint8_t xx;

diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
index f4409e4..fc4c37c 100644 (file)
--- a/stack/btm/btm_int.h
+++ b/stack/btm/btm_int.h
@@ -78,9 +78,6 @@ extern bool btm_inq_find_bdaddr(const RawAddress& p_bda);
  *******************************************
 */
 extern void btm_acl_init(void);
-extern void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn,
-                            uint16_t hci_handle, uint8_t link_role,
-                            tBT_TRANSPORT transport);
 extern void btm_acl_removed(const RawAddress& bda, tBT_TRANSPORT transport);
 extern void btm_acl_device_down(void);
 extern void btm_acl_set_paging(bool value);

diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index f549bc6..38ded00 100644 (file)
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -3772,8 +3772,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status,
   btm_set_packet_types_from_address(bda, BT_TRANSPORT_BR_EDR,
                                     acl_get_supported_packet_types());
 
-  btm_acl_created(bda, p_dev_rec->dev_class, p_dev_rec->sec_bd_name, handle,
-                  HCI_ROLE_SLAVE, BT_TRANSPORT_BR_EDR);
+  btm_acl_created(bda, handle, HCI_ROLE_SLAVE, BT_TRANSPORT_BR_EDR);
 
   /* Initialize security flags.  We need to do that because some            */
   /* authorization complete could have come after the connection is dropped */

diff --git a/stack/include/acl_api.h b/stack/include/acl_api.h
index 5548537..18320d9 100644 (file)
--- a/stack/include/acl_api.h
+++ b/stack/include/acl_api.h
@@ -343,6 +343,5 @@ void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address);
  ******************************************************************************/
 bool BTM_ReadPowerMode(const RawAddress& remote_bda, tBTM_PM_MODE* p_mode);
 
-void acl_create_classic_connection(const RawAddress& bd_addr,
-                                   bool there_are_high_priority_channels,
-                                   bool is_bonding);
+void btm_acl_created(const RawAddress& bda, uint16_t hci_handle,
+                     uint8_t link_role, tBT_TRANSPORT transport);

diff --git a/stack/l2cap/l2c_ble.cc b/stack/l2cap/l2c_ble.cc
index 9740371..3eaa706 100644 (file)
--- a/stack/l2cap/l2c_ble.cc
+++ b/stack/l2cap/l2c_ble.cc
@@ -315,9 +315,7 @@ void l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda,
   p_lcb->conn_update_mask = L2C_BLE_NOT_DEFAULT_PARAM;
 
   /* Tell BTM Acl management about the link */
-  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);
-  btm_acl_created(bda, NULL, p_dev_rec->sec_bd_name, handle, p_lcb->LinkRole(),
-                  BT_TRANSPORT_LE);
+  btm_acl_created(bda, handle, p_lcb->LinkRole(), BT_TRANSPORT_LE);
 
   p_lcb->peer_chnl_mask[0] = L2CAP_FIXED_CHNL_ATT_BIT |
                              L2CAP_FIXED_CHNL_BLE_SIG_BIT |

diff --git a/stack/l2cap/l2c_link.cc b/stack/l2cap/l2c_link.cc
index f9bfcef..3dec7a8 100644 (file)
--- a/stack/l2cap/l2c_link.cc
+++ b/stack/l2cap/l2c_link.cc
@@ -169,11 +169,10 @@ void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle,
     /* Tell BTM Acl management about the link */
     p_dev_info = btm_find_dev(p_bda);
     if (p_dev_info != NULL)
-      btm_acl_created(ci.bd_addr, p_dev_info->dev_class,
-                      p_dev_info->sec_bd_name, handle, p_lcb->LinkRole(),
+      btm_acl_created(ci.bd_addr, handle, p_lcb->LinkRole(),
                       BT_TRANSPORT_BR_EDR);
     else
-      btm_acl_created(ci.bd_addr, NULL, NULL, handle, p_lcb->LinkRole(),
+      btm_acl_created(ci.bd_addr, handle, p_lcb->LinkRole(),
                       BT_TRANSPORT_BR_EDR);
 
     BTM_SetLinkSuperTout(ci.bd_addr, acl_get_link_supervision_timeout());