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

Commit 1414ef68 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Add shim btm_read_remote_version_complete am: 1f27b5f7 am: 60d2aabc am:... 

Add shim btm_read_remote_version_complete am: 1f27b5f7 am: 60d2aabc am: 49a09088 am: 5e3fd162

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1491498

Change-Id: I6cae14d76ef9910010cd5bb200a2d0691d512055
parents 0b871076 5e3fd162

system/main/shim/acl_legacy_interface.cc

+4 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ const acl_interface_t GetAclInterface() { 
      .link.classic.on_read_link_policy_settings_complete = nullptr,

      .link.classic.on_read_link_quality_complete = nullptr,

      .link.classic.on_read_link_supervision_timeout_complete = nullptr,

      .link.classic.on_read_remote_version_information_complete = nullptr,

      .link.classic.on_read_remote_version_information_complete =

          btm_read_remote_version_complete,

      .link.classic.on_read_remote_extended_features_complete =

          acl_process_extended_features,

      .link.classic.on_read_rssi_complete = nullptr,
@@ -64,6 +65,8 @@ const acl_interface_t GetAclInterface() { 


      .link.le.on_connection_update = acl_ble_update_event_received,

      .link.le.on_data_length_change = nullptr,

      .link.le.on_read_remote_version_information_complete =

          btm_read_remote_version_complete,

  };

  return acl_interface;

}

system/stack/acl/btm_acl.cc

+3 −3
Original line number Diff line number Diff line
@@ -758,11 +758,11 @@ void btm_read_remote_version_complete_raw(uint8_t* p) { 
  STREAM_TO_UINT16(manufacturer, p);

  STREAM_TO_UINT16(lmp_subversion, p);



  btm_read_remote_version_complete(status, handle, lmp_version, manufacturer,

                                   lmp_version);

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

                                   lmp_version, manufacturer, lmp_version);

}



void btm_read_remote_version_complete(uint8_t status, uint16_t handle,

void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

                                      uint16_t lmp_subversion) {

system/stack/include/acl_hci_link_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle); 
void btm_read_remote_features_complete_raw(uint8_t* p);

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(uint8_t status, uint16_t handle,

void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

                                      uint16_t lmp_subversion);