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

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

Delete BTM_CancelPeriodicInquiry, it's unused and does nothing 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I70128ef7190ada299a743c408ed2055d37c2f2cd
parent 88631c4e

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

+0 −5
Original line number Diff line number Diff line
@@ -468,11 +468,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) {

system/main/shim/btm_api.h

+0 −14
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

system/stack/btm/btm_inq.cc

+0 −26
Original line number Diff line number Diff line
@@ -352,32 +352,6 @@ uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval) { 
  return (btm_cb.btm_inq_vars.discoverable_mode);

}



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

 *

 * 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) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_CancelPeriodicInquiry();

  }



  tBTM_STATUS status = BTM_SUCCESS;

  BTM_TRACE_API("BTM_CancelPeriodicInquiry called");



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

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



  return (status);

}



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

 *

 * Function         BTM_SetConnectability

system/stack/include/btm_api.h

+0 −14
Original line number Diff line number Diff line
@@ -327,20 +327,6 @@ uint16_t BTM_IsInquiryActive(void); 
 ******************************************************************************/

void BTM_CancelInquiry(void);



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

 *

 * 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