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

Commit 7338e980 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes I6f7bb67a,Idb75cbfb,I29c6eeae,I8a23fbc8,I225d01c4, ... 

* changes:
  Fold BTA_DmDiscoverByTransport into BTA_DmDiscover
  The extended part of service mask is never used
  mask_ext.num_uuid is always 0
  Remove sdp_search from discovery, it's always true
  Remove hack from I2819702ac068be9515824234e85d81ac2ec7a748
  Minor improvement
  Fix error when converting state machine table
parents 98ef1800 ff7bc416

system/bta/dm/bta_dm_act.cc

+2 −78
Original line number Diff line number Diff line
@@ -97,10 +97,6 @@ static uint8_t bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data); 


static void bta_dm_set_eir(char* local_name);



static void bta_dm_eir_search_services(tBTM_INQ_RESULTS* p_result,

                                       tBTA_SERVICE_MASK* p_services_to_search,

                                       tBTA_SERVICE_MASK* p_services_found);



static void bta_dm_search_timer_cback(void* data);

static void bta_dm_disable_conn_down_timer_cback(void* data);

static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
@@ -900,8 +896,8 @@ void bta_dm_search_cancel() { 
 ******************************************************************************/

void bta_dm_discover(tBTA_DM_MSG* p_data) {

  size_t len = sizeof(Uuid) * p_data->discover.num_uuid;

  APPL_TRACE_EVENT("%s services_to_search=0x%04X, sdp_search=%d", __func__,

                   p_data->discover.services, p_data->discover.sdp_search);

  APPL_TRACE_EVENT("%s services_to_search=0x%04X", __func__,

                   p_data->discover.services);



  /* save the search condition */

  bta_dm_search_cb.services = p_data->discover.services;
@@ -916,12 +912,10 @@ void bta_dm_discover(tBTA_DM_MSG* p_data) { 
  bta_dm_search_cb.uuid_to_search = bta_dm_search_cb.num_uuid;



  bta_dm_search_cb.p_search_cback = p_data->discover.p_cback;

  bta_dm_search_cb.sdp_search = p_data->discover.sdp_search;

  bta_dm_search_cb.services_to_search = bta_dm_search_cb.services;

  bta_dm_search_cb.service_index = 0;

  bta_dm_search_cb.services_found = 0;

  bta_dm_search_cb.peer_name[0] = 0;

  bta_dm_search_cb.sdp_search = p_data->discover.sdp_search;

  bta_dm_search_cb.p_btm_inq_info = BTM_InqDbRead(p_data->discover.bd_addr);

  bta_dm_search_cb.transport = p_data->discover.transport;
@@ -1804,14 +1798,6 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
    bta_dm_search_cb.services_found = 0;

    bta_dm_search_cb.services_to_search = bta_dm_search_cb.services;

    bta_dm_search_cb.uuid_to_search = bta_dm_search_cb.num_uuid;

    if ((bta_dm_search_cb.p_btm_inq_info != NULL) &&

        bta_dm_search_cb.services != BTA_USER_SERVICE_MASK &&

        (!bta_dm_search_cb.sdp_search)) {

      /* check if EIR provides the information of supported services */

      bta_dm_eir_search_services(&bta_dm_search_cb.p_btm_inq_info->results,

                                 &bta_dm_search_cb.services_to_search,

                                 &bta_dm_search_cb.services_found);

    }



    /* if seaching with EIR is not completed */

    if (bta_dm_search_cb.services_to_search) {
@@ -3181,68 +3167,6 @@ static void bta_dm_set_eir(char* local_name) { 
  BTM_WriteEIR(p_buf);

}



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

 *

 * Function         bta_dm_eir_search_services

 *

 * Description      This function searches services in received EIR

 *

 * Returns          None

 *

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

static void bta_dm_eir_search_services(tBTM_INQ_RESULTS* p_result,

                                       tBTA_SERVICE_MASK* p_services_to_search,

                                       tBTA_SERVICE_MASK* p_services_found) {

  tBTA_SERVICE_MASK service_index = 0;

  tBTM_EIR_SEARCH_RESULT result;



  VLOG(1) << "BTA searching services in EIR of BDA:"

          << p_result->remote_bd_addr;



  APPL_TRACE_DEBUG("    with services_to_search=0x%08X", *p_services_to_search);



  /* always do GATT based service discovery by SDP instead of from EIR    */

  /* if GATT based service is also to be put in EIR, need to modify this  */

  while (service_index < (BTA_MAX_SERVICE_ID - 1)) {

    if (*p_services_to_search &

        (tBTA_SERVICE_MASK)(BTA_SERVICE_ID_TO_SERVICE_MASK(service_index))) {

      result = BTM_HasInquiryEirService(

          p_result, bta_service_id_to_uuid_lkup_tbl[service_index]);



      /* Searching for HSP v1.2 only device */

      if ((result != BTM_EIR_FOUND) &&

          (bta_service_id_to_uuid_lkup_tbl[service_index] ==

           UUID_SERVCLASS_HEADSET)) {

        result = BTM_HasInquiryEirService(p_result, UUID_SERVCLASS_HEADSET_HS);

      }



      if (result == BTM_EIR_FOUND) {

        /* If Plug and Play service record, need to check to see if Broadcom

         * stack */

        /* However, EIR data doesn't have EXT_BRCM_VERSION so just skip it */

        if (bta_service_id_to_uuid_lkup_tbl[service_index] !=

            UUID_SERVCLASS_PNP_INFORMATION) {

          *p_services_found |= (tBTA_SERVICE_MASK)(

              BTA_SERVICE_ID_TO_SERVICE_MASK(service_index));

          /* remove the service from services to be searched  */

          *p_services_to_search &= (tBTA_SERVICE_MASK)(

              ~(BTA_SERVICE_ID_TO_SERVICE_MASK(service_index)));

        }

      } else if (result == BTM_EIR_NOT_FOUND) {

        /* remove the service from services to be searched  */

        *p_services_to_search &= (tBTA_SERVICE_MASK)(

            ~(BTA_SERVICE_ID_TO_SERVICE_MASK(service_index)));

      }

    }



    service_index++;

  }



  APPL_TRACE_ERROR(

      "BTA EIR search result, services_to_search=0x%08X, services_found=0x%08X",

      *p_services_to_search, *p_services_found);

}



#if (BTA_EIR_CANNED_UUID_LIST != TRUE)

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

 *

system/bta/dm/bta_dm_api.cc

+3 −65
Original line number Diff line number Diff line
@@ -141,15 +141,15 @@ void BTA_DmSearchCancel(void) { 
 *

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

void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_SERVICE_MASK services,

                    tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search) {

                    tBTA_DM_SEARCH_CBACK* p_cback, tBT_TRANSPORT transport) {

  tBTA_DM_API_DISCOVER* p_msg =

      (tBTA_DM_API_DISCOVER*)osi_calloc(sizeof(tBTA_DM_API_DISCOVER));



  p_msg->hdr.event = BTA_DM_API_DISCOVER_EVT;

  p_msg->bd_addr = bd_addr;

  p_msg->services = services;

  p_msg->transport = transport;

  p_msg->p_cback = p_cback;

  p_msg->sdp_search = sdp_search;



  bta_sys_sendmsg(p_msg);

}
@@ -166,7 +166,7 @@ void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_SERVICE_MASK services, 
 *

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

void BTA_DmDiscoverUUID(const RawAddress& bd_addr, const Uuid& uuid,

                        tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search) {

                        tBTA_DM_SEARCH_CBACK* p_cback) {

  tBTA_DM_API_DISCOVER* p_msg =

      (tBTA_DM_API_DISCOVER*)osi_malloc(sizeof(tBTA_DM_API_DISCOVER));
@@ -174,7 +174,6 @@ void BTA_DmDiscoverUUID(const RawAddress& bd_addr, const Uuid& uuid, 
  p_msg->bd_addr = bd_addr;

  p_msg->services = BTA_USER_SERVICE_MASK;  // Not exposed at API level

  p_msg->p_cback = p_cback;

  p_msg->sdp_search = sdp_search;



  p_msg->num_uuid = 0;

  p_msg->p_uuid = NULL;
@@ -518,67 +517,6 @@ void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr, 
                            max_conn_int, slave_latency, supervision_tout));

}



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

 *

 * Function         bta_dm_discover_send_msg

 *

 * Description      This function send discover message to BTA task.

 *

 * Returns          void

 *

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

static void bta_dm_discover_send_msg(const RawAddress& bd_addr,

                                     tBTA_SERVICE_MASK_EXT* p_services,

                                     tBTA_DM_SEARCH_CBACK* p_cback,

                                     bool sdp_search, tBT_TRANSPORT transport) {

  const size_t len =

      p_services

          ? (sizeof(tBTA_DM_API_DISCOVER) + sizeof(Uuid) * p_services->num_uuid)

          : sizeof(tBTA_DM_API_DISCOVER);

  tBTA_DM_API_DISCOVER* p_msg = (tBTA_DM_API_DISCOVER*)osi_calloc(len);



  p_msg->hdr.event = BTA_DM_API_DISCOVER_EVT;

  p_msg->bd_addr = bd_addr;

  p_msg->p_cback = p_cback;

  p_msg->sdp_search = sdp_search;

  p_msg->transport = transport;



  if (p_services != NULL) {

    p_msg->services = p_services->srvc_mask;

    p_msg->num_uuid = p_services->num_uuid;

    if (p_services->num_uuid != 0) {

      p_msg->p_uuid = (Uuid*)(p_msg + 1);

      memcpy(p_msg->p_uuid, p_services->p_uuid,

             sizeof(Uuid) * p_services->num_uuid);

    }

  }



  bta_sys_sendmsg(p_msg);

}



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

 *

 * Function         BTA_DmDiscoverByTransport

 *

 * Description      This function does service discovery on particular transport

 *                  for services of a

 *                  peer device. When services.num_uuid is 0, it indicates all

 *                  GATT based services are to be searched; otherwise a list of

 *                  UUID of interested services should be provided through

 *                  p_services->p_uuid.

 *

 *

 *

 * Returns          void

 *

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

void BTA_DmDiscoverByTransport(const RawAddress& bd_addr,

                               tBTA_SERVICE_MASK_EXT* p_services,

                               tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search,

                               tBT_TRANSPORT transport) {

  bta_dm_discover_send_msg(bd_addr, p_services, p_cback, sdp_search, transport);

}



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

 *

 * Function         BTA_DmBleUpdateConnectionParam

system/bta/dm/bta_dm_int.h

+0 −2
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ typedef struct { 
  RawAddress bd_addr;

  tBTA_SERVICE_MASK services;

  tBTA_DM_SEARCH_CBACK* p_cback;

  bool sdp_search;

  tBT_TRANSPORT transport;

  uint8_t num_uuid;

  bluetooth::Uuid* p_uuid;
@@ -340,7 +339,6 @@ typedef struct { 
  bool sdp_results;

  bluetooth::Uuid uuid;

  uint8_t peer_scn;

  bool sdp_search;

  bool cancel_pending; /* inquiry cancel is pending */

  tBT_TRANSPORT transport;

  tBTA_DM_SEARCH_CBACK* p_scan_cback;

system/bta/dm/bta_dm_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
        case BTA_DM_SEARCH_CMPL_EVT:

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          osi_free_and_reset((void**)&bta_dm_search_cb.p_sdp_db);

          bta_dm_free_sdp_db(message);

          bta_dm_search_cancel_notify();

          bta_dm_search_cancel_cmpl();

          break;
@@ -129,7 +129,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
    case BTA_DM_DISCOVER_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);

          bta_dm_disc_rmt_name(message);

          break;

        case BTA_DM_SDP_RESULT_EVT:

          bta_dm_sdp_result(message);

system/bta/include/bta_api.h

+3 −30
Original line number Diff line number Diff line
@@ -138,13 +138,6 @@ typedef uint8_t tBTA_SERVICE_ID; 


typedef uint32_t tBTA_SERVICE_MASK;



/* extended service mask, including mask with one or more GATT UUID */

typedef struct {

  tBTA_SERVICE_MASK srvc_mask;

  uint8_t num_uuid;

  bluetooth::Uuid* p_uuid;

} tBTA_SERVICE_MASK_EXT;



/* Security Setting Mask */

#define BTA_SEC_NONE BTM_SEC_NONE /* No security. */

#define BTA_SEC_AUTHORIZE                                               \
@@ -989,7 +982,8 @@ extern void BTA_DmSearchCancel(void); 
 ******************************************************************************/

extern void BTA_DmDiscover(const RawAddress& bd_addr,

                           tBTA_SERVICE_MASK services,

                           tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search);

                           tBTA_DM_SEARCH_CBACK* p_cback,

                           tBT_TRANSPORT transport);



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

 *
@@ -1004,7 +998,7 @@ extern void BTA_DmDiscover(const RawAddress& bd_addr, 
 ******************************************************************************/

extern void BTA_DmDiscoverUUID(const RawAddress& bd_addr,

                               const bluetooth::Uuid& uuid,

                               tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search);

                               tBTA_DM_SEARCH_CBACK* p_cback);



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

 *
@@ -1290,27 +1284,6 @@ extern void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr, 
                                       uint16_t slave_latency,

                                       uint16_t supervision_tout);



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

 *

 * Function         BTA_DmDiscoverByTransport

 *

 * Description      This function does service discovery on particular transport

 *                  for services of a

 *                  peer device. When services.num_uuid is 0, it indicates all

 *                  GATT based services are to be searched; other wise a list of

 *                  UUID of interested services should be provided through

 *                  p_services->p_uuid.

 *

 *

 *

 * Returns          void

 *

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

extern void BTA_DmDiscoverByTransport(const RawAddress& bd_addr,

                                      tBTA_SERVICE_MASK_EXT* p_services,

                                      tBTA_DM_SEARCH_CBACK* p_cback,

                                      bool sdp_search, tBT_TRANSPORT transport);



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

 *

 * Function         BTA_DmSetEncryption