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

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

Move stack/l2cap/l2c_link::btm_acl_connected 

Into: stack/acl/btm_acl

Towards proper interfaces

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic11c5809669eb7e663ebd32e17377c25e052ab95
parent 9f7f064d

system/stack/acl/btm_acl.cc

+7 −0
Original line number Diff line number Diff line
@@ -2826,3 +2826,10 @@ bool acl_set_peer_le_features_from_handle(uint16_t hci_handle, 
  STREAM_TO_ARRAY(p_acl->peer_le_features, p, BD_FEATURES_LEN);

  return true;

}



void btm_acl_connected(const RawAddress& bda, uint16_t handle, uint8_t status,

                       uint8_t enc_mode) {

  btm_sec_connected(bda, handle, status, enc_mode);

  btm_acl_set_paging(false);

  l2c_link_hci_conn_comp(status, handle, bda);

}

system/stack/include/acl_hci_link_interface.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 


// This header contains functions for HCIF-Acl Management to invoke

//

void btm_acl_connected(const RawAddress& bda, uint16_t handle, uint8_t status,

                       uint8_t enc_mode);

void btm_acl_encrypt_change(uint16_t handle, uint8_t status,

                            uint8_t encr_enable);

void btm_blacklist_role_change_device(const RawAddress& bd_addr,

system/stack/include/l2cap_hci_link_interface.h

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ extern void l2c_link_process_num_completed_pkts(uint8_t* p, uint8_t evt_len); 
extern void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle,

                                   const RawAddress& p_bda);



// TODO move

extern void btm_acl_connected(const RawAddress& bda, uint16_t handle,

                              uint8_t status, uint8_t enc_mode);



extern bool l2c_link_hci_disc_comp(uint16_t handle, uint8_t reason);



extern void l2c_link_role_changed(const RawAddress* bd_addr, uint8_t new_role,

system/stack/l2cap/l2c_link.cc

+0 −7
Original line number Diff line number Diff line
@@ -123,13 +123,6 @@ void l2c_link_hci_conn_req(const RawAddress& bd_addr) { 
  }

}



void btm_acl_connected(const RawAddress& bda, uint16_t handle, uint8_t status,

                       uint8_t enc_mode) {

  btm_sec_connected(bda, handle, status, enc_mode);

  btm_acl_set_paging(false);

  l2c_link_hci_conn_comp(status, handle, bda);

}



void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle,

                            const RawAddress& p_bda) {

  tL2C_CONN_INFO ci;