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

Commit 4b246f0b authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Clean up some btm_int API 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic7e33d653a5841dc8eba3d635ed37838022a039f
parent 78fd96c9

system/stack/avdt/avdt_l2c.cc

+0 −2
Original line number Diff line number Diff line
@@ -25,10 +25,8 @@ 
#include <string.h>

#include "avdt_api.h"

#include "avdt_int.h"

#include "avdtc_api.h"

#include "bt_target.h"

#include "bt_types.h"

#include "bt_utils.h"

#include "bta/include/bta_av_api.h"

#include "btm_api.h"

#include "btm_int.h"

system/stack/btm/btm_int.h

+1 −12
Original line number Diff line number Diff line
@@ -194,17 +194,6 @@ extern bool btm_set_bond_type_dev(const RawAddress& bd_addr, 
 *********************************************

*/

extern bool btm_dev_support_switch(const RawAddress& bd_addr);

extern tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr,

                                            uint16_t psm, uint16_t handle,

                                            CONNECTION_TYPE conn_type,

                                            tBTM_SEC_CALLBACK* p_callback,

                                            void* p_ref_data);

extern tBTM_STATUS btm_sec_mx_access_request(const RawAddress& bd_addr,

                                             uint16_t psm, bool is_originator,

                                             uint32_t mx_proto_id,

                                             uint32_t mx_chan_id,

                                             tBTM_SEC_CALLBACK* p_callback,

                                             void* p_ref_data);

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

extern void btm_create_conn_cancel_complete(uint8_t* p);
@@ -243,7 +232,7 @@ extern bool btm_sec_is_a_bonded_dev(const RawAddress& bda); 
extern void btm_consolidate_dev(tBTM_SEC_DEV_REC* p_target_rec);

extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,

                                     const RawAddress& new_pseudo_addr);

extern tBTM_SEC_SERV_REC* btm_sec_find_first_serv(CONNECTION_TYPE conn_type,

extern tBTM_SEC_SERV_REC* btm_sec_find_first_serv(bool is_originator,

                                                  uint16_t psm);

extern tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(

    const RawAddress& bd_addr, uint16_t psm, bool is_originator,

system/stack/btm/btm_int_types.h

+0 −9
Original line number Diff line number Diff line
@@ -235,13 +235,6 @@ typedef struct { 


#define BTM_SEC_INVALID_HANDLE 0xFFFF



/* Security callback is called by this unit when security

 *   procedures are completed.  Parameters are

 *              BD Address of remote

 *              Result of the operation

*/

typedef tBTM_SEC_CBACK tBTM_SEC_CALLBACK;



typedef void(tBTM_SCO_IND_CBACK)(uint16_t sco_inx);



/* MACROs to convert from SCO packet types mask to ESCO and back */
@@ -607,8 +600,6 @@ typedef struct { 
  tBTM_BLE_SEC_ACT sec_act;

} tBTM_SEC_QUEUE_ENTRY;



typedef bool CONNECTION_TYPE;



// Bluetooth Quality Report - Report receiver

typedef void(tBTM_BT_QUALITY_REPORT_RECEIVER)(uint8_t len, uint8_t* p_stream);

system/stack/btm/btm_sec.cc

+3 −6
Original line number Diff line number Diff line
@@ -1651,7 +1651,7 @@ static void btm_sec_check_upgrade(tBTM_SEC_DEV_REC* p_dev_rec, 
 *

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

tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm,

                                     uint16_t handle, CONNECTION_TYPE conn_type,

                                     uint16_t handle, bool is_originator,

                                     tBTM_SEC_CALLBACK* p_callback,

                                     void* p_ref_data) {

  tBTM_SEC_DEV_REC* p_dev_rec;
@@ -1661,7 +1661,6 @@ tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm, 
  bool old_is_originator;

  tBTM_STATUS rc = BTM_SUCCESS;

  bool chk_acp_auth_done = false;

  const bool is_originator = conn_type;

  constexpr tBT_TRANSPORT transport =

      BT_TRANSPORT_BR_EDR; /* should check PSM range in LE connection oriented

                              L2CAP connection */
@@ -1675,7 +1674,7 @@ tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm, 
  p_dev_rec->hci_handle = handle;



  /* Find the service record for the PSM */

  p_serv_rec = btm_sec_find_first_serv(conn_type, psm);

  p_serv_rec = btm_sec_find_first_serv(is_originator, psm);



  /* If there is no application registered with this PSM do not allow connection

   */
@@ -4940,11 +4939,9 @@ bool btm_sec_are_all_trusted(uint32_t p_mask[]) { 
 * Returns          Pointer to the record or NULL

 *

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

tBTM_SEC_SERV_REC* btm_sec_find_first_serv(CONNECTION_TYPE conn_type,

                                           uint16_t psm) {

tBTM_SEC_SERV_REC* btm_sec_find_first_serv(bool is_originator, uint16_t psm) {

  tBTM_SEC_SERV_REC* p_serv_rec = &btm_cb.sec_serv_rec[0];

  int i;

  bool is_originator = conn_type;



  if (is_originator && btm_cb.p_out_serv && btm_cb.p_out_serv->psm == psm) {

    /* If this is outgoing connection and the PSM matches p_out_serv,

system/stack/gap/gap_conn.cc

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <base/strings/stringprintf.h>

#include <string.h>

#include "bt_target.h"

#include "btm_int.h"

#include "device/include/controller.h"

#include "gap_api.h"

#include "l2c_api.h"