Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af5aa1e8 authored by Chris Manton's avatar Chris Manton
Browse files

De-friend various tACL_CB 

Also add default initializers

Towards modular code

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

Change-Id: I79aa3045e93d157d03c75f7f5f88049b09b04124
parent 0534c27c

system/stack/acl/acl.cc

+0 −8
Original line number Diff line number Diff line
@@ -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;

}

system/stack/acl/acl.h

+6 −23
Original line number Diff line number Diff line
@@ -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;

system/stack/btm/btm_int_types.h

+1 −1
Original line number Diff line number Diff line
@@ -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();