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

Commit b729de86 authored by Chris Manton's avatar Chris Manton
Browse files

[5/7] stack::btm::inq BTM_GENERAL_INQUIRY_ACTIVE => BTM_GENERAL_INQUIRY 

Bug: 345484372
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: Ie44fa9e79aaccc3b5604fca5deadd61077ab3466
parent 4f723b9c

system/stack/acl/btm_pm.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -857,7 +857,7 @@ static bool btm_pm_device_in_active_or_sniff_mode(void) { 
bool BTM_PM_DeviceInScanState(void) {

bool BTM_PM_DeviceInScanState(void) {

  /* Check for inquiry */

  /* Check for inquiry */

  if ((btm_cb.btm_inq_vars.inq_active &

  if ((btm_cb.btm_inq_vars.inq_active &

       (BTM_GENERAL_INQUIRY_ACTIVE | BTM_BLE_GENERAL_INQUIRY)) != 0) {

       (BTM_GENERAL_INQUIRY | BTM_BLE_GENERAL_INQUIRY)) != 0) {

    log::verbose("BTM_PM_DeviceInScanState- Inq active");

    log::verbose("BTM_PM_DeviceInScanState- Inq active");

    return true;

    return true;

  }

  }

system/stack/btm/btm_inq.cc

+5 −5
Original line number Original line Diff line number Diff line
@@ -508,7 +508,7 @@ tBTM_STATUS BTM_SetConnectability(uint16_t page_mode) { 
 *                  state

 *                  state

 *

 *

 * Returns          BTM_INQUIRY_INACTIVE if inactive (0)

 * Returns          BTM_INQUIRY_INACTIVE if inactive (0)

 *                  BTM_GENERAL_INQUIRY_ACTIVE if a general inquiry is active

 *                  BTM_GENERAL_INQUIRY if a general inquiry is active

 *

 *

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

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

uint16_t BTM_IsInquiryActive(void) {

uint16_t BTM_IsInquiryActive(void) {
@@ -1039,7 +1039,7 @@ void btm_inq_db_reset(void) { 




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

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

     * caller */

     * caller */

    if (temp_inq_active == BTM_GENERAL_INQUIRY_ACTIVE) {

    if (temp_inq_active == BTM_GENERAL_INQUIRY) {

      if (btm_cb.btm_inq_vars.p_inq_cmpl_cb) {

      if (btm_cb.btm_inq_vars.p_inq_cmpl_cb) {

        num_responses = 0;

        num_responses = 0;

        (*btm_cb.btm_inq_vars.p_inq_cmpl_cb)(&num_responses);

        (*btm_cb.btm_inq_vars.p_inq_cmpl_cb)(&num_responses);
@@ -1288,7 +1288,7 @@ static void btm_process_inq_results_standard(bluetooth::hci::EventView event) { 
             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);





  /* Only process the results if the BR inquiry is still active */

  /* Only process the results if the BR inquiry is still active */

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY_ACTIVE)) {

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY)) {

    log::info("Inquiry is inactive so dropping inquiry result");

    log::info("Inquiry is inactive so dropping inquiry result");

    return;

    return;

  }

  }
@@ -1409,7 +1409,7 @@ static void btm_process_inq_results_rssi(bluetooth::hci::EventView event) { 
             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);





  /* Only process the results if the BR inquiry is still active */

  /* Only process the results if the BR inquiry is still active */

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY_ACTIVE)) {

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY)) {

    log::info("Inquiry is inactive so dropping inquiry result");

    log::info("Inquiry is inactive so dropping inquiry result");

    return;

    return;

  }

  }
@@ -1553,7 +1553,7 @@ static void btm_process_inq_results_extended(bluetooth::hci::EventView event) { 
             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);





  /* Only process the results if the BR inquiry is still active */

  /* Only process the results if the BR inquiry is still active */

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY_ACTIVE)) {

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY)) {

    log::info("Inquiry is inactive so dropping inquiry result");

    log::info("Inquiry is inactive so dropping inquiry result");

    return;

    return;

  }

  }

system/stack/btm/neighbor_inquiry.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -69,10 +69,8 @@ enum : uint8_t { 
  BTM_BLE_GENERAL_INQUIRY = 0x10,

  BTM_BLE_GENERAL_INQUIRY = 0x10,

  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),

  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),

  BTM_GENERAL_INQUIRY_ACTIVE = BTM_GENERAL_INQUIRY,

  /* inquiry activity mask */

  /* inquiry activity mask */

  BTM_INQUIRY_ACTIVE_MASK =

  BTM_INQUIRY_ACTIVE_MASK = (BTM_GENERAL_INQUIRY | BTM_BLE_GENERAL_INQUIRY),

      (BTM_GENERAL_INQUIRY_ACTIVE | BTM_BLE_GENERAL_INQUIRY),

};

};





/* Define scan types */

/* Define scan types */