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

Commit 5c5b1fc1 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes I4ddc6e35,I931bd052,I5bf0c9e2,I10390d03,I6ebe3fb7, ... 

* changes:
  Flatten BTA_DM_API_SEARCH_CANCEL_EVT
  Remove unused pram from bta_dm_search_clear_queue
  Remove unused pram from bta_dm_search_cancel
  fold on_inquiry_complete into bta_dm_inq_cmpl
  Pass params to on_inquiry_complete instead of messages
  Pull BTA_DM_INQUIRY_CMPL_EVT out of state machine
  Remove unused arg from bta_dm_search_cancel_cmpl
  Remove unused arg from bta_dm_search_cancel_notify
  Flatten bta_dm_search_cancel_transac_cmpl
  Remove unused rs_res parameter & friends
parents bad4739a dcde63f0

system/bta/dm/bta_dm_act.cc

+22 −32
Original line number Diff line number Diff line
@@ -855,12 +855,12 @@ void bta_dm_search_start(tBTA_DM_MSG* p_data) { 
 * Returns          void

 *

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

void bta_dm_search_cancel(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_search_cancel() {

  tBTA_DM_MSG* p_msg;



  if (BTM_IsInquiryActive()) {

    if (BTM_CancelInquiry() == BTM_SUCCESS) {

      bta_dm_search_cancel_notify(NULL);

      bta_dm_search_cancel_notify();

      p_msg = (tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_MSG));

      p_msg->hdr.event = BTA_DM_SEARCH_CMPL_EVT;

      p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;
@@ -880,10 +880,7 @@ void bta_dm_search_cancel(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
    p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;

    bta_sys_sendmsg(p_msg);

  } else {

    p_msg = (tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_MSG));

    p_msg->hdr.event = BTA_DM_INQUIRY_CMPL_EVT;

    p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;

    bta_sys_sendmsg(p_msg);

    bta_dm_inq_cmpl(0);

  }



  if (bta_dm_search_cb.gatt_disc_active) {
@@ -993,7 +990,7 @@ static void bta_dm_di_disc_callback(uint16_t result) { 
static void bta_dm_disable_search_and_disc(void) {

  tBTA_DM_DI_DISC_CMPL di_disc;



  if (bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) bta_dm_search_cancel(NULL);

  if (bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) bta_dm_search_cancel();



  if (bta_dm_di_cb.p_di_db != NULL) {

    memset(&di_disc, 0, sizeof(tBTA_DM_DI_DISC_CMPL));
@@ -1091,12 +1088,22 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr, 
 * Returns          void

 *

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

void bta_dm_inq_cmpl(tBTA_DM_MSG* p_data) {

void bta_dm_inq_cmpl(uint8_t num) {

  if (bta_dm_search_get_state() == BTA_DM_SEARCH_CANCELLING) {

    bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

    bta_dm_search_cancel_cmpl();

    return;

  }



  if (bta_dm_search_get_state() != BTA_DM_SEARCH_ACTIVE) {

    return;

  }



  tBTA_DM_SEARCH data;



  APPL_TRACE_DEBUG("bta_dm_inq_cmpl");



  data.inq_cmpl.num_resps = p_data->inq_cmpl.num;

  data.inq_cmpl.num_resps = num;

  bta_dm_search_cb.p_search_cback(BTA_DM_INQ_CMPL_EVT, &data);



  bta_dm_search_cb.p_btm_inq_info = BTM_InqDbFirst();
@@ -1543,7 +1550,7 @@ void bta_dm_queue_disc(tBTA_DM_MSG* p_data) { 
 * Returns          void

 *

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

void bta_dm_search_clear_queue(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_search_clear_queue() {

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

}
@@ -1556,28 +1563,13 @@ void bta_dm_search_clear_queue(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
 * Returns          void

 *

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

void bta_dm_search_cancel_cmpl(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_search_cancel_cmpl() {

  if (bta_dm_search_cb.p_search_queue) {

    bta_sys_sendmsg(bta_dm_search_cb.p_search_queue);

    bta_dm_search_cb.p_search_queue = NULL;

  }

}



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

 *

 * Function         bta_dm_search_cancel_transac_cmpl

 *

 * Description      Current Service Discovery or remote name procedure is

 *                  completed after search cancellation

 *

 * Returns          void

 *

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

void bta_dm_search_cancel_transac_cmpl(UNUSED_ATTR tBTA_DM_MSG* p_data) {

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

  bta_dm_search_cancel_notify(NULL);

}



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

 *

 * Function         bta_dm_search_cancel_notify
@@ -1587,7 +1579,7 @@ void bta_dm_search_cancel_transac_cmpl(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
 * Returns          void

 *

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

void bta_dm_search_cancel_notify(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_search_cancel_notify() {

  if (bta_dm_search_cb.p_search_cback) {

    bta_dm_search_cb.p_search_cback(BTA_DM_SEARCH_CANCEL_CMPL_EVT, NULL);

  }
@@ -1960,17 +1952,15 @@ static void bta_dm_inq_cmpl_cb(void* p_result) { 
  APPL_TRACE_DEBUG("%s", __func__);



  if (!bta_dm_search_cb.cancel_pending) {

    p_msg->inq_cmpl.hdr.event = BTA_DM_INQUIRY_CMPL_EVT;

    p_msg->inq_cmpl.num = ((tBTM_INQUIRY_CMPL*)p_result)->num_resp;

    bta_dm_inq_cmpl(((tBTM_INQUIRY_CMPL*)p_result)->num_resp);

  } else {

    bta_dm_search_cb.cancel_pending = false;

    bta_dm_search_cancel_notify(NULL);

    bta_dm_search_cancel_notify();

    p_msg->hdr.event = BTA_DM_SEARCH_CMPL_EVT;

    p_msg->hdr.layer_specific = BTA_DM_API_DISCOVER_EVT;

  }



    bta_sys_sendmsg(p_msg);

  }

}



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

 *

system/bta/dm/bta_dm_api.cc

+17 −5
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ void BTA_DmSearch(tBTA_DM_INQ* p_dm_inq, tBTA_SERVICE_MASK services, 
  memcpy(&p_msg->inq_params, p_dm_inq, sizeof(tBTA_DM_INQ));

  p_msg->services = services;

  p_msg->p_cback = p_cback;

  p_msg->rs_res = BTA_DM_RS_NONE;



  bta_sys_sendmsg(p_msg);

}
@@ -111,10 +110,23 @@ void BTA_DmSearch(tBTA_DM_INQ* p_dm_inq, tBTA_SERVICE_MASK services, 
 *

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

void BTA_DmSearchCancel(void) {

  BT_HDR* p_msg = (BT_HDR*)osi_malloc(sizeof(BT_HDR));



  p_msg->event = BTA_DM_API_SEARCH_CANCEL_EVT;

  bta_sys_sendmsg(p_msg);

  switch (bta_dm_search_get_state()) {

    case BTA_DM_SEARCH_IDLE:

      bta_dm_search_cancel_notify();

      break;

    case BTA_DM_SEARCH_ACTIVE:

      bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

      bta_dm_search_cancel();

      break;

    case BTA_DM_SEARCH_CANCELLING:

      bta_dm_search_clear_queue();

      bta_dm_search_cancel_notify();

      break;

    case BTA_DM_DISCOVER_ACTIVE:

      bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

      bta_dm_search_cancel_notify();

      break;

  }

}



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

system/bta/dm/bta_dm_int.h

+8 −15
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
enum {

  /* DM search API events */

  BTA_DM_API_SEARCH_EVT = BTA_SYS_EVT_START(BTA_ID_DM_SEARCH),

  BTA_DM_API_SEARCH_CANCEL_EVT,

  BTA_DM_API_DISCOVER_EVT,

  BTA_DM_INQUIRY_CMPL_EVT,

  BTA_DM_REMT_NAME_EVT,
@@ -61,20 +60,12 @@ enum { 


};



enum {

  BTA_DM_RS_NONE, /* straight API call */

  BTA_DM_RS_OK,   /* the role switch result - successful */

  BTA_DM_RS_FAIL  /* the role switch result - failed */

};

typedef uint8_t tBTA_DM_RS_RES;



/* data type for BTA_DM_API_SEARCH_EVT */

typedef struct {

  BT_HDR hdr;

  tBTA_DM_INQ inq_params;

  tBTA_SERVICE_MASK services;

  tBTA_DM_SEARCH_CBACK* p_cback;

  tBTA_DM_RS_RES rs_res;

  uint8_t num_uuid;

  bluetooth::Uuid* p_uuid;

} tBTA_DM_API_SEARCH;
@@ -517,10 +508,10 @@ extern void bta_dm_disable_pm(void); 


extern uint8_t bta_dm_get_av_count(void);

extern void bta_dm_search_start(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel();

extern void bta_dm_discover(tBTA_DM_MSG* p_data);

extern void bta_dm_di_disc(tBTA_DM_MSG* p_data);

extern void bta_dm_inq_cmpl(tBTA_DM_MSG* p_data);

extern void bta_dm_inq_cmpl(uint8_t num);

extern void bta_dm_rmt_name(tBTA_DM_MSG* p_data);

extern void bta_dm_sdp_result(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cmpl(tBTA_DM_MSG* p_data);
@@ -530,13 +521,15 @@ extern void bta_dm_search_result(tBTA_DM_MSG* p_data); 
extern void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data);

extern void bta_dm_queue_search(tBTA_DM_MSG* p_data);

extern void bta_dm_queue_disc(tBTA_DM_MSG* p_data);

extern void bta_dm_search_clear_queue(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel_cmpl(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel_notify(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cancel_transac_cmpl(tBTA_DM_MSG* p_data);

extern void bta_dm_search_clear_queue();

extern void bta_dm_search_cancel_cmpl();

extern void bta_dm_search_cancel_notify();

extern void bta_dm_disc_rmt_name(tBTA_DM_MSG* p_data);

extern tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(

    const RawAddress& peer_addr);



uint8_t bta_dm_search_get_state();

void bta_dm_search_set_state(uint8_t state);



void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding);

#endif /* BTA_DM_INT_H */

system/bta/dm/bta_dm_main.cc

+4 −24
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ tBTA_DM_DI_CB bta_dm_di_cb; 
void bta_dm_search_sm_disable() { bta_sys_deregister(BTA_ID_DM_SEARCH); }



void bta_dm_search_set_state(uint8_t state) { bta_dm_search_cb.state = state; }

uint8_t bta_dm_search_get_state() { return bta_dm_search_cb.state; }



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

 *
@@ -70,9 +71,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          bta_dm_search_set_state(BTA_DM_SEARCH_ACTIVE);

          bta_dm_search_start(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_cancel_notify(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_search_set_state(BTA_DM_DISCOVER_ACTIVE);

          bta_dm_discover(message);
@@ -91,13 +89,6 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
      break;

    case BTA_DM_SEARCH_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          bta_dm_search_cancel(message);

          break;

        case BTA_DM_INQUIRY_CMPL_EVT:

          bta_dm_inq_cmpl(message);

          break;

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);

          break;
@@ -121,33 +112,22 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
        case BTA_DM_API_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue(message);

          bta_dm_search_cancel_notify(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_INQUIRY_CMPL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_search_cancel_cmpl(message);

          break;

        case BTA_DM_SDP_RESULT_EVT:

        case BTA_DM_REMT_NAME_EVT:

        case BTA_DM_SEARCH_CMPL_EVT:

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_search_cancel_transac_cmpl(message);

          bta_dm_search_cancel_cmpl(message);

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

          bta_dm_search_cancel_notify();

          bta_dm_search_cancel_cmpl();

          break;

      }

      break;

    case BTA_DM_DISCOVER_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          bta_dm_search_cancel_notify(message);

          break;

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);

          break;