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

Commit 661948ac authored by Chris Manton's avatar Chris Manton
Browse files

Remove useless define BTM_ACL_IS_CONNECTED 

Working towards encapsulation of tACL_CONN

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6c8dea63498abccae54adbef3d82fe4e857eb53f
parent 913c1b69

system/stack/acl/btm_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -2345,7 +2345,7 @@ void btm_acl_paging(BT_HDR* p, const RawAddress& bda) { 
    btm_cb.paging = true;

    fixed_queue_enqueue(btm_cb.page_queue, p);

  } else {

    if (!BTM_ACL_IS_CONNECTED(bda)) {

    if (!BTM_IsAclConnectionUp(bda, BT_TRANSPORT_BR_EDR)) {

      VLOG(1) << "connecting_bda: " << btm_cb.connecting_bda;

      if (btm_cb.paging && bda == btm_cb.connecting_bda) {

        fixed_queue_enqueue(btm_cb.page_queue, p);

system/stack/btm/btm_int_types.h

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 


typedef char tBTM_LOC_BD_NAME[BTM_MAX_LOC_BD_NAME_LEN + 1];



#define BTM_ACL_IS_CONNECTED(bda) \

  (btm_bda_to_acl(bda, BT_TRANSPORT_BR_EDR) != NULL)



/* Definitions for Server Channel Number (SCN) management

*/

#define BTM_MAX_SCN PORT_MAX_RFC_PORTS

system/stack/btm/btm_sec.cc

+3 −2
Original line number Diff line number Diff line
@@ -2484,8 +2484,9 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
  uint8_t old_sec_state;



  BTM_TRACE_EVENT("btm_sec_rmt_name_request_complete");

  if ((!p_bd_addr && !BTM_ACL_IS_CONNECTED(btm_cb.connecting_bda)) ||

      (p_bd_addr && !BTM_ACL_IS_CONNECTED(*p_bd_addr))) {

  if ((!p_bd_addr &&

       !BTM_IsAclConnectionUp(btm_cb.connecting_bda, BT_TRANSPORT_BR_EDR)) ||

      (p_bd_addr && !BTM_IsAclConnectionUp(*p_bd_addr, BT_TRANSPORT_BR_EDR))) {

    btm_acl_resubmit_page();

  }