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

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

Get rid of BTA_JV specific events 

Bug: 68359837
Test: compilation test
Change-Id: I4273bc1bed2cef676ab1ed026ac8a0fa3ffbada9
parent 6de5c6ed

system/bta/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ cc_library_static { 
        "jv/bta_jv_act.cc",

        "jv/bta_jv_api.cc",

        "jv/bta_jv_cfg.cc",

        "jv/bta_jv_main.cc",

        "mce/bta_mce_act.cc",

        "mce/bta_mce_api.cc",

        "mce/bta_mce_cfg.cc",

system/bta/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static_library("bta") { 
    "jv/bta_jv_act.cc",

    "jv/bta_jv_api.cc",

    "jv/bta_jv_cfg.cc",

    "jv/bta_jv_main.cc",

    "mce/bta_mce_act.cc",

    "mce/bta_mce_api.cc",

    "mce/bta_mce_cfg.cc",

system/bta/jv/bta_jv_act.cc

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 


using bluetooth::Uuid;



tBTA_JV_CB bta_jv_cb;



/* one of these exists for each client */

struct fc_client {

  struct fc_client* next_all_list;

system/bta/jv/bta_jv_api.cc

+17 −24
Original line number Diff line number Diff line
@@ -40,11 +40,9 @@ 
using base::Bind;

using bluetooth::Uuid;



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

 *  Constants

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



static const tBTA_SYS_REG bta_jv_reg = {bta_jv_sm_execute, NULL};

namespace {

bool bta_jv_enabled = false;

}



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

 *
@@ -61,35 +59,30 @@ static const tBTA_SYS_REG bta_jv_reg = {bta_jv_sm_execute, NULL}; 
 *

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

tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK* p_cback) {

  tBTA_JV_STATUS status = BTA_JV_FAILURE;

  int i;

  if (!p_cback || bta_jv_enabled) {

    APPL_TRACE_ERROR("JVenable fails");

    return BTA_JV_FAILURE;

  }



  APPL_TRACE_API("BTA_JvEnable");

  if (p_cback && !bta_sys_is_register(BTA_ID_JV)) {



  memset(&bta_jv_cb, 0, sizeof(tBTA_JV_CB));

  /* set handle to invalid value by default */

    for (i = 0; i < BTA_JV_PM_MAX_NUM; i++) {

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

    bta_jv_cb.pm_cb[i].handle = BTA_JV_PM_HANDLE_CLEAR;

  }



    /* register with BTA system manager */

    bta_sys_register(BTA_ID_JV, &bta_jv_reg);

  bta_jv_enabled = true;



    if (p_cback) {

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

      status = BTA_JV_SUCCESS;

    }

  } else {

    APPL_TRACE_ERROR("JVenable fails");

  }

  return (status);

  return BTA_JV_SUCCESS;

}



/** Disable the Java I/F */

void BTA_JvDisable(void) {

  APPL_TRACE_API("%s", __func__);



  bta_sys_deregister(BTA_ID_JV);

  bta_jv_enabled = false;



  do_in_bta_thread(FROM_HERE, Bind(&bta_jv_disable));

}

system/bta/jv/bta_jv_int.h

+0 −26
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ 
 *  Constants

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



enum {

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

  BTA_JV_MAX_INT_EVT = BTA_SYS_EVT_START(BTA_ID_JV),

};



#ifndef BTA_JV_RFC_EV_MASK

#define BTA_JV_RFC_EV_MASK \

  (PORT_EV_RXCHAR | PORT_EV_TXEMPTY | PORT_EV_FC | PORT_EV_FCS)
@@ -111,24 +106,6 @@ typedef struct { 
  int curr_sess;          /* current sessions count*/

} tBTA_JV_RFC_CB;



/* data type for BTA_JV_API_L2CAP_READ_EVT */

typedef struct {

  BT_HDR hdr;

  uint32_t handle;

  uint32_t req_id;

  tBTA_JV_L2CAP_CBACK* p_cback;

  uint8_t* p_data;

  uint16_t len;

  uint32_t l2cap_socket_id;

} tBTA_JV_API_L2CAP_READ;



/* union of all data types */

typedef union {

  /* GKI event buffer header */

  BT_HDR hdr;

  tBTA_JV_API_L2CAP_READ l2cap_read;

} tBTA_JV_MSG;



/* JV control block */

typedef struct {

  /* the SDP handle reported to JV user is the (index + 1) to sdp_handle[].
@@ -162,8 +139,6 @@ extern tBTA_JV_CB bta_jv_cb; 
/* config struct */

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_DM_CBACK* p_cback);

extern void bta_jv_disable();

extern void bta_jv_get_channel_id(int32_t type, int32_t channel,
@@ -209,7 +184,6 @@ extern void bta_jv_rfcomm_write(uint32_t handle, uint32_t req_id, 
                                tBTA_JV_RFC_CB* p_cb, tBTA_JV_PCB* p_pcb);

extern void bta_jv_set_pm_profile(uint32_t handle, tBTA_JV_PM_ID app_id,

                                  tBTA_JV_CONN_STATE init_st);

extern void bta_jv_change_pm_state(tBTA_JV_MSG* p_data);

extern void bta_jv_l2cap_connect_le(uint16_t remote_chan,

                                    const RawAddress& peer_bd_addr,

                                    tBTA_JV_L2CAP_CBACK* p_cback,