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

Commit ad4a7f42 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Use Bind in BTA_JvL2capStopServer 

Bug: 68359837
Test: compilation test
Change-Id: I25f718a943aabb5897145ec75a8e2b7b154cc2d4
parent 4e03ff88

system/bta/jv/bta_jv_act.cc

+6 −18
Original line number Diff line number Diff line
@@ -1135,25 +1135,13 @@ void bta_jv_l2cap_start_server(int32_t type, tBTA_SEC sec_mask, 
  }

}



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

 *

 * Function     bta_jv_l2cap_stop_server

 *

 * Description  stops an L2CAP server

 *

 * Returns      void

 *

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

void bta_jv_l2cap_stop_server(tBTA_JV_MSG* p_data) {

  tBTA_JV_L2C_CB* p_cb;

  tBTA_JV_L2CAP_CLOSE evt_data;

  tBTA_JV_API_L2CAP_SERVER* ls = &(p_data->l2cap_server);

  tBTA_JV_L2CAP_CBACK* p_cback;

/* stops an L2CAP server */

void bta_jv_l2cap_stop_server(uint16_t local_psm, uint32_t l2cap_socket_id) {

  for (int i = 0; i < BTA_JV_MAX_L2C_CONN; i++) {

    if (bta_jv_cb.l2c_cb[i].psm == ls->local_psm) {

      p_cb = &bta_jv_cb.l2c_cb[i];

      p_cback = p_cb->p_cback;

      uint32_t l2cap_socket_id = p_cb->l2cap_socket_id;

    if (bta_jv_cb.l2c_cb[i].psm == local_psm) {

      tBTA_JV_L2C_CB* p_cb = &bta_jv_cb.l2c_cb[i];

      tBTA_JV_L2CAP_CBACK* p_cback = p_cb->p_cback;

      tBTA_JV_L2CAP_CLOSE evt_data;

      evt_data.handle = p_cb->handle;

      evt_data.status = bta_jv_free_l2c_cb(p_cb);

      evt_data.async = false;

system/bta/jv/bta_jv_api.cc

+2 −8
Original line number Diff line number Diff line
@@ -438,14 +438,8 @@ tBTA_JV_STATUS BTA_JvL2capStopServer(uint16_t local_psm, 
                                     uint32_t l2cap_socket_id) {

  APPL_TRACE_API("%s", __func__);



  tBTA_JV_API_L2CAP_SERVER* p_msg =

      (tBTA_JV_API_L2CAP_SERVER*)osi_malloc(sizeof(tBTA_JV_API_L2CAP_SERVER));

  p_msg->hdr.event = BTA_JV_API_L2CAP_STOP_SERVER_EVT;

  p_msg->local_psm = local_psm;

  p_msg->l2cap_socket_id = l2cap_socket_id;



  bta_sys_sendmsg(p_msg);



  do_in_bta_thread(FROM_HERE,

                   Bind(&bta_jv_l2cap_stop_server, local_psm, l2cap_socket_id));

  return BTA_JV_SUCCESS;

}

system/bta/jv/bta_jv_int.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
enum {

  /* these events are handled by the state machine */

  BTA_JV_API_START_DISCOVERY_EVT = BTA_SYS_EVT_START(BTA_ID_JV),

  BTA_JV_API_L2CAP_STOP_SERVER_EVT,

  BTA_JV_API_L2CAP_READ_EVT,

  BTA_JV_API_L2CAP_WRITE_EVT,

  BTA_JV_API_RFCOMM_CONNECT_EVT,
@@ -321,7 +320,8 @@ extern void bta_jv_l2cap_start_server( 
    uint16_t rx_mtu, std::unique_ptr<tL2CAP_CFG_INFO> cfg_param,

    std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info, tBTA_JV_L2CAP_CBACK* p_cback,

    uint32_t l2cap_socket_id);

extern void bta_jv_l2cap_stop_server(tBTA_JV_MSG* p_data);

extern void bta_jv_l2cap_stop_server(uint16_t local_psm,

                                     uint32_t l2cap_socket_id);

extern void bta_jv_l2cap_read(tBTA_JV_MSG* p_data);

extern void bta_jv_l2cap_write(tBTA_JV_MSG* p_data);

extern void bta_jv_rfcomm_connect(tBTA_JV_MSG* p_data);

system/bta/jv/bta_jv_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ typedef void (*tBTA_JV_ACTION)(tBTA_JV_MSG* p_data); 
/* action function list */

const tBTA_JV_ACTION bta_jv_action[] = {

    bta_jv_start_discovery,       /* BTA_JV_API_START_DISCOVERY_EVT */

    bta_jv_l2cap_stop_server,     /* BTA_JV_API_L2CAP_STOP_SERVER_EVT */

    bta_jv_l2cap_read,            /* BTA_JV_API_L2CAP_READ_EVT */

    bta_jv_l2cap_write,           /* BTA_JV_API_L2CAP_WRITE_EVT */

    bta_jv_rfcomm_connect,        /* BTA_JV_API_RFCOMM_CONNECT_EVT */