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

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

Remove unused stack::btm::BTM_HasInquiryEirService 

Bug: 191555414
Test: mma -j98 .

Change-Id: I3a7cd7d6d79473cadf6f0e7451bd5352aae63b02
parent 78d3479f

system/main/shim/btm_api.cc

+0 −7
Original line number Diff line number Diff line
@@ -392,13 +392,6 @@ bool bluetooth::shim::BTM_HasEirService(const uint32_t* p_eir_uuid, 
  return false;

}



tBTM_EIR_SEARCH_RESULT bluetooth::shim::BTM_HasInquiryEirService(

    tBTM_INQ_RESULTS* p_results, uint16_t uuid16) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

  CHECK(p_results != nullptr);

  return BTM_EIR_UNKNOWN;

}



void bluetooth::shim::BTM_AddEirService(uint32_t* p_eir_uuid, uint16_t uuid16) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

  CHECK(p_eir_uuid != nullptr);

system/main/shim/btm_api.h

+0 −17
Original line number Diff line number Diff line
@@ -320,23 +320,6 @@ tBTM_STATUS BTM_ClearInqDb(const RawAddress* p_bda); 
 ******************************************************************************/

bool BTM_HasEirService(const uint32_t* p_eir_uuid, uint16_t uuid16);



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

 *

 * Function         BTM_HasInquiryEirService

 *

 * Description      Return if a UUID is in the bit map of a UUID list.

 *

 * Parameters       p_results - inquiry results

 *                  uuid16 - UUID 16-bit

 *

 * Returns          BTM_EIR_FOUND - if found

 *                  BTM_EIR_NOT_FOUND - if not found and it is a complete list

 *                  BTM_EIR_UNKNOWN - if not found and it is not complete list

 *

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

tBTM_EIR_SEARCH_RESULT BTM_HasInquiryEirService(tBTM_INQ_RESULTS* p_results,

                                                uint16_t uuid16);



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

 *

 * Function         BTM_AddEirService

system/stack/btm/btm_inq.cc

+0 −25
Original line number Diff line number Diff line
@@ -1770,31 +1770,6 @@ bool BTM_HasEirService(const uint32_t* p_eir_uuid, uint16_t uuid16) { 
    return (false);

}



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

 *

 * Function         BTM_HasInquiryEirService

 *

 * Description      This function is called to know if UUID in bit map of UUID

 *                  list.

 *

 * Parameters       p_results - inquiry results

 *                  uuid16 - UUID 16-bit

 *

 * Returns          BTM_EIR_FOUND - if found

 *                  BTM_EIR_NOT_FOUND - if not found and it is complete list

 *                  BTM_EIR_UNKNOWN - if not found and it is not complete list

 *

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

tBTM_EIR_SEARCH_RESULT BTM_HasInquiryEirService(tBTM_INQ_RESULTS* p_results,

                                                uint16_t uuid16) {

  if (BTM_HasEirService(p_results->eir_uuid, uuid16)) {

    return BTM_EIR_FOUND;

  } else if (p_results->eir_complete_list) {

    return BTM_EIR_NOT_FOUND;

  } else

    return BTM_EIR_UNKNOWN;

}



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

 *

 * Function         BTM_AddEirService

system/stack/include/btm_api.h

+0 −17
Original line number Diff line number Diff line
@@ -833,23 +833,6 @@ tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff); 
 ******************************************************************************/

bool BTM_HasEirService(const uint32_t* p_eir_uuid, uint16_t uuid16);



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

 *

 * Function         BTM_HasInquiryEirService

 *

 * Description      Return if a UUID is in the bit map of a UUID list.

 *

 * Parameters       p_results - inquiry results

 *                  uuid16 - UUID 16-bit

 *

 * Returns          BTM_EIR_FOUND - if found

 *                  BTM_EIR_NOT_FOUND - if not found and it is a complete list

 *                  BTM_EIR_UNKNOWN - if not found and it is not complete list

 *

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

tBTM_EIR_SEARCH_RESULT BTM_HasInquiryEirService(tBTM_INQ_RESULTS* p_results,

                                                uint16_t uuid16);



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

 *

 * Function         BTM_AddEirService

system/stack/include/btm_api_types.h

+0 −6
Original line number Diff line number Diff line
@@ -81,12 +81,6 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1); 
#define BTM_EIR_MAX_SERVICES 46



/* search result in EIR of inquiry database */

#define BTM_EIR_FOUND 0

#define BTM_EIR_NOT_FOUND 1

#define BTM_EIR_UNKNOWN 2



typedef uint8_t tBTM_EIR_SEARCH_RESULT;



typedef enum : uint8_t {

  BTM_BLE_SEC_NONE = 0,

  /* encrypt the link using current key */