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

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

Remove unused btm_read_remote_version_complete_raw 

Read remote version event is handled and parsed by GD

Bug: 232442249
Tag: #refactor
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I0c98a82b747e6edaa73f2aa2f4462c3ee7144b55
parent 48dc8c5b

system/stack/acl/btm_acl.cc

+0 −18
Original line number Diff line number Diff line
@@ -833,24 +833,6 @@ void btm_process_remote_version_complete(uint8_t status, uint16_t handle, 
  }

}



void btm_read_remote_version_complete_raw(uint8_t* p) {

  uint8_t status;

  uint16_t handle;

  uint8_t lmp_version;

  uint16_t manufacturer;

  uint16_t lmp_subversion;



  STREAM_TO_UINT8(status, p);

  STREAM_TO_UINT16(handle, p);

  STREAM_TO_UINT8(lmp_version, p);

  STREAM_TO_UINT16(manufacturer, p);

  STREAM_TO_UINT16(lmp_subversion, p);



  ASSERT_LOG(false, "gd acl layer should be receiving this completion");

  btm_read_remote_version_complete(static_cast<tHCI_STATUS>(status), handle,

                                   lmp_version, manufacturer, lmp_version);

}



void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

system/stack/btu/btu_hcif.cc

+1 −3
Original line number Diff line number Diff line
@@ -268,9 +268,6 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
    case HCI_READ_RMT_EXT_FEATURES_COMP_EVT:

      btu_hcif_read_rmt_ext_features_comp_evt(p, hci_evt_len);

      break;

    case HCI_READ_RMT_VERSION_COMP_EVT:

      btm_read_remote_version_complete_raw(p);

      break;

    case HCI_COMMAND_COMPLETE_EVT:

      LOG_ERROR(

          "%s should not have received a command complete event. "
@@ -432,6 +429,7 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
      // Events now captured by gd::hci_layer module

    case HCI_CONNECTION_COMP_EVT:  // EventCode::CONNECTION_COMPLETE

    case HCI_READ_RMT_FEATURES_COMP_EVT:  // EventCode::READ_REMOTE_SUPPORTED_FEATURES_COMPLETE

    case HCI_READ_RMT_VERSION_COMP_EVT:  // EventCode::READ_REMOTE_VERSION_INFORMATION_COMPLETE

    default:

      LOG_ERROR(

          "Unexpectedly received event_code:0x%02x that should not be "

system/stack/include/acl_hci_link_interface.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ void btm_read_remote_ext_features_complete(uint16_t handle, uint8_t page_num, 
                                           uint8_t max_page, uint8_t* features);

void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle);

void btm_read_remote_features_complete(uint16_t handle, uint8_t* features);

void btm_read_remote_version_complete_raw(uint8_t* p);

void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

system/test/mock/mock_stack_acl.cc

+0 −6
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ struct btm_read_remote_ext_features_complete_raw 
struct btm_read_remote_ext_features_failed btm_read_remote_ext_features_failed;

struct btm_read_remote_features_complete btm_read_remote_features_complete;

struct btm_read_remote_version_complete btm_read_remote_version_complete;

struct btm_read_remote_version_complete_raw

    btm_read_remote_version_complete_raw;

struct btm_read_rssi_complete btm_read_rssi_complete;

struct btm_read_rssi_timeout btm_read_rssi_timeout;

struct btm_read_tx_power_complete btm_read_tx_power_complete;
@@ -667,10 +665,6 @@ void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle, 
  test::mock::stack_acl::btm_read_remote_version_complete(

      status, handle, lmp_version, manufacturer, lmp_subversion);

}

void btm_read_remote_version_complete_raw(uint8_t* p) {

  mock_function_count_map[__func__]++;

  test::mock::stack_acl::btm_read_remote_version_complete_raw(p);

}

void btm_read_rssi_complete(uint8_t* p) {

  mock_function_count_map[__func__]++;

  test::mock::stack_acl::btm_read_rssi_complete(p);

system/test/mock/mock_stack_acl.h

+0 −9
Original line number Diff line number Diff line
@@ -1185,15 +1185,6 @@ struct btm_read_remote_version_complete { 
  };

};

extern struct btm_read_remote_version_complete btm_read_remote_version_complete;

// Name: btm_read_remote_version_complete_raw

// Params: uint8_t* p

// Returns: void

struct btm_read_remote_version_complete_raw {

  std::function<void(uint8_t* p)> body{[](uint8_t* p) { ; }};

  void operator()(uint8_t* p) { body(p); };

};

extern struct btm_read_remote_version_complete_raw

    btm_read_remote_version_complete_raw;

// Name: btm_read_rssi_complete

// Params: uint8_t* p

// Returns: void