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

Commit 20d9c736 authored by Zach Johnson's avatar Zach Johnson Committed by Chris Manton
Browse files

Rename busy level updates to inquiry status updates 

Now that we've cleaned up the function, it's true purpose has been
unmasked.

It would have gotten away with it too, if it weren't for these
meddling kids.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I04eab90be8bb9fda32143230a923c987a7e9a9a1
parent 903b7be1

system/btif/src/btif_dm.cc

+6 −6
Original line number Diff line number Diff line
@@ -1641,20 +1641,20 @@ static void btif_dm_remote_service_record_evt(uint16_t event, char* p_param) { 
  }

}



static void report_busy_level_change(uint8_t busy_level_flags) {

  if (busy_level_flags == BTM_BL_INQUIRY_STARTED) {

static void report_inquiry_status_change(uint8_t status) {

  if (status == BTM_INQUIRY_STARTED) {

    HAL_CBACK(bt_hal_cbacks, discovery_state_changed_cb, BT_DISCOVERY_STARTED);

    btif_dm_inquiry_in_progress = true;

  } else if (busy_level_flags == BTM_BL_INQUIRY_CANCELLED) {

  } else if (status == BTM_INQUIRY_CANCELLED) {

    HAL_CBACK(bt_hal_cbacks, discovery_state_changed_cb, BT_DISCOVERY_STOPPED);

    btif_dm_inquiry_in_progress = false;

  } else if (busy_level_flags == BTM_BL_INQUIRY_COMPLETE) {

  } else if (status == BTM_INQUIRY_COMPLETE) {

    btif_dm_inquiry_in_progress = false;

  }

}



void BTIF_dm_report_busy_level_change(uint8_t busy_level_flags) {

  do_in_jni_thread(base::Bind(report_busy_level_change, busy_level_flags));

void BTIF_dm_report_inquiry_status_change(uint8_t status) {

  do_in_jni_thread(base::Bind(report_inquiry_status_change, status));

}



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

system/main/shim/btm_api.cc

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda); 
/**

 * Legacy bluetooth btm stack entry points

 */

extern void btm_acl_update_busy_level(tBTM_BLI_EVENT event);

extern void btm_acl_update_inquiry_status(uint8_t status);

extern void btm_clear_all_pending_le_entry(void);

extern void btm_clr_inq_result_flt(void);

extern void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
@@ -317,7 +317,7 @@ tBTM_STATUS bluetooth::shim::BTM_StartInquiry(tBTM_INQ_PARMS* p_inqparms, 
                      __func__, status, inquiry_mode);

            btm_cb.btm_inq_vars.inqparms.mode &= ~(inquiry_mode);



            btm_acl_update_busy_level(BTM_BLI_INQ_DONE_EVT);

            btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);

            if (btm_cb.btm_inq_vars.inq_active) {

              btm_cb.btm_inq_vars.inq_cmpl_info.status = status;

              btm_clear_all_pending_le_entry();
@@ -360,7 +360,7 @@ tBTM_STATUS bluetooth::shim::BTM_StartInquiry(tBTM_INQ_PARMS* p_inqparms, 
  btm_cb.btm_inq_vars.p_inq_results_cb = p_results_cb;

  btm_cb.btm_inq_vars.inq_active = p_inqparms->mode;



  btm_acl_update_busy_level(BTM_BLI_INQ_EVT);

  btm_acl_update_inquiry_status(BTM_INQUIRY_STARTED);



  return BTM_CMD_STARTED;

}
@@ -450,7 +450,7 @@ tBTM_STATUS bluetooth::shim::BTM_BleObserve(bool start, uint8_t duration_sec, 
            btm_cb.btm_inq_vars.inqparms.mode &= ~(BTM_BLE_INQUIRY_MASK);

            btm_cb.btm_inq_vars.scan_type = INQ_NONE;



            btm_acl_update_busy_level(BTM_BLI_INQ_DONE_EVT);

            btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);



            btm_clear_all_pending_le_entry();

            btm_cb.btm_inq_vars.state = BTM_INQ_INACTIVE_STATE;
@@ -599,7 +599,7 @@ tBTM_STATUS bluetooth::shim::BTM_CancelInquiry(void) { 
  btm_cb.btm_inq_vars.inqparms.mode &=

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



  btm_acl_update_busy_level(BTM_BLI_INQ_DONE_EVT);

  btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);

  /* Ignore any stray or late complete messages if the inquiry is not active */

  if (btm_cb.btm_inq_vars.inq_active) {

    btm_cb.btm_inq_vars.inq_cmpl_info.status = BTM_SUCCESS;

system/stack/acl/btm_acl.cc

+4 −30
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ tBTM_SEC_DEV_REC* btm_find_dev_by_handle(uint16_t handle); 
tBTM_SEC_DEV_REC* btm_find_or_alloc_dev(const RawAddress& bd_addr);

tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);

tBTM_STATUS btm_set_packet_types(tACL_CONN* p, uint16_t pkt_types);

void btm_acl_update_busy_level(tBTM_BLI_EVENT event);

void btm_ble_refresh_local_resolvable_private_addr(

    const RawAddress& pseudo_addr, const RawAddress& local_rpa);

void btm_establish_continue(tACL_CONN* p_acl_cb);
@@ -77,7 +76,7 @@ static void btm_read_tx_power_timeout(void* data); 
static void btm_process_remote_ext_features(tACL_CONN* p_acl_cb,

                                            uint8_t num_read_pages);



void BTIF_dm_report_busy_level_change(uint8_t busy_level_flags);

void BTIF_dm_report_inquiry_status_change(uint8_t busy_level_flags);

/* 3 seconds timeout waiting for responses */

#define BTM_DEV_REPLY_TIMEOUT_MS (3 * 1000)
@@ -441,34 +440,9 @@ void btm_acl_device_down(void) { 


void btm_acl_set_paging(bool value) { btm_cb.is_paging = value; }



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

 *

 * Function         btm_acl_update_busy_level

 *

 * Description      This function is called to update the busy level of the

 *                  system.

 *

 * Returns          void

 *

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

void btm_acl_update_busy_level(tBTM_BLI_EVENT event) {

  switch (event) {

    case BTM_BLI_INQ_EVT:

      BTM_TRACE_DEBUG("BTM_BLI_INQ_EVT");

      btm_cb.is_inquiry = true;

      BTIF_dm_report_busy_level_change(BTM_BL_INQUIRY_STARTED);

      break;

    case BTM_BLI_INQ_CANCEL_EVT:

      BTM_TRACE_DEBUG("BTM_BLI_INQ_CANCEL_EVT");

      btm_cb.is_inquiry = false;

      BTIF_dm_report_busy_level_change(BTM_BL_INQUIRY_CANCELLED);

      break;

    case BTM_BLI_INQ_DONE_EVT:

      BTM_TRACE_DEBUG("BTM_BLI_INQ_DONE_EVT");

      btm_cb.is_inquiry = false;

      BTIF_dm_report_busy_level_change(BTM_BL_INQUIRY_COMPLETE);

      break;

  }

void btm_acl_update_inquiry_status(uint8_t status) {

  btm_cb.is_inquiry = status == BTM_INQUIRY_STARTED;

  BTIF_dm_report_inquiry_status_change(status);

}



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

system/stack/btm/btm_ble_gap.cc

+1 −1
Original line number Diff line number Diff line
@@ -1941,7 +1941,7 @@ void btm_ble_process_adv_pkt_cont(uint16_t evt_type, uint8_t addr_type, 


      btm_ble_stop_inquiry();



      btm_acl_update_busy_level(BTM_BLI_INQ_DONE_EVT);

      btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);

    }

  }

system/stack/btm/btm_inq.cc

+4 −9
Original line number Diff line number Diff line
@@ -572,11 +572,6 @@ tBTM_STATUS BTM_CancelInquiry(void) { 
        btm_ble_stop_inquiry();

    }



    /* Do not send the BUSY_LEVEL event yet. Wait for the cancel_complete event

     * and then send the BUSY_LEVEL event

     * btm_acl_update_busy_level (BTM_BLI_INQ_DONE_EVT);

     */



    p_inq->inq_counter++;

    btm_clr_inq_result_flt();

  }
@@ -1424,7 +1419,7 @@ static void btm_initiate_inquiry(tBTM_INQUIRY_VAR_ST* p_inq) { 
      btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state,

      btm_cb.btm_inq_vars.inqfilt_active);

#endif

  btm_acl_update_busy_level(BTM_BLI_INQ_EVT);

  btm_acl_update_inquiry_status(BTM_INQUIRY_STARTED);



  if (p_inq->inq_active & BTM_SSP_INQUIRY_ACTIVE) {

    btm_process_inq_complete(BTM_NO_RESOURCES,
@@ -1654,7 +1649,7 @@ void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len, 


        if ((p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0)

          btm_ble_stop_inquiry();

        btm_acl_update_busy_level(BTM_BLI_INQ_DONE_EVT);

        btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);

      }

      /* Initialize flag to false. This flag is set/used by application */

      p_i->inq_info.appl_knows_rem_name = false;
@@ -1743,7 +1738,7 @@ void btm_process_inq_complete(uint8_t status, uint8_t mode) { 
      btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state,

      btm_cb.btm_inq_vars.inqfilt_active);

#endif

  btm_acl_update_busy_level(BTM_BLI_INQ_DONE_EVT);

  btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);

  /* Ignore any stray or late complete messages if the inquiry is not active */

  if (p_inq->inq_active) {

    p_inq->inq_cmpl_info.status = (tBTM_STATUS)(
@@ -1804,7 +1799,7 @@ void btm_process_inq_complete(uint8_t status, uint8_t mode) { 
 *

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

void btm_process_cancel_complete(uint8_t status, uint8_t mode) {

  btm_acl_update_busy_level(BTM_BLI_INQ_CANCEL_EVT);

  btm_acl_update_inquiry_status(BTM_INQUIRY_CANCELLED);

  btm_process_inq_complete(status, mode);

}

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