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

Commit 235f6317 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Add tHCI_STATUS to btm_acl_role_changed am: 45e3a04a am: bab022c3 am: 2216e6b6 

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

Change-Id: I4457182154d752df1d080f0dee6771e87d1e71bf
parents e550c75a 2216e6b6

system/stack/acl/acl.h

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ typedef struct { 
                                     uint8_t encr_enable);

  friend void btm_acl_init(void);

  friend void btm_acl_process_sca_cmpl_pkt(uint8_t evt_len, uint8_t* p);

  friend void btm_acl_role_changed(uint8_t hci_status,

  friend void btm_acl_role_changed(tHCI_STATUS hci_status,

                                   const RawAddress& bd_addr, uint8_t new_role);

  friend void btm_acl_update_conn_addr(uint16_t conn_handle,

                                       const RawAddress& address);

system/stack/acl/btm_acl.cc

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ struct StackAclBtmAcl { 
  void btm_establish_continue(tACL_CONN* p_acl_cb);

  void btm_read_remote_features(uint16_t handle);

  void btm_set_default_link_policy(uint16_t settings);

  void btm_acl_role_changed(uint8_t hci_status, const RawAddress& bd_addr,

  void btm_acl_role_changed(tHCI_STATUS hci_status, const RawAddress& bd_addr,

                            uint8_t new_role);

};
@@ -1383,7 +1383,7 @@ void btm_blacklist_role_change_device(const RawAddress& bd_addr, 
 * Returns          void

 *

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

void StackAclBtmAcl::btm_acl_role_changed(uint8_t hci_status,

void StackAclBtmAcl::btm_acl_role_changed(tHCI_STATUS hci_status,

                                          const RawAddress& bd_addr,

                                          uint8_t new_role) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR);
@@ -1446,7 +1446,7 @@ void StackAclBtmAcl::btm_acl_role_changed(uint8_t hci_status, 
  }

}



void btm_acl_role_changed(uint8_t hci_status, const RawAddress& bd_addr,

void btm_acl_role_changed(tHCI_STATUS hci_status, const RawAddress& bd_addr,

                          uint8_t new_role) {

  if (hci_status == HCI_SUCCESS) {

    l2c_link_role_changed(&bd_addr, new_role, hci_status);

system/stack/btu/btu_hcif.cc

+3 −2
Original line number Diff line number Diff line
@@ -1394,7 +1394,8 @@ static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status, 
      if (status != HCI_SUCCESS) {

        // Tell BTM that the command failed

        STREAM_TO_BDADDR(bd_addr, p_cmd);

        btm_acl_role_changed(status, bd_addr, HCI_ROLE_UNKNOWN);

        btm_acl_role_changed(static_cast<tHCI_STATUS>(status), bd_addr,

                             HCI_ROLE_UNKNOWN);

      }

      break;

    case HCI_CREATE_CONNECTION:
@@ -1553,7 +1554,7 @@ static void btu_hcif_role_change_evt(uint8_t* p) { 
  STREAM_TO_UINT8(role, p);



  btm_blacklist_role_change_device(bda, status);

  btm_acl_role_changed(status, bda, role);

  btm_acl_role_changed(static_cast<tHCI_STATUS>(status), bda, role);

}



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

system/stack/include/acl_hci_link_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void btm_acl_encrypt_change(uint16_t handle, uint8_t status, 
                            uint8_t encr_enable);

void btm_acl_paging(BT_HDR* p, const RawAddress& dest);

void btm_acl_resubmit_page(void);

void btm_acl_role_changed(uint8_t hci_status, const RawAddress& bd_addr,

void btm_acl_role_changed(tHCI_STATUS hci_status, const RawAddress& bd_addr,

                          uint8_t new_role);

void btm_blacklist_role_change_device(const RawAddress& bd_addr,

                                      uint8_t hci_status);