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

Commit 4c77d65f authored by Chris Manton's avatar Chris Manton
Browse files

Use API stack/acl/btm_acl::btm_acl_connection_request 

Towards proper interfaces

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie02b35f15f6e773b6f6a793c33b675f2208865fe
parent 6fa42263

system/stack/acl/btm_acl.cc

+3 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "common/metrics.h"

#include "device/include/controller.h"

#include "device/include/interop.h"

#include "include/l2cap_hci_link_interface.h"

#include "main/shim/btm_api.h"

#include "main/shim/shim.h"

#include "osi/include/log.h"
@@ -48,10 +49,11 @@ 
#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/btm_api.h"

#include "stack/include/btu.h"

#include "stack/include/hcimsgs.h"

#include "stack/include/l2cap_hci_link_interface.h"

#include "stack/include/l2cap_acl_interface.h"

#include "types/raw_address.h"



struct StackAclBtmAcl {

system/stack/btu/btu_hcif.cc

+1 −4
Original line number Diff line number Diff line
@@ -1001,11 +1001,8 @@ static void btu_hcif_connection_request_evt(uint8_t* p) { 
  STREAM_TO_DEVCLASS(dc, p);

  STREAM_TO_UINT8(link_type, p);



  /* Pass request to security manager to check connect filters before */

  /* passing request to l2cap */

  if (link_type == HCI_LINK_TYPE_ACL) {

    btm_sec_conn_req(bda, dc);

    l2c_link_hci_conn_req(bda);

    btm_acl_connection_request(bda, dc);

  } else {

    btm_sco_conn_req(bda, dc, link_type);

  }

system/stack/include/l2cap_acl_interface.h

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#pragma once



#include "bt_common.h"

#include "types/raw_address.h"



// This header contains functions for HCI-ACL to invoke
@@ -26,3 +27,7 @@ extern void l2c_rcv_acl_data(BT_HDR* p_msg); 


// Segments is sent to HCI-ACL

extern void l2c_link_segments_xmitted(BT_HDR* p_msg);



extern void l2c_link_hci_conn_req(const RawAddress& bd_addr);



extern void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda);

system/stack/include/l2cap_hci_link_interface.h

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


// This header contains functions for HCI-LinkManagement to invoke



extern void l2c_link_hci_conn_req(const RawAddress& bd_addr);



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,

system/stack/include/sec_hci_link_interface.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ void btm_read_inq_tx_power_complete(uint8_t* p); 
void btm_read_local_oob_complete(uint8_t* p);

void btm_rem_oob_req(uint8_t* p);

void btm_sec_auth_complete(uint16_t handle, uint8_t status);

void btm_sec_conn_req(const RawAddress& bda, uint8_t* dc);

void btm_sec_disconnected(uint16_t handle, uint8_t reason);

void btm_sec_encrypt_change(uint16_t handle, uint8_t status,

                            uint8_t encr_enable);