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

Commit 1ef77440 authored by Myles Watson's avatar Myles Watson
Browse files

Remove unused ReadLinkQuality timer and complete 

Bug: 322230000
Test: mma -j32
Flag: EXEMPT, unused code
Change-Id: I3d2be3fc32b287e4ab83b71f651743f91b3b18c0
parent a6b3c060

system/stack/acl/btm_acl.cc

+0 −58
Original line number Diff line number Diff line
@@ -2004,64 +2004,6 @@ void btm_read_automatic_flush_timeout_complete(uint8_t* p) { 
  }

}



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

 *

 * Function         btm_read_link_quality_complete

 *

 * Description      This function is called when the command complete message

 *                  is received from the HCI for the read link quality.

 *

 * Returns          void

 *

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

void btm_read_link_quality_complete(uint8_t* p, uint16_t evt_len) {

  tBTM_CMPL_CB* p_cb = btm_cb.devcb.p_link_qual_cmpl_cb;

  tBTM_LINK_QUALITY_RESULT result;



  alarm_cancel(btm_cb.devcb.read_link_quality_timer);

  btm_cb.devcb.p_link_qual_cmpl_cb = NULL;



  /* If there was a registered callback, call it */

  if (p_cb) {

    if (evt_len < 1) {

      goto err_out;

    }



    STREAM_TO_UINT8(result.hci_status, p);



    if (result.hci_status == HCI_SUCCESS) {

      uint16_t handle;

      result.status = BTM_SUCCESS;



      if (evt_len < 4) {

        goto err_out;

      }



      STREAM_TO_UINT16(handle, p);



      STREAM_TO_UINT8(result.link_quality, p);

      log::debug(

          "BTM Link Quality Complete: Link Quality {}, hci status:{}",

          result.link_quality,

          hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status)));



      tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle);

      if (p_acl_cb != nullptr) {

        result.rem_bda = p_acl_cb->remote_addr;

      }

    } else {

      result.status = BTM_ERR_PROCESSING;

    }



    (*p_cb)(&result);

  }



  return;



err_out:

  log::error("Bogus Link Quality event packet, size: {}", evt_len);

}



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

 *

 * Function         btm_remove_acl

system/stack/btm/btm_devctl.cc

+0 −3
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ void btm_dev_init() { 
      alarm_new("btm.read_failed_contact_counter_timer");

  btm_cb.devcb.read_automatic_flush_timeout_timer =

      alarm_new("btm.read_automatic_flush_timeout_timer");

  btm_cb.devcb.read_link_quality_timer =

      alarm_new("btm.read_link_quality_timer");

  btm_cb.devcb.read_tx_power_timer = alarm_new("btm.read_tx_power_timer");

}
@@ -109,7 +107,6 @@ void btm_dev_free() { 
  alarm_free(btm_cb.devcb.read_rssi_timer);

  alarm_free(btm_cb.devcb.read_failed_contact_counter_timer);

  alarm_free(btm_cb.devcb.read_automatic_flush_timeout_timer);

  alarm_free(btm_cb.devcb.read_link_quality_timer);

  alarm_free(btm_cb.devcb.read_tx_power_timer);

}

system/stack/btm/btm_int_types.h

+0 −6
Original line number Diff line number Diff line
@@ -89,10 +89,6 @@ typedef struct tBTM_DEVCB { 
  tBTM_CMPL_CB* p_automatic_flush_timeout_cmpl_cb; /* Callback function to be */

  /* called when read Automatic Flush Timeout function completes */



  alarm_t* read_link_quality_timer;

  tBTM_CMPL_CB* p_link_qual_cmpl_cb; /* Callback function to be called when  */

                                     /* read link quality function completes */



  alarm_t* read_tx_power_timer;     /* Read tx power timer */

  tBTM_CMPL_CB* p_tx_power_cmpl_cb; /* Callback function to be called       */
@@ -111,7 +107,6 @@ typedef struct tBTM_DEVCB { 
        alarm_new("btm.read_failed_contact_counter_timer");

    read_automatic_flush_timeout_timer =

        alarm_new("btm.read_automatic_flush_timeout_timer");

    read_link_quality_timer = alarm_new("btm.read_link_quality_timer");

    read_tx_power_timer = alarm_new("btm.read_tx_power_timer");

  }
@@ -120,7 +115,6 @@ typedef struct tBTM_DEVCB { 
    alarm_free(read_rssi_timer);

    alarm_free(read_failed_contact_counter_timer);

    alarm_free(read_automatic_flush_timeout_timer);

    alarm_free(read_link_quality_timer);

    alarm_free(read_tx_power_timer);

  }

} tBTM_DEVCB;

system/stack/btu/btu_hcif.cc

+0 −4
Original line number Diff line number Diff line
@@ -919,10 +919,6 @@ static void btu_hcif_hdl_command_complete(uint16_t opcode, uint8_t* p, 
      btm_read_local_name_complete(p, evt_len);

      break;



    case HCI_GET_LINK_QUALITY:

      btm_read_link_quality_complete(p, evt_len);

      break;



    case HCI_READ_RSSI:

      btm_read_rssi_complete(p, evt_len);

      break;

system/stack/include/acl_hci_link_interface.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ void btm_pm_proc_mode_change(tHCI_STATUS hci_status, uint16_t hci_handle, 
void btm_pm_proc_ssr_evt(uint8_t* p, uint16_t evt_len);

void btm_read_automatic_flush_timeout_complete(uint8_t* p);

void btm_read_failed_contact_counter_complete(uint8_t* p);

void btm_read_link_quality_complete(uint8_t* p, uint16_t evt_len);

void btm_read_remote_ext_features_complete_raw(uint8_t* p, uint8_t evt_len);

void btm_read_remote_ext_features_complete(uint16_t handle, uint8_t page_num,

                                           uint8_t max_page, uint8_t* features);