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

Commit 7b0c5703 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Use Bind in BTA_JvL2capRead 

Bug: 68359837
Test: compilation test
Change-Id: I743e655acab6b57bb9d67e75b7a6d54d002568c6
parent 04cfd426

system/bta/jv/bta_jv_act.cc

+0 −29
Original line number Diff line number Diff line
@@ -1155,35 +1155,6 @@ void bta_jv_l2cap_stop_server(uint16_t local_psm, uint32_t l2cap_socket_id) { 
  }

}



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

 *

 * Function     bta_jv_l2cap_read

 *

 * Description  Read data from an L2CAP connection

 *

 * Returns      void

 *

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

void bta_jv_l2cap_read(tBTA_JV_MSG* p_data) {

  tBTA_JV_L2CAP_READ evt_data;

  tBTA_JV_API_L2CAP_READ* rc = &(p_data->l2cap_read);



  evt_data.status = BTA_JV_FAILURE;

  evt_data.handle = rc->handle;

  evt_data.req_id = rc->req_id;

  evt_data.p_data = rc->p_data;

  evt_data.len = 0;



  if (BT_PASS ==

      GAP_ConnReadData(rc->handle, rc->p_data, rc->len, &evt_data.len)) {

    evt_data.status = BTA_JV_SUCCESS;

  }



  tBTA_JV bta_jv;

  bta_jv.l2c_read = evt_data;

  rc->p_cback(BTA_JV_L2CAP_READ_EVT, &bta_jv, rc->l2cap_socket_id);

}



/* Write data to an L2CAP connection */

void bta_jv_l2cap_write(uint32_t handle, uint32_t req_id, uint8_t* p_data,

                        uint16_t len, uint32_t user_id, tBTA_JV_L2C_CB* p_cb) {

system/bta/jv/bta_jv_api.cc

+17 −22
Original line number Diff line number Diff line
@@ -466,9 +466,7 @@ tBTA_JV_STATUS BTA_JvL2capStopServerLE(uint16_t local_chan, 
 *

 * Function         BTA_JvL2capRead

 *

 * Description      This function reads data from an L2CAP connecti;

    tBTA_JV_RFC_CB  *p_cb = rc->p_cb;

on

 * Description      This function reads data from an L2CAP connection

 *                  When the operation is complete, tBTA_JV_L2CAP_CBACK is

 *                  called with BTA_JV_L2CAP_READ_EVT.

 *
@@ -478,13 +476,12 @@ on 
 ******************************************************************************/

tBTA_JV_STATUS BTA_JvL2capRead(uint32_t handle, uint32_t req_id,

                               uint8_t* p_data, uint16_t len) {

  tBTA_JV_STATUS status = BTA_JV_FAILURE;

  tBTA_JV_L2CAP_READ evt_data;



  APPL_TRACE_API("%s", __func__);



  if (handle < BTA_JV_MAX_L2C_CONN && bta_jv_cb.l2c_cb[handle].p_cback) {

    status = BTA_JV_SUCCESS;

  if (handle >= BTA_JV_MAX_L2C_CONN || !bta_jv_cb.l2c_cb[handle].p_cback)

    return BTA_JV_FAILURE;



  tBTA_JV_L2CAP_READ evt_data;

  evt_data.status = BTA_JV_FAILURE;

  evt_data.handle = handle;

  evt_data.req_id = req_id;
@@ -497,9 +494,7 @@ tBTA_JV_STATUS BTA_JvL2capRead(uint32_t handle, uint32_t req_id, 
  }

  bta_jv_cb.l2c_cb[handle].p_cback(BTA_JV_L2CAP_READ_EVT, (tBTA_JV*)&evt_data,

                                   bta_jv_cb.l2c_cb[handle].l2cap_socket_id);

  }



  return (status);

  return BTA_JV_SUCCESS;

}



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

system/bta/jv/bta_jv_int.h

+0 −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_READ_EVT,

  BTA_JV_API_RFCOMM_CONNECT_EVT,

  BTA_JV_API_RFCOMM_CLOSE_EVT,

  BTA_JV_API_RFCOMM_START_SERVER_EVT,
@@ -274,7 +273,6 @@ extern void bta_jv_l2cap_start_server( 
    uint32_t l2cap_socket_id);

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(uint32_t handle, uint32_t req_id,

                               uint8_t* p_data, uint16_t len, uint32_t user_id,

                               tBTA_JV_L2C_CB* p_cb);

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_read,            /* BTA_JV_API_L2CAP_READ_EVT */

    bta_jv_rfcomm_connect,        /* BTA_JV_API_RFCOMM_CONNECT_EVT */

    bta_jv_rfcomm_close,          /* BTA_JV_API_RFCOMM_CLOSE_EVT */

    bta_jv_rfcomm_start_server,   /* BTA_JV_API_RFCOMM_START_SERVER_EVT */