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

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

Add and use tBTM_CB::tACL_CB::Init 

Towards encapsulated code

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

Change-Id: I38a17794c6f0af25b40d8b095621d9df658dff42
parent 65d0501e

system/stack/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -671,15 +671,18 @@ cc_test { 
        "btm/btm_ble_adv_filter.cc",

        "btm/btm_ble_batchscan.cc",

        "btm/btm_ble_bgconn.cc",

        "btm/btm_ble_cont_energy.cc",

        "btm/btm_ble_gap.cc",

        "btm/btm_ble_multi_adv.cc",

        "btm/btm_ble_privacy.cc",

        "btm/btm_client_interface.cc",

        "btm/btm_dev.cc",

        "btm/btm_devctl.cc",

        "btm/btm_inq.cc",

        "btm/btm_iso.cc",

        "btm/btm_main.cc",

        "btm/btm_sco.cc",

        "btm/btm_scn.cc",

        "btm/btm_sec.cc",

        "test/btm/stack_btm_test.cc",

        "test/common/mock_bta_dm_act.cc",

system/stack/acl/acl.cc

+9 −0
Original line number Diff line number Diff line
@@ -46,3 +46,12 @@ void sACL_CONN::Reset() { 
  switch_role_state_ = BTM_ACL_SWKEY_STATE_IDLE;

  sca = 0;

}



void sACL_CB::Init() {

  btm_def_link_super_tout = HCI_DEFAULT_INACT_TOUT;

  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

+5 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ typedef sACL_CONN tACL_CONN; 
/****************************************************

 **      ACL Management API

 ****************************************************/

typedef struct {

struct sACL_CB {

 private:

  friend bool BTM_IsBleConnection(uint16_t hci_handle);

  friend bool acl_is_role_switch_allowed();
@@ -446,4 +446,7 @@ typedef struct { 
    }

    return cnt;

  }

} tACL_CB;
 


  void Init();

};

typedef sACL_CB tACL_CB;

system/stack/acl/btm_acl.cc

+1 −9
Original line number Diff line number Diff line
@@ -199,15 +199,7 @@ static void hci_start_role_switch_to_central(tACL_CONN& p_acl) { 
 * Returns          void

 *

 ******************************************************************************/

void btm_acl_init(void) {

  /* Initialize nonzero defaults */

  btm_cb.acl_cb_.btm_def_link_super_tout = HCI_DEFAULT_INACT_TOUT;

  btm_cb.acl_cb_.acl_disc_reason = HCI_ERR_UNDEFINED;



  btm_cb.acl_cb_.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;

}

void btm_acl_init(void) { btm_cb.acl_cb_.Init(); }



void BTM_acl_after_controller_started() {

  internal_.btm_set_default_link_policy(

system/stack/btm/btm_ble_cont_energy.cc

+1 −1
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
#include "bt_target.h"



#include "bt_types.h"

#include "bt_utils.h"

#include "btm_ble_api.h"

#include "btm_int.h"

#include "btu.h"

#include "hcidefs.h"

#include "hcimsgs.h"

#include "stack/btm/btm_int_types.h"

#include "utils/include/bt_utils.h"



extern tBTM_CB btm_cb;