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

Commit 55e5a050 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes I5f284c8c,I5f1afa5e,I5e7478e9,I9c717be1,Ie8d7e20a, ... 

* changes:
  read_inq_tx_power_timer is never used
  p_inq_tx_power_cmpl_cb is always null
  Remove dead code
  btm_process_remote_name does nothing interesting if remote name not active
  btm_inq_vars.scan_type is not useful
  Remove useless variable
  Status is set but not used
  Replace with equivalent expression
  Remove unnecessary variable
  state is already set to this value higher in this function
  Flatten btm_initiate_inquiry
  BTM_BLE_LIMITED_INQUIRY is never used
  BTM_LIMITED_INQUIRY is never set
  Delete BTM_CancelPeriodicInquiry, it's unused and does nothing
  BTM_PERIODIC_INQUIRY_ACTIVE is never set
  This condition will never be met
  Replace equivalent expression
  Don't report illegal value for something uncontrollable
  reduce duplicate mask setting
  p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK is always true
parents 9f7f064d e9a85eb4

system/main/shim/btm.cc

+0 −6
Original line number Diff line number Diff line
@@ -452,12 +452,6 @@ bool Btm::StartPeriodicInquiry(uint8_t mode, uint8_t duration, 
  return true;

}



void Btm::CancelPeriodicInquiry() {

  limited_periodic_inquiry_active_ = false;

  general_periodic_inquiry_active_ = false;

  GetInquiry()->StopPeriodicInquiry();

}



bool Btm::IsGeneralPeriodicInquiryActive() const {

  return general_periodic_inquiry_active_;

}

system/main/shim/btm_api.cc

+1 −21
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ tBTM_STATUS bluetooth::shim::BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
  std::lock_guard<std::mutex> lock(btm_cb_mutex_);



  btm_cb.btm_inq_vars.inq_cmpl_info.num_resp = 0;

  btm_cb.btm_inq_vars.scan_type = INQ_GENERAL;



  Stack::GetInstance()->GetBtm()->StartActiveScanning();

  if (inqparms.duration != 0) {
@@ -293,10 +292,6 @@ tBTM_STATUS bluetooth::shim::BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
                btm_cb.btm_inq_vars.p_inq_cmpl_cb = nullptr;

              }

            }

            if (btm_cb.btm_inq_vars.inqparms.mode == BTM_INQUIRY_NONE &&

                btm_cb.btm_inq_vars.scan_type == INQ_GENERAL) {

              btm_cb.btm_inq_vars.scan_type = INQ_NONE;

            }

          })) {

    LOG_WARN("%s Unable to start inquiry", __func__);

    return BTM_ERR_PROCESSING;
@@ -395,7 +390,6 @@ tBTM_STATUS bluetooth::shim::BTM_BleObserve(bool start, uint8_t duration_sec, 
            btm_cb.ble_ctr_cb.p_obs_cmpl_cb = nullptr;



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

            btm_cb.btm_inq_vars.scan_type = INQ_NONE;



            btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);
@@ -468,11 +462,6 @@ uint16_t bluetooth::shim::BTM_ReadDiscoverability(uint16_t* p_window, 
  return state.mode;

}



tBTM_STATUS bluetooth::shim::BTM_CancelPeriodicInquiry(void) {

  Stack::GetInstance()->GetBtm()->CancelPeriodicInquiry();

  return BTM_SUCCESS;

}



tBTM_STATUS bluetooth::shim::BTM_SetConnectability(uint16_t page_mode,

                                                   uint16_t window,

                                                   uint16_t interval) {
@@ -520,13 +509,8 @@ 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;

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

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

    return BTM_PERIODIC_INQUIRY_ACTIVE;

  }

  return BTM_INQUIRY_INACTIVE;

}
@@ -569,10 +553,6 @@ void bluetooth::shim::BTM_CancelInquiry(void) { 
      btm_cb.btm_inq_vars.p_inq_cmpl_cb = nullptr;

    }

  }

  if (btm_cb.btm_inq_vars.inqparms.mode == BTM_INQUIRY_NONE &&

      btm_cb.btm_inq_vars.scan_type == INQ_GENERAL) {

    btm_cb.btm_inq_vars.scan_type = INQ_NONE;

  }

}



tBTM_STATUS bluetooth::shim::BTM_ReadRemoteDeviceName(

system/main/shim/btm_api.h

+0 −16
Original line number Diff line number Diff line
@@ -134,20 +134,6 @@ tBTM_STATUS BTM_SetInquiryMode(uint8_t mode); 
 ******************************************************************************/

uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval);



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

 *

 * Function         BTM_CancelPeriodicInquiry

 *

 * Description      This function cancels a periodic inquiry

 *

 * Returns

 *                  BTM_NO_RESOURCES if could not allocate a message buffer

 *                  BTM_SUCCESS - if cancelling the periodic inquiry

 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_CancelPeriodicInquiry(void);



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

 *

 * Function         BTM_SetConnectability
@@ -186,9 +172,7 @@ 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

 *                  BTM_PERIODIC_INQUIRY_ACTIVE if a periodic inquiry is active

 *

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

uint16_t BTM_IsInquiryActive(void);

system/stack/btm/btm_ble_gap.cc

+2 −9
Original line number Diff line number Diff line
@@ -389,9 +389,8 @@ tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, 
  uint32_t scan_window =

      !p_inq->scan_window ? BTM_BLE_GAP_DISC_SCAN_WIN : p_inq->scan_window;



  BTM_TRACE_EVENT("%s : scan_type:%d, %d, %d", __func__,

                  btm_cb.btm_inq_vars.scan_type, p_inq->scan_interval,

                  p_inq->scan_window);

  BTM_TRACE_EVENT("%s : scan_type:%d, %d, %d", __func__, p_inq->scan_type,

                  p_inq->scan_interval, p_inq->scan_window);



  if (!controller_get_interface()->supports_ble()) return BTM_ILLEGAL_VALUE;
@@ -1387,12 +1386,6 @@ uint8_t btm_ble_is_discoverable(const RawAddress& bda, 
        BTM_TRACE_DEBUG("Find Generable Discoverable device");

        rt |= BTM_BLE_INQ_RESULT;

      }



      else if (btm_cb.btm_inq_vars.inq_active & BTM_BLE_LIMITED_INQUIRY &&

               (flag & BTM_BLE_LIMIT_DISC_FLAG) != 0) {

        BTM_TRACE_DEBUG("Find limited discoverable device");

        rt |= BTM_BLE_INQ_RESULT;

      }

    }

  }

  return rt;

system/stack/btm/btm_devctl.cc

+0 −2
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ void btm_dev_init() { 
      alarm_new("btm.read_automatic_flush_timeout_timer");

  btm_cb.devcb.read_link_quality_timer =

      alarm_new("btm.read_link_quality_timer");

  btm_cb.devcb.read_inq_tx_power_timer =

      alarm_new("btm.read_inq_tx_power_timer");

  btm_cb.devcb.read_tx_power_timer = alarm_new("btm.read_tx_power_timer");



  btm_cb.btm_sco_pkt_types_supported =