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

Commit 19ffd231 authored by Chris Manton's avatar Chris Manton
Browse files

Remove unused bta::jv::BTA_JV_SERVICE and tBTA_JV_ROLE 

Bug: 335833308
Test: m .
Flag: EXEMPT, Code Removal
Change-Id: I1a82a5f062457bc35a4d6598641d5119992000d3
parent 9857069d

system/bta/include/bta_jv_api.h

+3 −20
Original line number Diff line number Diff line
@@ -106,20 +106,6 @@ typedef uint8_t tBTA_JV_L2CAP_REASON; 
enum { BTA_JV_DISC_NONE, BTA_JV_DISC_LIMITED, BTA_JV_DISC_GENERAL };

typedef uint16_t tBTA_JV_DISC;



typedef uint32_t tBTA_JV_ROLE;



#define BTA_JV_SERVICE_LMTD_DISCOVER                                       \

  BTM_COD_SERVICE_LMTD_DISCOVER                                  /* 0x0020 \

                                                                    */

#define BTA_JV_SERVICE_POSITIONING BTM_COD_SERVICE_POSITIONING   /* 0x0100 */

#define BTA_JV_SERVICE_NETWORKING BTM_COD_SERVICE_NETWORKING     /* 0x0200 */

#define BTA_JV_SERVICE_RENDERING BTM_COD_SERVICE_RENDERING       /* 0x0400 */

#define BTA_JV_SERVICE_CAPTURING BTM_COD_SERVICE_CAPTURING       /* 0x0800 */

#define BTA_JV_SERVICE_OBJ_TRANSFER BTM_COD_SERVICE_OBJ_TRANSFER /* 0x1000 */

#define BTA_JV_SERVICE_AUDIO BTM_COD_SERVICE_AUDIO               /* 0x2000 */

#define BTA_JV_SERVICE_TELEPHONY BTM_COD_SERVICE_TELEPHONY       /* 0x4000 */

#define BTA_JV_SERVICE_INFORMATION BTM_COD_SERVICE_INFORMATION   /* 0x8000 */



/* JV ID type */

#define BTA_JV_PM_ID_1 1     /* PM example profile 1 */

#define BTA_JV_PM_ID_2 2     /* PM example profile 2 */
@@ -575,7 +561,6 @@ tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle); 
 *

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

void BTA_JvL2capConnect(tBTA_JV_CONN_TYPE conn_type, tBTA_SEC sec_mask,

                        tBTA_JV_ROLE role,

                        std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                        uint16_t remote_psm, uint16_t rx_mtu,

                        std::unique_ptr<tL2CAP_CFG_INFO> cfg,
@@ -609,7 +594,6 @@ tBTA_JV_STATUS BTA_JvL2capClose(uint32_t handle); 
 *

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

void BTA_JvL2capStartServer(tBTA_JV_CONN_TYPE conn_type, tBTA_SEC sec_mask,

                            tBTA_JV_ROLE role,

                            std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                            uint16_t local_psm, uint16_t rx_mtu,

                            std::unique_ptr<tL2CAP_CFG_INFO> cfg,
@@ -690,8 +674,7 @@ tBTA_JV_STATUS BTA_JvL2capWrite(uint32_t handle, uint32_t req_id, BT_HDR* msg, 
 *                  BTA_JV_FAILURE, otherwise.

 *

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

tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

                                   uint8_t remote_scn,

tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask, uint8_t remote_scn,

                                   const RawAddress& peer_bd_addr,

                                   tBTA_JV_RFCOMM_CBACK* p_cback,

                                   uint32_t rfcomm_slot_id);
@@ -723,8 +706,8 @@ tBTA_JV_STATUS BTA_JvRfcommClose(uint32_t handle, uint32_t rfcomm_slot_id); 
 *                  BTA_JV_FAILURE, otherwise.

 *

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

tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

                                       uint8_t local_scn, uint8_t max_session,

tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask, uint8_t local_scn,

                                       uint8_t max_session,

                                       tBTA_JV_RFCOMM_CBACK* p_cback,

                                       uint32_t rfcomm_slot_id);

system/bta/jv/bta_jv_act.cc

+3 −4
Original line number Diff line number Diff line
@@ -1025,8 +1025,8 @@ static void bta_jv_l2cap_client_cback(uint16_t gap_handle, uint16_t event, 


/* makes an l2cap client connection */

void bta_jv_l2cap_connect(tBTA_JV_CONN_TYPE type, tBTA_SEC sec_mask,

                          tBTA_JV_ROLE /* role */, uint16_t remote_psm,

                          uint16_t rx_mtu, const RawAddress& peer_bd_addr,

                          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,
@@ -1189,8 +1189,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(tBTA_JV_CONN_TYPE type, tBTA_SEC sec_mask,

                               tBTA_JV_ROLE /* role */, uint16_t local_psm,

                               uint16_t rx_mtu,

                               uint16_t local_psm, uint16_t rx_mtu,

                               std::unique_ptr<tL2CAP_CFG_INFO> cfg_param,

                               std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                               tBTA_JV_L2CAP_CBACK* p_cback,

system/bta/jv/bta_jv_api.cc

+10 −14
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle) { 
 *

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

void BTA_JvL2capConnect(tBTA_JV_CONN_TYPE conn_type, tBTA_SEC sec_mask,

                        tBTA_JV_ROLE role,

                        std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                        uint16_t remote_psm, uint16_t rx_mtu,

                        std::unique_ptr<tL2CAP_CFG_INFO> cfg,
@@ -231,15 +230,15 @@ void BTA_JvL2capConnect(tBTA_JV_CONN_TYPE conn_type, tBTA_SEC sec_mask, 
                        tBTA_JV_L2CAP_CBACK* p_cback,

                        uint32_t l2cap_socket_id) {

  log::verbose(

      "conn_type:{}, role:{}, remote_psm:{}, peer_bd_addr:{}, "

      "conn_type:{}, remote_psm:{}, peer_bd_addr:{}, "

      "l2cap_socket_id:{}",

      bta_jv_conn_type_text(conn_type), role, remote_psm, peer_bd_addr,

      bta_jv_conn_type_text(conn_type), remote_psm, peer_bd_addr,

      l2cap_socket_id);

  log::assert_that(p_cback != nullptr, "assert failed: p_cback != nullptr");



  do_in_main_thread(FROM_HERE,

                    Bind(&bta_jv_l2cap_connect, conn_type, sec_mask, role,

                         remote_psm, rx_mtu, peer_bd_addr, base::Passed(&cfg),

                    Bind(&bta_jv_l2cap_connect, conn_type, sec_mask, remote_psm,

                         rx_mtu, peer_bd_addr, base::Passed(&cfg),

                         base::Passed(&ertm_info), p_cback, l2cap_socket_id));

}
@@ -279,19 +278,17 @@ tBTA_JV_STATUS BTA_JvL2capClose(uint32_t handle) { 
 *

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

void BTA_JvL2capStartServer(tBTA_JV_CONN_TYPE conn_type, tBTA_SEC sec_mask,

                            tBTA_JV_ROLE role,

                            std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                            uint16_t local_psm, uint16_t rx_mtu,

                            std::unique_ptr<tL2CAP_CFG_INFO> cfg,

                            tBTA_JV_L2CAP_CBACK* p_cback,

                            uint32_t l2cap_socket_id) {

  log::verbose("conn_type:{}, role:{}, local_psm:{}, l2cap_socket_id:{}",

               bta_jv_conn_type_text(conn_type), role, local_psm,

               l2cap_socket_id);

  log::verbose("conn_type:{}, local_psm:{}, l2cap_socket_id:{}",

               bta_jv_conn_type_text(conn_type), local_psm, l2cap_socket_id);

  CHECK(p_cback);



  do_in_main_thread(FROM_HERE,

                    Bind(&bta_jv_l2cap_start_server, conn_type, sec_mask, role,

                    Bind(&bta_jv_l2cap_start_server, conn_type, sec_mask,

                         local_psm, rx_mtu, base::Passed(&cfg),

                         base::Passed(&ertm_info), p_cback, l2cap_socket_id));

}
@@ -423,8 +420,7 @@ tBTA_JV_STATUS BTA_JvL2capWrite(uint32_t handle, uint32_t req_id, BT_HDR* msg, 
 *                  tBTA_JV_STATUS::FAILURE, otherwise.

 *

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

tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

                                   uint8_t remote_scn,

tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask, uint8_t remote_scn,

                                   const RawAddress& peer_bd_addr,

                                   tBTA_JV_RFCOMM_CBACK* p_cback,

                                   uint32_t rfcomm_slot_id) {
@@ -479,8 +475,8 @@ tBTA_JV_STATUS BTA_JvRfcommClose(uint32_t handle, uint32_t rfcomm_slot_id) { 
 *                  tBTA_JV_STATUS::FAILURE, otherwise.

 *

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

tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask, tBTA_JV_ROLE role,

                                       uint8_t local_scn, uint8_t max_session,

tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask, uint8_t local_scn,

                                       uint8_t max_session,

                                       tBTA_JV_RFCOMM_CBACK* p_cback,

                                       uint32_t rfcomm_slot_id) {

  log::verbose("local_scn:{}, rfcomm_slot_id:{}", local_scn, rfcomm_slot_id);

system/bta/jv/bta_jv_int.h

+3 −4
Original line number Diff line number Diff line
@@ -154,16 +154,15 @@ void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, 
void bta_jv_create_record(uint32_t rfcomm_slot_id);

void bta_jv_delete_record(uint32_t handle);

void bta_jv_l2cap_connect(tBTA_JV_CONN_TYPE type, tBTA_SEC sec_mask,

                          tBTA_JV_ROLE role, uint16_t remote_psm,

                          uint16_t rx_mtu, const RawAddress& peer_bd_addr,

                          uint16_t remote_psm, uint16_t rx_mtu,

                          const RawAddress& peer_bd_addr,

                          std::unique_ptr<tL2CAP_CFG_INFO> cfg,

                          std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                          tBTA_JV_L2CAP_CBACK* p_cback,

                          uint32_t l2cap_socket_id);

void bta_jv_l2cap_close(uint32_t handle, tBTA_JV_L2C_CB* p_cb);

void bta_jv_l2cap_start_server(tBTA_JV_CONN_TYPE type, tBTA_SEC sec_mask,

                               tBTA_JV_ROLE role, uint16_t local_psm,

                               uint16_t rx_mtu,

                               uint16_t local_psm, uint16_t rx_mtu,

                               std::unique_ptr<tL2CAP_CFG_INFO> cfg_param,

                               std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,

                               tBTA_JV_L2CAP_CBACK* p_cback,

system/btif/src/btif_sock_l2cap.cc

+6 −6
Original line number Diff line number Diff line
@@ -814,9 +814,9 @@ static void btsock_l2cap_server_listen(l2cap_socket* sock) { 
    ertm_info.reset(new tL2CAP_ERTM_INFO(obex_l2c_etm_opt));

  }



  BTA_JvL2capStartServer(connection_type, sock->security, 0,

                         std::move(ertm_info), sock->channel, sock->rx_mtu,

                         std::move(cfg), btsock_l2cap_cbk, sock->id);

  BTA_JvL2capStartServer(connection_type, sock->security, std::move(ertm_info),

                         sock->channel, sock->rx_mtu, std::move(cfg),

                         btsock_l2cap_cbk, sock->id);

}



static bt_status_t btsock_l2cap_listen_or_connect(const char* name,
@@ -878,9 +878,9 @@ static bt_status_t btsock_l2cap_listen_or_connect(const char* name, 
      ertm_info.reset(new tL2CAP_ERTM_INFO(obex_l2c_etm_opt));

    }



      BTA_JvL2capConnect(

          connection_type, sock->security, 0, std::move(ertm_info), channel,

          sock->rx_mtu, std::move(cfg), sock->addr, btsock_l2cap_cbk, sock->id);

    BTA_JvL2capConnect(connection_type, sock->security, std::move(ertm_info),

                       channel, sock->rx_mtu, std::move(cfg), sock->addr,

                       btsock_l2cap_cbk, sock->id);

  }



  *sock_fd = sock->app_fd;