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

Commit 02a12046 authored by Chris Manton's avatar Chris Manton
Browse files

Comment out unused parameters bta_dm_disc_stop_service_discovery 

Also system/bta/jv/bta_jv_act.cc

Bug: 327522001
Test: m .
Flag: EXEMPT, Compiler warning

Change-Id: I8898e71cd8482eb414634627e67f2515f3c92b05
parent 780e89f6

system/bta/dm/bta_dm_disc.cc

+2 −2
Original line number Diff line number Diff line
@@ -2455,8 +2455,8 @@ void bta_dm_disc_start_service_discovery(tBTA_DM_SEARCH_CBACK* p_cback, 
  bta_sys_sendmsg(p_msg);

}



void bta_dm_disc_stop_service_discovery(const RawAddress& bd_addr,

                                        tBT_TRANSPORT transport) {

void bta_dm_disc_stop_service_discovery(const RawAddress& /* bd_addr */,

                                        tBT_TRANSPORT /* transport */) {

  log::warn("Stop service discovery not yet implemented for legacy module");

}

system/bta/jv/bta_jv_act.cc

+7 −6
Original line number Diff line number Diff line
@@ -964,9 +964,9 @@ static void bta_jv_l2cap_client_cback(uint16_t gap_handle, uint16_t event, 
}



/* makes an l2cap client connection */

void bta_jv_l2cap_connect(int32_t type, tBTA_SEC sec_mask, tBTA_JV_ROLE role,

                          uint16_t remote_psm, uint16_t rx_mtu,

                          const RawAddress& peer_bd_addr,

void bta_jv_l2cap_connect(int32_t type, tBTA_SEC sec_mask,

                          tBTA_JV_ROLE /* role */, uint16_t remote_psm,

                          uint16_t rx_mtu, const RawAddress& peer_bd_addr,

                          std::unique_ptr<tL2CAP_CFG_INFO> cfg_param,

                          std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                          tBTA_JV_L2CAP_CBACK* p_cback,
@@ -1052,7 +1052,7 @@ void bta_jv_l2cap_close(uint32_t handle, tBTA_JV_L2C_CB* p_cb) { 
 *

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

static void bta_jv_l2cap_server_cback(uint16_t gap_handle, uint16_t event,

                                      tGAP_CB_DATA* data) {

                                      tGAP_CB_DATA* /* data */) {

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

  tBTA_JV evt_data;

  tBTA_JV_L2CAP_CBACK* p_cback;
@@ -1108,7 +1108,7 @@ static void bta_jv_l2cap_server_cback(uint16_t gap_handle, uint16_t event, 


/** starts an L2CAP server */

void bta_jv_l2cap_start_server(int32_t type, tBTA_SEC sec_mask,

                               tBTA_JV_ROLE role, uint16_t local_psm,

                               tBTA_JV_ROLE /* role */, uint16_t local_psm,

                               uint16_t rx_mtu,

                               std::unique_ptr<tL2CAP_CFG_INFO> cfg_param,

                               std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,
@@ -1164,7 +1164,8 @@ void bta_jv_l2cap_start_server(int32_t type, tBTA_SEC sec_mask, 
}



/* stops an L2CAP server */

void bta_jv_l2cap_stop_server(uint16_t local_psm, uint32_t l2cap_socket_id) {

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].l2cap_socket_id == l2cap_socket_id) {

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