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

Commit dda17256 authored by Myles Watson's avatar Myles Watson
Browse files

Remove StartInquiry from legacy HCI 

Bug: 322230000
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I6c4b361816c51cec666c2d8d0e3fb5961bd28d49
parent 63922801

system/stack/btu/btu_hcif.cc

+0 −7
Original line number Diff line number Diff line
@@ -1229,13 +1229,6 @@ static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status, 
  uint16_t handle;



  switch (opcode) {

    // Link Control Commands

    case HCI_INQUIRY:

      if (status != HCI_SUCCESS) {

        // Tell inquiry processing that we are done

        btm_process_inq_complete(hci_status, BTM_BR_INQUIRY_MASK);

      }

      break;

    case HCI_SWITCH_ROLE:

      if (status != HCI_SUCCESS) {

        // Tell BTM that the command failed

system/stack/hcic/hcicmds.cc

+0 −22
Original line number Diff line number Diff line
@@ -482,24 +482,6 @@ 
#define HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_REPLY 14

#define HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_NEG_REPLY 3



static void btsnd_hcic_inquiry(const LAP inq_lap, uint8_t duration,

                               uint8_t response_cnt) {

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

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



  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_INQUIRY;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_INQUIRY);

  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_INQUIRY);



  LAP_TO_STREAM(pp, inq_lap);

  UINT8_TO_STREAM(pp, duration);

  UINT8_TO_STREAM(pp, response_cnt);



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



static void btsnd_hcic_inq_cancel(void) {

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

  uint8_t* pp = (uint8_t*)(p + 1);
@@ -1690,10 +1672,6 @@ void btsnd_hcic_configure_data_path(hci_data_direction_t data_path_direction, 


namespace bluetooth::legacy::hci {

class InterfaceImpl : public Interface {

  void StartInquiry(const uint8_t* inq_lap, uint8_t duration,

                    uint8_t response_cnt) const override {

    btsnd_hcic_inquiry(inq_lap, duration, response_cnt);

  }

  void InquiryCancel() const override { btsnd_hcic_inq_cancel(); }

  void Disconnect(uint16_t handle, uint8_t reason) const override {

    btsnd_hcic_disconnect(handle, reason);

system/stack/include/hcimsgs.h

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ enum hci_data_direction_t { 
namespace bluetooth::legacy::hci {

class Interface {

 public:

  virtual void StartInquiry(const LAP inq_lap, uint8_t duration,

                            uint8_t response_cnt) const = 0;

  virtual void InquiryCancel() const = 0;

  virtual void Disconnect(uint16_t handle, uint8_t reason) const = 0;

  virtual void ChangeConnectionPacketType(uint16_t handle,

system/stack/test/common/mock_hcic_layer.cc

+0 −4
Original line number Diff line number Diff line
@@ -108,10 +108,6 @@ namespace bluetooth::legacy::hci { 


class MockInterface : public Interface {

 public:

  virtual void StartInquiry(const LAP inq_lap, uint8_t duration,

                            uint8_t response_cnt) const override {

    FAIL();

  }

  virtual void InquiryCancel() const override { FAIL(); }

  virtual void Disconnect(uint16_t handle, uint8_t reason) const override {

    btsnd_hcic_disconnect(handle, reason);

system/test/mock/mock_legacy_hci_interface.h

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
namespace bluetooth::legacy::hci::testing {

class MockInterface : public Interface {

 public:

  MOCK_METHOD(void, StartInquiry,

              (const LAP inq_lap, uint8_t duration, uint8_t response_cnt),

              (const));

  MOCK_METHOD(void, InquiryCancel, (), (const));

  MOCK_METHOD(void, Disconnect, (uint16_t handle, uint8_t reason), (const));

  MOCK_METHOD(void, ChangeConnectionPacketType,