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

Commit 88631c4e authored by Zach Johnson's avatar Zach Johnson
Browse files

BTM_PERIODIC_INQUIRY_ACTIVE is never set 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ice5231bdfadfc594cd47c2b7a14dc8bd70cbcafd
parent ad90d6ee

system/main/shim/btm_api.cc

+0 −3
Original line number Diff line number Diff line
@@ -524,9 +524,6 @@ uint16_t bluetooth::shim::BTM_IsInquiryActive(void) { 
    return BTM_LIMITED_INQUIRY_ACTIVE;

  } else if (Stack::GetInstance()->GetBtm()->IsGeneralInquiryActive()) {

    return BTM_GENERAL_INQUIRY_ACTIVE;

  } else if (Stack::GetInstance()->GetBtm()->IsGeneralPeriodicInquiryActive() ||

             Stack::GetInstance()->GetBtm()->IsLimitedPeriodicInquiryActive()) {

    return BTM_PERIODIC_INQUIRY_ACTIVE;

  }

  return BTM_INQUIRY_INACTIVE;

}

system/main/shim/btm_api.h

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ uint16_t BTM_ReadConnectability(uint16_t* p_window, uint16_t* p_interval); 
 * Returns          BTM_INQUIRY_INACTIVE if inactive (0)

 *                  BTM_LIMITED_INQUIRY_ACTIVE if a limted inquiry is active

 *                  BTM_GENERAL_INQUIRY_ACTIVE if a general inquiry is active

 *                  BTM_PERIODIC_INQUIRY_ACTIVE if a periodic inquiry is active

 *

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

uint16_t BTM_IsInquiryActive(void);

system/stack/btm/btm_inq.cc

+10 −32
Original line number Diff line number Diff line
@@ -369,23 +369,12 @@ tBTM_STATUS BTM_CancelPeriodicInquiry(void) { 
    return bluetooth::shim::BTM_CancelPeriodicInquiry();

  }



  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;

  tBTM_STATUS status = BTM_SUCCESS;

  BTM_TRACE_API("BTM_CancelPeriodicInquiry called");



  /*** Make sure the device is ready ***/

  if (!BTM_IsDeviceUp()) return (BTM_WRONG_MODE);



  /* Only cancel if one is active */

  if (btm_cb.btm_inq_vars.inq_active & BTM_PERIODIC_INQUIRY_ACTIVE) {

    btm_cb.btm_inq_vars.inq_active = BTM_INQUIRY_INACTIVE;

    btm_cb.btm_inq_vars.p_inq_results_cb = NULL;



    btsnd_hcic_exit_per_inq();



    p_inq->inq_counter++;

  }



  return (status);

}
@@ -505,7 +494,6 @@ uint16_t BTM_ReadConnectability(uint16_t* p_window, uint16_t* p_interval) { 
 * Returns          BTM_INQUIRY_INACTIVE if inactive (0)

 *                  BTM_LIMITED_INQUIRY_ACTIVE if a limted inquiry is active

 *                  BTM_GENERAL_INQUIRY_ACTIVE if a general inquiry is active

 *                  BTM_PERIODIC_INQUIRY_ACTIVE if a periodic inquiry is active

 *

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

uint16_t BTM_IsInquiryActive(void) {
@@ -538,8 +526,7 @@ void BTM_CancelInquiry(void) { 


  /* Only cancel if not in periodic mode, otherwise the caller should call

   * BTM_CancelPeriodicMode */

  if ((p_inq->inq_active & BTM_INQUIRY_ACTIVE_MASK) != 0 &&

      (!(p_inq->inq_active & BTM_PERIODIC_INQUIRY_ACTIVE))) {

  if ((p_inq->inq_active & BTM_INQUIRY_ACTIVE_MASK) != 0) {

    p_inq->inq_active = BTM_INQUIRY_INACTIVE;

    p_inq->state = BTM_INQ_INACTIVE_STATE;

    p_inq->p_inq_results_cb = NULL; /* Do not notify caller anymore */
@@ -932,9 +919,7 @@ void btm_inq_stop_on_ssp(void) { 
#endif

  if (btm_cb.btm_inq_vars.no_inc_ssp) {

    if (btm_cb.btm_inq_vars.state == BTM_INQ_ACTIVE_STATE) {

      if (btm_cb.btm_inq_vars.inq_active & BTM_PERIODIC_INQUIRY_ACTIVE) {

        BTM_CancelPeriodicInquiry();

      } else if (btm_cb.btm_inq_vars.inq_active & normal_active) {

      if (btm_cb.btm_inq_vars.inq_active & normal_active) {

        /* can not call BTM_CancelInquiry() here. We need to report inquiry

         * complete evt */

        btsnd_hcic_inq_cancel();
@@ -1028,8 +1013,7 @@ bool btm_inq_find_bdaddr(const RawAddress& p_bda) { 
  uint16_t xx;



  /* Don't bother searching, database doesn't exist or periodic mode */

  if ((p_inq->inq_active & BTM_PERIODIC_INQUIRY_ACTIVE) || !p_db)

    return (false);

  if (!p_db) return (false);



  for (xx = 0; xx < p_inq->num_bd_entries; xx++, p_db++) {

    if (p_db->bd_addr == p_bda && p_db->inq_count == p_inq->inq_counter)
@@ -1155,10 +1139,6 @@ static void btm_initiate_inquiry() { 
  lap = (p_inq->inq_active & BTM_LIMITED_INQUIRY_ACTIVE) ? &limited_inq_lap

                                                         : &general_inq_lap;



  if (p_inq->inq_active & BTM_PERIODIC_INQUIRY_ACTIVE) {

    btsnd_hcic_per_inq_mode(p_inq->per_max_delay, p_inq->per_min_delay, *lap,

                            p_inqparms->duration, 0);

  } else {

  btm_clr_inq_result_flt();



  /* Allocate memory to hold bd_addrs responding */
@@ -1168,7 +1148,6 @@ static void btm_initiate_inquiry() { 


  btsnd_hcic_inquiry(*lap, p_inqparms->duration, 0);

}

}



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

 *
@@ -1428,8 +1407,7 @@ void btm_process_inq_complete(uint8_t status, uint8_t mode) { 


    /* Notify caller that the inquiry has completed; (periodic inquiries do not

     * send completion events */

    if (!(p_inq->inq_active & BTM_PERIODIC_INQUIRY_ACTIVE) &&

        p_inq->inqparms.mode == 0) {

    if (p_inq->inqparms.mode == 0) {

      btm_clear_all_pending_le_entry();

      p_inq->state = BTM_INQ_INACTIVE_STATE;

system/stack/include/btm_api.h

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
 * Returns          BTM_INQUIRY_INACTIVE if inactive (0)

 *                  BTM_LIMITED_INQUIRY_ACTIVE if a limted inquiry is active

 *                  BTM_GENERAL_INQUIRY_ACTIVE if a general inquiry is active

 *                  BTM_PERIODIC_INQUIRY_ACTIVE if a periodic inquiry is active

 *

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

uint16_t BTM_IsInquiryActive(void);

system/stack/include/btm_api_types.h

+2 −5
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1); 
#define BTM_GENERAL_INQUIRY_ACTIVE BTM_GENERAL_INQUIRY

/* a limited inquiry is in progress */

#define BTM_LIMITED_INQUIRY_ACTIVE BTM_LIMITED_INQUIRY

/* a periodic inquiry is active */

#define BTM_PERIODIC_INQUIRY_ACTIVE 0x8

/* SSP is active, so inquiry is disallowed (work around for FW bug) */

#define BTM_SSP_INQUIRY_ACTIVE 0x4

/* a general inquiry is in progress */
@@ -129,8 +127,7 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1); 
/* inquiry activity mask */

/* BR/EDR inquiry activity mask */

#define BTM_BR_INQ_ACTIVE_MASK \

  (BTM_GENERAL_INQUIRY_ACTIVE | BTM_LIMITED_INQUIRY_ACTIVE | \

   BTM_PERIODIC_INQUIRY_ACTIVE)

  (BTM_GENERAL_INQUIRY_ACTIVE | BTM_LIMITED_INQUIRY_ACTIVE)

/* LE scan activity mask */

#define BTM_BLE_SCAN_ACTIVE_MASK 0xF0

/* LE inquiry activity mask*/