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

Commit 85ce5cf8 authored by Chris Manton's avatar Chris Manton
Browse files

[6/7] stack::btm::inq BTM_BLE_INQUIRY_MASK => BTM_BLE_GENERAL_INQUIRY 

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

Change-Id: Ifa81c2633f1118f26c859687b2925513923e8d76
parent 77a3afc9

system/stack/btm/btm_ble_gap.cc

+1 −1
Original line number Diff line number Diff line
@@ -2491,7 +2491,7 @@ void btm_ble_stop_inquiry(void) { 
  // 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));

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

}



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

system/stack/btm/btm_inq.cc

+3 −3
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ uint16_t BTM_IsInquiryActive(void) { 
static void BTM_CancelLeScan() {

  if (!bluetooth::shim::is_classic_discovery_only_enabled()) {

    log::assert_that(BTM_IsDeviceUp(), "assert failed: BTM_IsDeviceUp()");

    if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0)

    if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_GENERAL_INQUIRY) != 0)

      btm_ble_stop_inquiry();

  } else {

    log::info(
@@ -607,7 +607,7 @@ static void btm_classic_inquiry_timeout(void* /* data */) { 
  // will be marked as completed. Therefore, we only need to mark

  // the BLE inquiry as completed here to stop processing BLE results

  // as inquiry results.

  btm_process_inq_complete(HCI_SUCCESS, BTM_BLE_INQUIRY_MASK);

  btm_process_inq_complete(HCI_SUCCESS, BTM_BLE_GENERAL_INQUIRY);

}



/*******************************************************************************
@@ -630,7 +630,7 @@ static tBTM_STATUS BTM_StartLeScan() { 
      return BTM_CMD_STARTED;

    } else {

      log::warn("Trying to do LE scan on a non-LE adapter");

      btm_cb.btm_inq_vars.inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;

      btm_cb.btm_inq_vars.inqparms.mode &= ~BTM_BLE_GENERAL_INQUIRY;

    }

  } else {

    log::info(

system/stack/btm/neighbor_inquiry.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ enum : uint8_t { 
  /* high nibble of inquiry mode for BLE inquiry mode */

  BTM_BLE_GENERAL_INQUIRY = 0x10,

  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),

  /* inquiry activity mask */

  BTM_INQUIRY_ACTIVE_MASK = (BTM_GENERAL_INQUIRY | BTM_BLE_GENERAL_INQUIRY),

};