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

Commit 5029df2c authored by Zach Johnson's avatar Zach Johnson
Browse files

simplify BTA_SdpEnable 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icda2d2d0a1499c87691481f53b8b5c0008dbb98b
parent acc32cd6

system/bta/sdp/bta_sdp_act.cc

+2 −3
Original line number Diff line number Diff line
@@ -400,14 +400,13 @@ static void bta_sdp_search_cback(uint16_t result, void* user_data) { 
 * Returns      void

 *

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

void bta_sdp_enable(tBTA_SDP_API_ENABLE* p_data) {

void bta_sdp_enable(tBTA_SDP_DM_CBACK* p_cback) {

  APPL_TRACE_DEBUG("%s in, sdp_active:%d", __func__, bta_sdp_cb.sdp_active);

  tBTA_SDP_STATUS status = BTA_SDP_SUCCESS;

  bta_sdp_cb.p_dm_cback = p_data->p_cback;

  bta_sdp_cb.p_dm_cback = p_cback;

  tBTA_SDP bta_sdp;

  bta_sdp.status = status;

  bta_sdp_cb.p_dm_cback(BTA_SDP_ENABLE_EVT, &bta_sdp, NULL);

  osi_free(p_data);

}



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

system/bta/sdp/bta_sdp_api.cc

+6 −15
Original line number Diff line number Diff line
@@ -52,22 +52,13 @@ 
 *

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

tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK* p_cback) {

  tBTA_SDP_STATUS status = BTA_SDP_FAILURE;

  if (!p_cback) {

    return BTA_SDP_FAILURE;

  }



  APPL_TRACE_API(__func__);

  if (p_cback) {

  memset(&bta_sdp_cb, 0, sizeof(tBTA_SDP_CB));



    if (p_cback) {

      tBTA_SDP_API_ENABLE* p_buf =

          (tBTA_SDP_API_ENABLE*)osi_malloc(sizeof(tBTA_SDP_API_ENABLE));

      p_buf->hdr.event = BTA_SDP_API_ENABLE_EVT;

      p_buf->p_cback = p_cback;

      do_in_main_thread(FROM_HERE, base::Bind(bta_sdp_enable, p_buf));

      status = BTA_SDP_SUCCESS;

    }

  }

  return status;

  do_in_main_thread(FROM_HERE, base::Bind(bta_sdp_enable, p_cback));

  return BTA_SDP_SUCCESS;

}



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

system/bta/sdp/bta_sdp_int.h

+1 −8
Original line number Diff line number Diff line
@@ -49,12 +49,6 @@ enum { 
  BTA_SDP_ACTIVE_YES /* waiting for SDP result */

};



/* data type for BTA_SDP_API_ENABLE_EVT */

typedef struct {

  BT_HDR hdr;

  tBTA_SDP_DM_CBACK* p_cback;

} tBTA_SDP_API_ENABLE;



/* data type for BTA_SDP_API_SEARCH_EVT */

typedef struct {

  BT_HDR hdr;
@@ -72,7 +66,6 @@ typedef struct { 
typedef union {

  /* GKI event buffer header */

  BT_HDR hdr;

  tBTA_SDP_API_ENABLE enable;

  tBTA_SDP_API_SEARCH get_search;

  tBTA_SDP_API_RECORD_USER record;

} tBTA_SDP_MSG;
@@ -92,7 +85,7 @@ extern tBTA_SDP_CFG* p_bta_sdp_cfg; 


extern bool bta_sdp_sm_execute(BT_HDR* p_msg);



extern void bta_sdp_enable(tBTA_SDP_API_ENABLE* p_data);

extern void bta_sdp_enable(tBTA_SDP_DM_CBACK* p_cback);

extern void bta_sdp_search(tBTA_SDP_API_SEARCH* p_data);

extern void bta_sdp_create_record(tBTA_SDP_API_RECORD_USER* p_data);

extern void bta_sdp_remove_record(tBTA_SDP_API_RECORD_USER* p_data);