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

Commit ea2043f8 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

device_discovery: Remove unused shim code am: 549a6c1c am: 40f06b89 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2938839



Change-Id: Idf6890447cc5f438ddc561c69ac10f2fb3149a6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bbba63e 40f06b89

system/main/shim/btm_api.h

+0 −58
Original line number Diff line number Diff line
@@ -29,43 +29,6 @@ 
namespace bluetooth {

namespace shim {



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

 *

 * Function         BTM_StartInquiry

 *

 * Description      This function is called to start an inquiry.

 *

 * Parameters:      p_inqparms - pointer to the inquiry information

 *                      mode - GENERAL or LIMITED inquiry

 *                      duration - length in 1.28 sec intervals (If '0', the

 *                                 inquiry is CANCELLED)

 *                      filter_cond_type - BTM_CLR_INQUIRY_FILTER,

 *                                         BTM_FILTER_COND_DEVICE_CLASS, or

 *                                         BTM_FILTER_COND_BD_ADDR

 *                      filter_cond - value for the filter (based on

 *                                                          filter_cond_type)

 *

 *                  p_results_cb  - Pointer to the callback routine which gets

 *                                called upon receipt of an inquiry result. If

 *                                this field is NULL, the application is not

 *                                notified.

 *

 *                  p_cmpl_cb   - Pointer to the callback routine which gets

 *                                called upon completion.  If this field is

 *                                NULL, the application is not notified when

 *                                completed.

 * Returns          tBTM_STATUS

 *                  BTM_CMD_STARTED if successfully initiated

 *                  BTM_BUSY if already in progress

 *                  BTM_ILLEGAL_VALUE if parameter(s) are out of range

 *                  BTM_NO_RESOURCES if could not allocate resources to start

 *                                   the command

 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,

                             tBTM_CMPL_CB* p_cmpl_cb);



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

 *

 * Function         BTM_SetDiscoverability
@@ -177,27 +140,6 @@ tBTM_STATUS BTM_SetInquiryMode(uint8_t mode); 
tBTM_STATUS BTM_SetConnectability(uint16_t page_mode, uint16_t window,

                                  uint16_t interval);



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

 *

 * Function         BTM_IsInquiryActive

 *

 * Description      Return a bit mask of the current inquiry state

 *

 * Returns          BTM_INQUIRY_INACTIVE if inactive (0)

 *                  BTM_GENERAL_INQUIRY_ACTIVE if a general inquiry is active

 *

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

uint16_t BTM_IsInquiryActive(void);



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

 *

 * Function         BTM_CancelInquiry

 *

 * Description      This function cancels an inquiry if active

 *

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

void BTM_CancelInquiry(void);



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

 *

 * Function         BTM_ReadRemoteDeviceName

system/stack/include/btm_api_types.h

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

 *  Device Discovery Types

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

/* Definitions of the parameters passed to BTM_StartInquiry.

 */

constexpr uint8_t BLE_EVT_CONNECTABLE_BIT = 0;

constexpr uint8_t BLE_EVT_SCANNABLE_BIT = 1;

constexpr uint8_t BLE_EVT_DIRECTED_BIT = 2;

system/test/mock/mock_main_shim_btm_api.cc

+0 −13
Original line number Diff line number Diff line
@@ -112,22 +112,11 @@ tBTM_STATUS bluetooth::shim::BTM_SetInquiryMode(uint8_t /* inquiry_mode */) { 
  inc_func_call_count(__func__);

  return BTM_SUCCESS;

}

tBTM_STATUS bluetooth::shim::BTM_StartInquiry(

    tBTM_INQ_RESULTS_CB* /* p_results_cb */, tBTM_CMPL_CB* /* p_cmpl_cb */) {

  inc_func_call_count(__func__);

  return BTM_SUCCESS;

}



uint16_t bluetooth::shim::BTM_GetHCIConnHandle(

    const RawAddress& /* remote_bda */, tBT_TRANSPORT /* transport */) {

  inc_func_call_count(__func__);

  return 0;

}

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

  inc_func_call_count(__func__);

  return 0;

}



uint8_t bluetooth::shim::BTM_BleMaxMultiAdvInstanceCount() {

  inc_func_call_count(__func__);

  return 0;
@@ -155,8 +144,6 @@ void bluetooth::shim::BTM_BleSetPrefConnParams( 
  inc_func_call_count(__func__);

}



void bluetooth::shim::BTM_CancelInquiry(void) { inc_func_call_count(__func__); }



void bluetooth::shim::BTM_EnableInterlacedInquiryScan() {

  inc_func_call_count(__func__);

}