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

Commit c5f3ae31 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Remove L2CA_ErtmConnectRsp 

Just use L2CA_ConnectRsp.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie95ed09c9d2e79fabd9d6eae6a038a6896a8e558
parent 531635fb

system/main/shim/l2c_api.cc

+1 −10
Original line number Diff line number Diff line
@@ -103,19 +103,10 @@ uint16_t bluetooth::shim::L2CA_ConnectReq(uint16_t psm, 
  return shim_l2cap.CreateConnection(psm, raw_address);

}



bool bluetooth::shim::L2CA_ErtmConnectRsp(const RawAddress& p_bd_addr,

                                          uint8_t id, uint16_t lcid,

                                          uint16_t result, uint16_t status,

                                          tL2CAP_ERTM_INFO* p_ertm_info) {

  return shim_l2cap.ConnectResponse(p_bd_addr, id, lcid, result, status,

                                    p_ertm_info);

}



bool bluetooth::shim::L2CA_ConnectRsp(const RawAddress& p_bd_addr, uint8_t id,

                                      uint16_t lcid, uint16_t result,

                                      uint16_t status) {

  return bluetooth::shim::L2CA_ErtmConnectRsp(p_bd_addr, id, lcid, result,

                                              status, nullptr);

  return shim_l2cap.ConnectResponse(p_bd_addr, id, lcid, result, status);

}



bool bluetooth::shim::L2CA_ConfigReq(uint16_t cid, tL2CAP_CFG_INFO* cfg_info) {

system/main/shim/l2c_api.h

+0 −16
Original line number Diff line number Diff line
@@ -187,22 +187,6 @@ bool L2CA_ConnectLECocRsp(const RawAddress& p_bd_addr, uint8_t id, 
 ******************************************************************************/

bool L2CA_GetPeerLECocConfig(uint16_t lcid, tL2CAP_LE_CFG_INFO* peer_cfg);



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

 *

 * Function         L2CA_ErtmConnectRsp

 *

 * Description      Higher layers call this function to accept an incoming

 *                  L2CAP connection, for which they had gotten an connect

 *                  indication callback, and for which the higher layer wants

 *                  to use Enhanced Retransmission Mode.

 *

 * Returns          true for success, false for failure

 *

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

bool L2CA_ErtmConnectRsp(const RawAddress& p_bd_addr, uint8_t id, uint16_t lcid,

                         uint16_t result, uint16_t status,

                         tL2CAP_ERTM_INFO* p_ertm_info);



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

 *

 * Function         L2CA_ConfigReq

system/main/shim/l2cap.cc

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ void bluetooth::shim::legacy::L2cap::SetDownstreamCallbacks(uint16_t cid) { 


bool bluetooth::shim::legacy::L2cap::ConnectResponse(

    const RawAddress& raw_address, uint8_t signal_id, uint16_t cid,

    uint16_t result, uint16_t status, tL2CAP_ERTM_INFO* ertm_info) {

    uint16_t result, uint16_t status) {

  CHECK(ConnectionExists(cid));

  LOG_DEBUG(

      "%s Silently dropping client connect response as channel is "

system/main/shim/l2cap.h

+1 −2
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ class L2cap { 


  // Legacy API entry points

  bool ConnectResponse(const RawAddress& raw_address, uint8_t signal_id,

                       uint16_t cid, uint16_t result, uint16_t status,

                       tL2CAP_ERTM_INFO* ertm_info);

                       uint16_t cid, uint16_t result, uint16_t status);

  bool ConfigRequest(uint16_t cid, const tL2CAP_CFG_INFO* config_info);

  bool ConfigResponse(uint16_t cid, const tL2CAP_CFG_INFO* config_info);

  bool DisconnectRequest(uint16_t cid);

system/stack/avct/avct_l2c_br.cc

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void avct_l2c_br_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, 
  ertm_info.preferred_mode = L2CAP_FCR_ERTM_MODE;



  /* Send L2CAP connect rsp */

  L2CA_ErtmConnectRsp(bd_addr, id, lcid, result, 0, &ertm_info);

  L2CA_ConnectRsp(bd_addr, id, lcid, result, 0);



  /* if result ok, proceed with connection */

  if (result == L2CAP_CONN_OK) {