OSDN Git Service

role is unused
authorHansong Zhang <hsz@google.com>
Fri, 28 Aug 2020 21:14:12 +0000 (14:14 -0700)
committerHansong Zhang <hsz@google.com>
Fri, 28 Aug 2020 22:47:55 +0000 (15:47 -0700)
Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I092c176d244409bb96120a968284709a1fb745c6

bta/jv/bta_jv_act.cc
bta/jv/bta_jv_api.cc
bta/jv/bta_jv_int.h

index 2cf4360..b0acedb 100644 (file)
@@ -1263,8 +1263,8 @@ static void bta_jv_port_event_cl_cback(uint32_t code, uint16_t port_handle) {
 }
 
 /* Client initiates an RFCOMM connection */
-void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
-                           uint8_t remote_scn, const RawAddress& peer_bd_addr,
+void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn,
+                           const RawAddress& peer_bd_addr,
                            tBTA_JV_RFCOMM_CBACK* p_cback,
                            uint32_t rfcomm_slot_id) {
   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 */
-void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
-                                uint8_t local_scn, uint8_t max_session,
+void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, uint8_t local_scn,
+                                uint8_t max_session,
                                 tBTA_JV_RFCOMM_CBACK* p_cback,
                                 uint32_t rfcomm_slot_id) {
   uint16_t handle = 0;
index d5a65be..37a3453 100644 (file)
@@ -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 */
 
   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));
   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,
-                    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));
   return BTA_JV_SUCCESS;
 }
index 83b65e6..640aeca 100644 (file)
@@ -168,14 +168,13 @@ extern void bta_jv_l2cap_stop_server(uint16_t local_psm,
                                      uint32_t l2cap_socket_id);
 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);
-extern void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
-                                  uint8_t remote_scn,
+extern void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn,
                                   const RawAddress& peer_bd_addr,
                                   tBTA_JV_RFCOMM_CBACK* p_cback,
                                   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,
-                                       uint8_t local_scn, uint8_t max_session,
+extern void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, uint8_t local_scn,
+                                       uint8_t max_session,
                                        tBTA_JV_RFCOMM_CBACK* p_cback,
                                        uint32_t rfcomm_slot_id);
 extern void bta_jv_rfcomm_stop_server(uint32_t handle, uint32_t rfcomm_slot_id);