From dcea6cc2d4ad8be09369cb4b791c3abf4b8a3499 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Mon, 1 Feb 2021 11:14:35 -0800
Subject: [PATCH] De-friend various tACL_CB

Also add default initializers

Towards modular code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: I79aa3045e93d157d03c75f7f5f88049b09b04124
---
 stack/acl/acl.cc          |  8 --------
 stack/acl/acl.h           | 29 ++++++-----------------------
 stack/btm/btm_int_types.h |  2 +-
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/stack/acl/acl.cc b/stack/acl/acl.cc
index 8c1d73fc3..465a03ea6 100644
--- a/stack/acl/acl.cc
+++ b/stack/acl/acl.cc
@@ -46,11 +46,3 @@ void sACL_CONN::Reset() {
   switch_role_state_ = BTM_ACL_SWKEY_STATE_IDLE;
   sca = 0;
 }
-
-void sACL_CB::Init() {
-  acl_disc_reason = HCI_ERR_UNDEFINED;
-
-  btm_acl_pkt_types_supported =
-      HCI_PKT_TYPES_MASK_DH1 + HCI_PKT_TYPES_MASK_DM1 + HCI_PKT_TYPES_MASK_DH3 +
-      HCI_PKT_TYPES_MASK_DM3 + HCI_PKT_TYPES_MASK_DH5 + HCI_PKT_TYPES_MASK_DM5;
-}
diff --git a/stack/acl/acl.h b/stack/acl/acl.h
index d7ba5f537..e2e142fe9 100644
--- a/stack/acl/acl.h
+++ b/stack/acl/acl.h
@@ -376,38 +376,24 @@ struct controller_t;
 /****************************************************
  **      ACL Management API
  ****************************************************/
-struct sACL_CB {
+struct tACL_CB {
  private:
-  friend tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id,
-                                      const RawAddress& remote_bda,
-                                      const tBTM_PM_PWR_MD* p_mode);
-  friend tBTM_STATUS BTM_SetSsrParams(const RawAddress& remote_bda,
-                                      uint16_t max_lat, uint16_t min_rmt_to,
-                                      uint16_t min_loc_to);
-  friend uint16_t BTM_GetNumAclLinks(void);
-  friend uint16_t acl_get_supported_packet_types();
   friend uint8_t btm_handle_to_acl_index(uint16_t hci_handle);
-  friend void acl_set_disconnect_reason(tHCI_STATUS acl_disc_reason);
-  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);
-  friend void btm_pm_proc_cmd_status(tHCI_STATUS status);
-  friend void btm_pm_proc_mode_change(tHCI_STATUS hci_status,
-                                      uint16_t hci_handle, tHCI_MODE mode,
-                                      uint16_t interval);
-  friend void btm_pm_proc_ssr_evt(uint8_t* p, uint16_t evt_len);
+
   friend void DumpsysL2cap(int fd);
   friend void DumpsysAcl(int fd);
-
   friend struct StackAclBtmAcl;
 
   tACL_CONN acl_db[MAX_L2CAP_LINKS];
   tBTM_ROLE_SWITCH_CMPL switch_role_ref_data;
-  uint16_t btm_acl_pkt_types_supported;
+  uint16_t btm_acl_pkt_types_supported =
+      HCI_PKT_TYPES_MASK_DH1 + HCI_PKT_TYPES_MASK_DM1 + HCI_PKT_TYPES_MASK_DH3 +
+      HCI_PKT_TYPES_MASK_DM3 + HCI_PKT_TYPES_MASK_DH5 + HCI_PKT_TYPES_MASK_DM5;
   uint16_t btm_def_link_policy;
-  tHCI_STATUS acl_disc_reason;
+  tHCI_STATUS acl_disc_reason = HCI_ERR_UNDEFINED;
 
  public:
   tHCI_STATUS get_disconnect_reason() const { return acl_disc_reason; }
@@ -426,7 +412,4 @@ struct sACL_CB {
     }
     return cnt;
   }
-
-  void Init();
 };
-typedef sACL_CB tACL_CB;
diff --git a/stack/btm/btm_int_types.h b/stack/btm/btm_int_types.h
index 5dd3bf419..d347d2e4f 100644
--- a/stack/btm/btm_int_types.h
+++ b/stack/btm/btm_int_types.h
@@ -351,7 +351,7 @@ typedef struct {
 
     /* Initialize BTM component structures */
     btm_inq_vars.Init(); /* Inquiry Database and Structures */
-    acl_cb_.Init();      /* ACL Database and Structures */
+    acl_cb_ = {};
     sco_cb.Init();       /* SCO Database and Structures (If included) */
     devcb.Init();
 
-- 
2.11.0