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

Commit e0b6ca28 authored by Myles Watson's avatar Myles Watson
Browse files

Remove InquiryComplete legacy parsing 

Add a TODO to remember to make btm_process_inq_complete static

Bug: 322230000
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I6cf41bac05ae5539614d075d5ccbd16d97ed87ae
parent b906fffa

system/stack/btm/btm_ble_gap.cc

+1 −0
Original line number Diff line number Diff line
@@ -2778,6 +2778,7 @@ void btm_ble_stop_inquiry(void) { 
               btm_cb.btm_inq_vars.inq_cmpl_info.status,

               btm_cb.btm_inq_vars.inq_cmpl_info.num_resp);



  // TODO: remove this call and make btm_process_inq_complete static

  btm_process_inq_complete(

      HCI_SUCCESS,

      (uint8_t)(btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_INQUIRY_MASK));

system/stack/btu/btu_hcif.cc

+0 −23
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ void acl_disconnect_from_handle(uint16_t handle, tHCI_STATUS reason, 
/******************************************************************************/

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */

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

static void btu_hcif_inquiry_comp_evt(uint8_t* p);



static void btu_hcif_authentication_comp_evt(uint8_t* p);

static void btu_hcif_rmt_name_request_comp_evt(const uint8_t* p,

                                               uint16_t evt_len);
@@ -234,9 +232,6 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
  btu_hcif_log_event_metrics(hci_evt_code, p);



  switch (hci_evt_code) {

    case HCI_INQUIRY_COMP_EVT:

      btu_hcif_inquiry_comp_evt(p);

      break;

    case HCI_INQUIRY_RESULT_EVT:

      btm_process_inq_results(p, hci_evt_len, BTM_INQ_RESULT_STANDARD);

      break;
@@ -780,24 +775,6 @@ void btu_hcif_send_cmd_with_cb(const base::Location& posted_from, 
      btu_hcif_command_status_evt_with_cb, (void*)cb_wrapper);

}



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

 *

 * Function         btu_hcif_inquiry_comp_evt

 *

 * Description      Process event HCI_INQUIRY_COMP_EVT

 *

 * Returns          void

 *

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

static void btu_hcif_inquiry_comp_evt(uint8_t* p) {

  uint8_t status;



  STREAM_TO_UINT8(status, p);



  /* Tell inquiry processing that we are done */

  btm_process_inq_complete(to_hci_status_code(status), BTM_BR_INQUIRY_MASK);

}



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

 *

 * Function         btu_hcif_authentication_comp_evt