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

Commit 869a7e94 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Use Bind in BTA_JvEnable 

Bug: 68359837
Test: compilation test
Change-Id: I1913b7763c93932c59fe94c3a40293e02335afa2
parent baad28e6

system/bta/jv/bta_jv_act.cc

+3 −11
Original line number Diff line number Diff line
@@ -609,18 +609,10 @@ bool bta_jv_check_psm(uint16_t psm) { 
  return ret;

}



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

 *

 * Function     bta_jv_enable

 *

 * Description  Initialises the JAVA I/F

 *

 * Returns      void

 *

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

void bta_jv_enable(tBTA_JV_MSG* p_data) {

/* Initialises the JAVA I/F */

void bta_jv_enable(tBTA_JV_DM_CBACK* p_cback) {

  tBTA_JV_STATUS status = BTA_JV_SUCCESS;

  bta_jv_cb.p_dm_cback = p_data->enable.p_cback;

  bta_jv_cb.p_dm_cback = p_cback;

  tBTA_JV bta_jv;

  bta_jv.status = status;

  bta_jv_cb.p_dm_cback(BTA_JV_ENABLE_EVT, &bta_jv, 0);

system/bta/jv/bta_jv_api.cc

+4 −5
Original line number Diff line number Diff line
@@ -22,10 +22,12 @@ 
 *  Technology (JABWT) as specified by the JSR82 specificiation

 *

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

#include <base/bind.h>

#include <string.h>



#include "bt_common.h"

#include "bta_api.h"

#include "bta_closure_api.h"

#include "bta_jv_api.h"

#include "bta_jv_int.h"

#include "bta_sys.h"
@@ -34,6 +36,7 @@ 
#include "sdp_api.h"

#include "utl.h"



using base::Bind;

using bluetooth::Uuid;



/*****************************************************************************
@@ -72,11 +75,7 @@ tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK* p_cback) { 
    bta_sys_register(BTA_ID_JV, &bta_jv_reg);



    if (p_cback) {

      tBTA_JV_API_ENABLE* p_buf =

          (tBTA_JV_API_ENABLE*)osi_malloc(sizeof(tBTA_JV_API_ENABLE));

      p_buf->hdr.event = BTA_JV_API_ENABLE_EVT;

      p_buf->p_cback = p_cback;

      bta_sys_sendmsg(p_buf);

      do_in_bta_thread(FROM_HERE, Bind(&bta_jv_enable, p_cback));

      status = BTA_JV_SUCCESS;

    }

  } else {

system/bta/jv/bta_jv_int.h

+2 −10
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ 


enum {

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

  BTA_JV_API_ENABLE_EVT = BTA_SYS_EVT_START(BTA_ID_JV),

  BTA_JV_API_DISABLE_EVT,

  BTA_JV_API_DISABLE_EVT = BTA_SYS_EVT_START(BTA_ID_JV),

  BTA_JV_API_GET_CHANNEL_EVT,

  BTA_JV_API_FREE_SCN_EVT,

  BTA_JV_API_START_DISCOVERY_EVT,
@@ -69,12 +68,6 @@ enum { 
  (PORT_EV_RXCHAR | PORT_EV_TXEMPTY | PORT_EV_FC | PORT_EV_FCS)

#endif



/* data type for BTA_JV_API_ENABLE_EVT */

typedef struct {

  BT_HDR hdr;

  tBTA_JV_DM_CBACK* p_cback;

} tBTA_JV_API_ENABLE;



/* data type for BTA_JV_API_START_DISCOVERY_EVT */

typedef struct {

  BT_HDR hdr;
@@ -324,7 +317,6 @@ typedef struct { 
typedef union {

  /* GKI event buffer header */

  BT_HDR hdr;

  tBTA_JV_API_ENABLE enable;

  tBTA_JV_API_START_DISCOVERY start_discovery;

  tBTA_JV_API_ALLOC_CHANNEL alloc_channel;

  tBTA_JV_API_FREE_CHANNEL free_channel;
@@ -379,7 +371,7 @@ extern tBTA_JV_CFG* p_bta_jv_cfg; 


extern bool bta_jv_sm_execute(BT_HDR* p_msg);



extern void bta_jv_enable(tBTA_JV_MSG* p_data);

extern void bta_jv_enable(tBTA_JV_DM_CBACK* p_cback);

extern void bta_jv_disable(tBTA_JV_MSG* p_data);

extern void bta_jv_get_channel_id(tBTA_JV_MSG* p_data);

extern void bta_jv_free_scn(tBTA_JV_MSG* p_data);

system/bta/jv/bta_jv_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ typedef void (*tBTA_JV_ACTION)(tBTA_JV_MSG* p_data); 


/* action function list */

const tBTA_JV_ACTION bta_jv_action[] = {

    bta_jv_enable,                /* BTA_JV_API_ENABLE_EVT */

    bta_jv_disable,               /* BTA_JV_API_DISABLE_EVT */

    bta_jv_get_channel_id,        /* BTA_JV_API_GET_CHANNEL_EVT */

    bta_jv_free_scn,              /* BTA_JV_API_FREE_SCN_EVT */