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

Commit c4f95718 authored by Zach Johnson's avatar Zach Johnson
Browse files

BTM_LIMITED_INQUIRY is never set 

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

system/main/shim/btm_api.cc

+1 −3
Original line number Diff line number Diff line
@@ -515,9 +515,7 @@ uint16_t bluetooth::shim::BTM_ReadConnectability(uint16_t* p_window, 
}



uint16_t bluetooth::shim::BTM_IsInquiryActive(void) {

  if (Stack::GetInstance()->GetBtm()->IsLimitedInquiryActive()) {

    return BTM_LIMITED_INQUIRY_ACTIVE;

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

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

    return BTM_GENERAL_INQUIRY_ACTIVE;

  }

  return BTM_INQUIRY_INACTIVE;

system/main/shim/btm_api.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ uint16_t BTM_ReadConnectability(uint16_t* p_window, uint16_t* p_interval); 
 * Description      Return a bit mask of the current inquiry state

 *

 * 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

 *

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

system/stack/btm/btm_inq.cc

+3 −7
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ uint16_t BTM_ReadConnectability(uint16_t* p_window, uint16_t* p_interval) { 
 *                  state

 *

 * 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

 *

 ******************************************************************************/
@@ -816,8 +815,7 @@ void btm_inq_db_reset(void) { 


    /* If not a periodic inquiry, the complete callback must be called to notify

     * caller */

    if (temp_inq_active == BTM_LIMITED_INQUIRY_ACTIVE ||

        temp_inq_active == BTM_GENERAL_INQUIRY_ACTIVE) {

    if (temp_inq_active == BTM_GENERAL_INQUIRY_ACTIVE) {

      if (p_inq->p_inq_cmpl_cb) {

        num_responses = 0;

        (*p_inq->p_inq_cmpl_cb)(&num_responses);
@@ -882,8 +880,7 @@ void btm_inq_db_init(void) { 
 *

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

void btm_inq_stop_on_ssp(void) {

  uint8_t normal_active =

      (BTM_GENERAL_INQUIRY_ACTIVE | BTM_LIMITED_INQUIRY_ACTIVE);

  uint8_t normal_active = (BTM_GENERAL_INQUIRY_ACTIVE);



#if (BTM_INQ_DEBUG == TRUE)

  BTM_TRACE_DEBUG(
@@ -1110,8 +1107,7 @@ static void btm_initiate_inquiry() { 
    return;

  }



  lap = (p_inq->inq_active & BTM_LIMITED_INQUIRY_ACTIVE) ? &limited_inq_lap

                                                         : &general_inq_lap;

  lap = &general_inq_lap;



  btm_clr_inq_result_flt();

system/stack/include/btm_api.h

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
 * Description      Return a bit mask of the current inquiry state

 *

 * 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

 *

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

system/stack/include/btm_api_types.h

+2 −6
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1); 
 */

#define BTM_INQUIRY_NONE 0

#define BTM_GENERAL_INQUIRY 0x01

#define BTM_LIMITED_INQUIRY 0x02

#define BTM_BR_INQUIRY_MASK (BTM_GENERAL_INQUIRY | BTM_LIMITED_INQUIRY)

#define BTM_BR_INQUIRY_MASK (BTM_GENERAL_INQUIRY)



/* high byte of inquiry mode for BLE inquiry mode */

#define BTM_BLE_INQUIRY_NONE 0x00
@@ -115,8 +114,6 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1); 
#define BTM_INQUIRY_INACTIVE 0x0

/* a general inquiry is in progress */

#define BTM_GENERAL_INQUIRY_ACTIVE BTM_GENERAL_INQUIRY

/* a limited inquiry is in progress */

#define BTM_LIMITED_INQUIRY_ACTIVE BTM_LIMITED_INQUIRY

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

#define BTM_SSP_INQUIRY_ACTIVE 0x4

/* a general inquiry is in progress */
@@ -126,8 +123,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)

#define BTM_BR_INQ_ACTIVE_MASK (BTM_GENERAL_INQUIRY_ACTIVE)

/* LE scan activity mask */

#define BTM_BLE_SCAN_ACTIVE_MASK 0xF0

/* LE inquiry activity mask*/