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

Commit 6b0af6b4 authored by Chris Manton's avatar Chris Manton
Browse files

Remove stack::hcic::btsnd_hcic_rmt_name_req_cancel 

Skip unneeded layer of indirection

Bug: 332983035
Test: m .
Flag: EXEMPT, Mechanical Refactor
Change-Id: Ib7624cee1a8f94419b8e8a5607da5eb99be75a7e
parent 1272c7ae

system/stack/btm/btm_inq.cc

+3 −4
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
 *

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



#define LOG_TAG "bluetooth"



#include <base/logging.h>

#include <bluetooth/log.h>

#include <stddef.h>
@@ -46,11 +44,11 @@ 
#include "hci/hci_layer.h"

#include "include/check.h"

#include "internal_include/bt_target.h"

#include "main/shim/acl_api.h"

#include "main/shim/entry.h"

#include "main/shim/helpers.h"

#include "main/shim/shim.h"

#include "neighbor_inquiry.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"
@@ -867,7 +865,8 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void) { 
       * callback. */

      btm_inq_rmt_name_failed_cancelled();

    } else

      btsnd_hcic_rmt_name_req_cancel(btm_cb.btm_inq_vars.remname_bda);

      bluetooth::shim::ACL_CancelRemoteNameRequest(

          btm_cb.btm_inq_vars.remname_bda);

    return (BTM_CMD_STARTED);

  } else

    return (BTM_WRONG_MODE);

system/stack/hcic/hcicmds.cc

+0 −4
Original line number Diff line number Diff line
@@ -661,10 +661,6 @@ void btsnd_hcic_rmt_name_req(const RawAddress& bd_addr, 
                                         page_scan_mode, clock_offset);

}



void btsnd_hcic_rmt_name_req_cancel(const RawAddress& bd_addr) {

  bluetooth::shim::ACL_CancelRemoteNameRequest(bd_addr);

}



void btsnd_hcic_rmt_ext_features(uint16_t handle, uint8_t page_num) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);

system/stack/include/hcimsgs.h

+0 −4
Original line number Diff line number Diff line
@@ -93,10 +93,6 @@ void btsnd_hcic_set_conn_encrypt(uint16_t handle, bool enable); 
void btsnd_hcic_rmt_name_req(const RawAddress& bd_addr,

                             uint8_t page_scan_rep_mode, uint8_t page_scan_mode,

                             uint16_t clock_offset);



/* Remote Name Request Cancel */

void btsnd_hcic_rmt_name_req_cancel(const RawAddress& bd_addr);



/* Remote Extended Features */

void btsnd_hcic_rmt_ext_features(uint16_t handle, uint8_t page_num);

system/test/mock/mock_main_shim_acl_api.cc

+4 −0
Original line number Diff line number Diff line
@@ -118,3 +118,7 @@ void bluetooth::shim::ACL_SendConnectionParameterUpdateRequest( 
    uint16_t /* max_ce_len */) {

  inc_func_call_count(__func__);

}

void bluetooth::shim::ACL_CancelRemoteNameRequest(

    const RawAddress& /* addr */) {

  inc_func_call_count(__func__);

}

system/test/mock/mock_stack_hcic_hcicmds.cc

+0 −5
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct btsnd_hcic_rem_oob_neg_reply btsnd_hcic_rem_oob_neg_reply; 
struct btsnd_hcic_rem_oob_reply btsnd_hcic_rem_oob_reply;

struct btsnd_hcic_rmt_ext_features btsnd_hcic_rmt_ext_features;

struct btsnd_hcic_rmt_name_req btsnd_hcic_rmt_name_req;

struct btsnd_hcic_rmt_name_req_cancel btsnd_hcic_rmt_name_req_cancel;

struct btsnd_hcic_rmt_ver_req btsnd_hcic_rmt_ver_req;

struct btsnd_hcic_set_conn_encrypt btsnd_hcic_set_conn_encrypt;

struct btsnd_hcic_set_event_filter btsnd_hcic_set_event_filter;
@@ -263,10 +262,6 @@ void btsnd_hcic_rmt_name_req(const RawAddress& bd_addr, 
  test::mock::stack_hcic_hcicmds::btsnd_hcic_rmt_name_req(

      bd_addr, page_scan_rep_mode, page_scan_mode, clock_offset);

}

void btsnd_hcic_rmt_name_req_cancel(const RawAddress& bd_addr) {

  inc_func_call_count(__func__);

  test::mock::stack_hcic_hcicmds::btsnd_hcic_rmt_name_req_cancel(bd_addr);

}

void btsnd_hcic_rmt_ver_req(uint16_t handle) {

  inc_func_call_count(__func__);

  test::mock::stack_hcic_hcicmds::btsnd_hcic_rmt_ver_req(handle);