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

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

Removal of external btm_cont_rswitch() 

Working towards encapsulation of tACL_CONN

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibb5685ae762556a5d593da44d019bc520313dc1b
parent 145c8a42

system/stack/acl/btm_acl.cc

+3 −3
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ void btm_io_capabilities_req(const RawAddress& p); 


static void btm_acl_chk_peer_pkt_type_support(tACL_CONN* p,

                                              uint16_t* p_pkt_type);

static void btm_cont_rswitch(tACL_CONN* p, tBTM_SEC_DEV_REC* p_dev_rec);

static void btm_establish_continue(tACL_CONN* p_acl_cb);

static void btm_pm_sm_alloc(uint8_t ind);

static void btm_read_automatic_flush_timeout_timeout(void* data);
@@ -2224,8 +2225,7 @@ uint8_t BTM_SetTraceLevel(uint8_t new_level) { 
 * Returns          void

 *

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

void btm_cont_rswitch(tACL_CONN* p, tBTM_SEC_DEV_REC* p_dev_rec,

                      UNUSED_ATTR uint8_t hci_status) {

void btm_cont_rswitch(tACL_CONN* p, tBTM_SEC_DEV_REC* p_dev_rec) {

  BTM_TRACE_DEBUG("btm_cont_rswitch");

  /* Check to see if encryption needs to be turned off if pending

     change of link key or role switch */
@@ -2261,7 +2261,7 @@ void btm_cont_rswitch_from_handle(uint16_t hci_handle) { 
    BTM_TRACE_ERROR("%s role switch received but with no active ACL", __func__);

    return;

  }

  btm_cont_rswitch(p_acl, btm_find_dev(p_acl->remote_addr), 0);

  btm_cont_rswitch(p_acl, btm_find_dev(p_acl->remote_addr));

}



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

system/stack/include/acl_api.h

+0 −2
Original line number Diff line number Diff line
@@ -272,8 +272,6 @@ const RawAddress acl_address_from_handle(uint16_t hci_handle); 
tBTM_PM_MCB* acl_power_mode_from_handle(uint16_t hci_handle);

int btm_pm_find_acl_ind(const RawAddress& remote_bda);



void btm_cont_rswitch(tACL_CONN* p, tBTM_SEC_DEV_REC* p_dev_rec,

                      uint8_t hci_status);

void btm_ble_refresh_local_resolvable_private_addr(

    const RawAddress& pseudo_addr, const RawAddress& local_rpa);