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

Commit 5cba7d5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "L2cap: Clean up some dependency on btm_int" am: 9e35b28f 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1393578

Change-Id: I4fdd2bb8d3cdcacbefa8ce4141a2439e2e8b3617
parents 3b735dab 9e35b28f

system/stack/acl/btm_acl.cc

+2 −3
Original line number Diff line number Diff line
@@ -338,10 +338,9 @@ void btm_acl_report_role_change(uint8_t hci_status, const RawAddress* bda) { 
 *

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

void btm_acl_removed(const RawAddress& bda, tBT_TRANSPORT transport) {

  tACL_CONN* p;

  tBTM_SEC_DEV_REC* p_dev_rec = NULL;

  BTM_TRACE_DEBUG("btm_acl_removed");

  p = btm_bda_to_acl(bda, transport);

  tACL_CONN* p = btm_bda_to_acl(bda, transport);

  if (p != (tACL_CONN*)NULL) {

    p->in_use = false;
@@ -567,7 +566,7 @@ tBTM_STATUS BTM_SwitchRole(const RawAddress& remote_bd_addr, uint8_t new_role, 
    return BTM_DEV_BLACKLISTED;



  /* Check if there is any SCO Active on this BD Address */

  is_sco_active = btm_is_sco_active_by_bdaddr(remote_bd_addr);

  is_sco_active = BTM_IsScoActiveByBdaddr(remote_bd_addr);



  if (is_sco_active) return (BTM_NO_RESOURCES);

system/stack/btm/btm_ble_int_types.h

+0 −7
Original line number Diff line number Diff line
@@ -174,13 +174,6 @@ typedef struct { 


} tBTM_LE_CONN_PRAMS;



typedef struct {

  RawAddress bd_addr;

  uint8_t attr;

  bool is_connected;

  bool in_use;

} tBTM_LE_BG_CONN_DEV;



/* white list using state as a bit mask */

constexpr uint8_t BTM_BLE_WL_IDLE = 0;

constexpr uint8_t BTM_BLE_WL_INIT = 1;

system/stack/btm/btm_dev.cc

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ bool btm_dev_support_switch(const RawAddress& bd_addr) { 
  bool feature_empty = true;



  /* Role switch is not allowed if a SCO is up */

  if (btm_is_sco_active_by_bdaddr(bd_addr)) return (false);

  if (BTM_IsScoActiveByBdaddr(bd_addr)) return (false);

  p_dev_rec = btm_find_dev(bd_addr);

  if (p_dev_rec &&

      controller_get_interface()->supports_master_slave_role_switch()) {

system/stack/btm/btm_int.h

+0 −4
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ extern void btm_sco_removed(uint16_t hci_handle, uint8_t reason); 
extern void btm_sco_acl_removed(const RawAddress* bda);

extern void btm_route_sco_data(BT_HDR* p_msg);

extern bool btm_is_sco_active(uint16_t handle);

extern void btm_remove_sco_links(const RawAddress& bda);

extern bool btm_is_sco_active_by_bdaddr(const RawAddress& remote_bda);



extern void btm_sco_flush_sco_data(uint16_t sco_inx);
@@ -271,8 +269,6 @@ extern void btm_read_local_oob_complete(uint8_t* p); 


extern void btm_acl_resubmit_page(void);

extern void btm_acl_paging(BT_HDR* p, const RawAddress& dest);

extern uint8_t btm_sec_clr_service_by_psm(uint16_t psm);

extern void btm_sec_clr_temp_auth_service(const RawAddress& bda);

extern tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);



#endif

system/stack/btm/btm_sco.cc

+3 −13
Original line number Diff line number Diff line
@@ -897,17 +897,7 @@ tBTM_STATUS BTM_RemoveSco(uint16_t sco_inx) { 
#endif

}



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

 *

 * Function         btm_remove_sco_links

 *

 * Description      This function is called to remove all sco links for an ACL

 *                  link.

 *

 * Returns          void

 *

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

void btm_remove_sco_links(const RawAddress& bda) {

void BTM_RemoveSco(const RawAddress& bda) {

#if (BTM_MAX_SCO_LINKS > 0)

  tSCO_CONN* p = &btm_cb.sco_cb.sco_db[0];

  uint16_t xx;
@@ -1318,7 +1308,7 @@ uint8_t BTM_GetNumScoLinks(void) { 


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

 *

 * Function         btm_is_sco_active_by_bdaddr

 * Function         BTM_IsScoActiveByBdaddr

 *

 * Description      This function is called to see if a SCO connection is active

 *                  for a bd address.
@@ -1326,7 +1316,7 @@ uint8_t BTM_GetNumScoLinks(void) { 
 * Returns          bool

 *

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

bool btm_is_sco_active_by_bdaddr(const RawAddress& remote_bda) {

bool BTM_IsScoActiveByBdaddr(const RawAddress& remote_bda) {

#if (BTM_MAX_SCO_LINKS > 0)

  uint8_t xx;

  tSCO_CONN* p = &btm_cb.sco_cb.sco_db[0];