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

Commit ac34ce45 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "role is unused"

parents b86e0130 5fb27e21

system/bta/jv/bta_jv_act.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -1263,8 +1263,8 @@ static void bta_jv_port_event_cl_cback(uint32_t code, uint16_t port_handle) { 
}

}





/* Client initiates an RFCOMM connection */

/* Client initiates an RFCOMM connection */

void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn,

                           uint8_t remote_scn, const RawAddress& peer_bd_addr,

                           const RawAddress& peer_bd_addr,

                           tBTA_JV_RFCOMM_CBACK* p_cback,

                           tBTA_JV_RFCOMM_CBACK* p_cback,

                           uint32_t rfcomm_slot_id) {

                           uint32_t rfcomm_slot_id) {

  uint16_t handle = 0;

  uint16_t handle = 0;
@@ -1567,8 +1567,8 @@ static tBTA_JV_PCB* bta_jv_add_rfc_port(tBTA_JV_RFC_CB* p_cb, 
}

}





/* waits for an RFCOMM client to connect */

/* waits for an RFCOMM client to connect */

void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, uint8_t local_scn,

                                uint8_t local_scn, uint8_t max_session,

                                uint8_t max_session,

                                tBTA_JV_RFCOMM_CBACK* p_cback,

                                tBTA_JV_RFCOMM_CBACK* p_cback,

                                uint32_t rfcomm_slot_id) {

                                uint32_t rfcomm_slot_id) {

  uint16_t handle = 0;

  uint16_t handle = 0;

system/bta/jv/bta_jv_api.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -423,7 +423,7 @@ tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask, tBTA_JV_ROLE role, 
  if (!p_cback) return BTA_JV_FAILURE; /* Nothing to do */

  if (!p_cback) return BTA_JV_FAILURE; /* Nothing to do */





  do_in_main_thread(FROM_HERE,

  do_in_main_thread(FROM_HERE,

                    Bind(&bta_jv_rfcomm_connect, sec_mask, role, remote_scn,

                    Bind(&bta_jv_rfcomm_connect, sec_mask, remote_scn,

                         peer_bd_addr, p_cback, rfcomm_slot_id));

                         peer_bd_addr, p_cback, rfcomm_slot_id));

  return BTA_JV_SUCCESS;

  return BTA_JV_SUCCESS;

}

}
@@ -484,7 +484,7 @@ tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask, tBTA_JV_ROLE role, 
  }

  }





  do_in_main_thread(FROM_HERE,

  do_in_main_thread(FROM_HERE,

                    Bind(&bta_jv_rfcomm_start_server, sec_mask, role, local_scn,

                    Bind(&bta_jv_rfcomm_start_server, sec_mask, local_scn,

                         max_session, p_cback, rfcomm_slot_id));

                         max_session, p_cback, rfcomm_slot_id));

  return BTA_JV_SUCCESS;

  return BTA_JV_SUCCESS;

}

}

system/bta/jv/bta_jv_int.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -168,14 +168,13 @@ extern void bta_jv_l2cap_stop_server(uint16_t local_psm, 
                                     uint32_t l2cap_socket_id);

                                     uint32_t l2cap_socket_id);

extern void bta_jv_l2cap_write(uint32_t handle, uint32_t req_id, BT_HDR* msg,

extern void bta_jv_l2cap_write(uint32_t handle, uint32_t req_id, BT_HDR* msg,

                               uint32_t user_id, tBTA_JV_L2C_CB* p_cb);

                               uint32_t user_id, tBTA_JV_L2C_CB* p_cb);

extern void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

extern void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn,

                                  uint8_t remote_scn,

                                  const RawAddress& peer_bd_addr,

                                  const RawAddress& peer_bd_addr,

                                  tBTA_JV_RFCOMM_CBACK* p_cback,

                                  tBTA_JV_RFCOMM_CBACK* p_cback,

                                  uint32_t rfcomm_slot_id);

                                  uint32_t rfcomm_slot_id);

extern void bta_jv_rfcomm_close(uint32_t handle, uint32_t rfcomm_slot_id);

extern void bta_jv_rfcomm_close(uint32_t handle, uint32_t rfcomm_slot_id);

extern void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

extern void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, uint8_t local_scn,

                                       uint8_t local_scn, uint8_t max_session,

                                       uint8_t max_session,

                                       tBTA_JV_RFCOMM_CBACK* p_cback,

                                       tBTA_JV_RFCOMM_CBACK* p_cback,

                                       uint32_t rfcomm_slot_id);

                                       uint32_t rfcomm_slot_id);

extern void bta_jv_rfcomm_stop_server(uint32_t handle, uint32_t rfcomm_slot_id);

extern void bta_jv_rfcomm_stop_server(uint32_t handle, uint32_t rfcomm_slot_id);