From baa23e13ea5f6e0bfe80549aaa4c886bae8ac683 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 27 Aug 2020 15:22:36 -0700 Subject: [PATCH] bta_jv_l2cap_connect_le is unused Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: I8e02427a2fca2ce3482f5673048aa057f7a42fe5 --- bta/jv/bta_jv_act.cc | 46 ---------------------------------------------- bta/jv/bta_jv_int.h | 5 +---- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/bta/jv/bta_jv_act.cc b/bta/jv/bta_jv_act.cc index f65a722e7..0e68755b1 100644 --- a/bta/jv/bta_jv_act.cc +++ b/bta/jv/bta_jv_act.cc @@ -2105,52 +2105,6 @@ static void fcchan_data_cbk(uint16_t chan, const RawAddress& bd_addr, if (sock_cback) sock_cback(BTA_JV_L2CAP_DATA_IND_EVT, &evt_data, sock_id); } -/** makes an le l2cap client connection */ -void bta_jv_l2cap_connect_le(uint16_t remote_chan, - const RawAddress& peer_bd_addr, - tBTA_JV_L2CAP_CBACK* p_cback, - uint32_t l2cap_socket_id) { - tBTA_JV evt; - uint32_t id; - char call_init_f = true; - struct fc_client* t; - - evt.l2c_cl_init.handle = GAP_INVALID_HANDLE; - evt.l2c_cl_init.status = BTA_JV_FAILURE; - - t = fcclient_alloc(remote_chan, false, NULL); - if (!t) { - p_cback(BTA_JV_L2CAP_CL_INIT_EVT, &evt, l2cap_socket_id); - return; - } - - t->p_cback = p_cback; - t->l2cap_socket_id = l2cap_socket_id; - t->remote_addr = peer_bd_addr; - id = t->id; - t->init_called = false; - - if (L2CA_ConnectFixedChnl(t->chan, t->remote_addr)) { - evt.l2c_cl_init.status = BTA_JV_SUCCESS; - evt.l2c_cl_init.handle = id; - } - - // it could have been deleted/moved from under us, so re-find it */ - t = fcclient_find_by_id(id); - if (t) { - if (evt.l2c_cl_init.status == BTA_JV_SUCCESS) { - call_init_f = !t->init_called; - } else { - fcclient_free(t); - t = NULL; - } - } - if (call_init_f) p_cback(BTA_JV_L2CAP_CL_INIT_EVT, &evt, l2cap_socket_id); - if (t) { - t->init_called = true; - } -} - /* stops an LE L2CAP server */ void bta_jv_l2cap_stop_server_le(uint16_t local_chan) { struct fc_client* fcclient; diff --git a/bta/jv/bta_jv_int.h b/bta/jv/bta_jv_int.h index fa7158042..85adbcdc0 100644 --- a/bta/jv/bta_jv_int.h +++ b/bta/jv/bta_jv_int.h @@ -183,10 +183,7 @@ 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_l2cap_connect_le(uint16_t remote_chan, - const RawAddress& peer_bd_addr, - tBTA_JV_L2CAP_CBACK* p_cback, - uint32_t l2cap_socket_id); + extern void bta_jv_l2cap_start_server_le(uint16_t local_chan, tBTA_JV_L2CAP_CBACK* p_cback, uint32_t l2cap_socket_id); -- 2.11.0