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

Commit 409bdb17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Remove UNUSED btsnd_hcic_write_link_super_tout::controller id" am: 8427fdfa 

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

Change-Id: I783a9d61d250f7ba13ad362d6d21387f7ffe0045
parents cd7c0217 8427fdfa

system/stack/acl/btm_acl.cc

+2 −4
Original line number Diff line number Diff line
@@ -214,8 +214,7 @@ void hci_btm_set_link_supervision_timeout(tACL_CONN& link, uint16_t timeout) { 
  LOG_DEBUG("Setting link supervision timeout:%.2fs peer:%s",

            double(timeout) * 0.01, PRIVATE_ADDRESS(link.RemoteAddress()));

  link.link_super_tout = timeout;

  btsnd_hcic_write_link_super_tout(LOCAL_BR_EDR_CONTROLLER_ID, link.Handle(),

                                   timeout);

  btsnd_hcic_write_link_super_tout(link.Handle(), timeout);

}



/* 3 seconds timeout waiting for responses */
@@ -1175,8 +1174,7 @@ tBTM_STATUS BTM_SetLinkSuperTout(const RawAddress& remote_bda, 
  /* Only send if current role is Central; 2.0 spec requires this */

  if (p_acl->link_role == HCI_ROLE_CENTRAL) {

    p_acl->link_super_tout = timeout;

    btsnd_hcic_write_link_super_tout(LOCAL_BR_EDR_CONTROLLER_ID,

                                     p_acl->hci_handle, timeout);

    btsnd_hcic_write_link_super_tout(p_acl->hci_handle, timeout);

    LOG_DEBUG("Set supervision timeout:%.2fms bd_addr:%s",

              supervision_timeout_to_seconds(timeout),

              PRIVATE_ADDRESS(remote_bda));

system/stack/hcic/hcicmds.cc

+2 −3
Original line number Diff line number Diff line
@@ -1353,8 +1353,7 @@ void btsnd_hcic_host_num_xmitted_pkts(uint8_t num_handles, uint16_t* handle, 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_write_link_super_tout(uint8_t local_controller_id,

                                      uint16_t handle, uint16_t timeout) {

void btsnd_hcic_write_link_super_tout(uint16_t handle, uint16_t timeout) {

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

  uint8_t* pp = (uint8_t*)(p + 1);
@@ -1367,7 +1366,7 @@ void btsnd_hcic_write_link_super_tout(uint8_t local_controller_id, 
  UINT16_TO_STREAM(pp, handle);

  UINT16_TO_STREAM(pp, timeout);



  btu_hcif_send_cmd(local_controller_id, p);

  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_write_cur_iac_lap(uint8_t num_cur_iac, LAP* const iac_lap) {

system/stack/include/hcimsgs.h

+2 −4
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ struct Interface { 
  void (*SetControllerToHostFlowControl)();

  void (*HostBufferSize)();

  void (*HostNumCompletedPackets)();

  void (*ReadLinkSupervisionTimeout)(uint8_t local_controller_id,

                                     uint16_t handle, uint16_t timeout);

  void (*ReadLinkSupervisionTimeout)(uint16_t handle, uint16_t timeout);

  void (*WriteLinkSupervisionTimeout)();

  void (*ReadNumberOfSupportedIac)();

  void (*ReadCurrentIacLap)();
@@ -467,8 +466,7 @@ extern void btsnd_hcic_host_num_xmitted_pkts( 
    uint16_t* num_pkts); /* Set Host Buffer Size */



/* Write Link Supervision Timeout */

extern void btsnd_hcic_write_link_super_tout(uint8_t local_controller_id,

                                             uint16_t handle, uint16_t timeout);

extern void btsnd_hcic_write_link_super_tout(uint16_t handle, uint16_t timeout);

/* Write Link Supervision Timeout */



extern void btsnd_hcic_write_cur_iac_lap(

system/test/mock/mock_hcic_hcicmds.cc

+1 −2
Original line number Diff line number Diff line
@@ -287,8 +287,7 @@ void btsnd_hcic_write_inqscan_type(uint8_t type) { 
void btsnd_hcic_write_inquiry_mode(uint8_t mode) {

  mock_function_count_map[__func__]++;

}

void btsnd_hcic_write_link_super_tout(uint8_t local_controller_id,

                                      uint16_t handle, uint16_t timeout) {

void btsnd_hcic_write_link_super_tout(uint16_t handle, uint16_t timeout) {

  mock_function_count_map[__func__]++;

}

void btsnd_hcic_write_page_tout(uint16_t timeout) {