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) {
/*******************************************************************************
*
- * 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
*
* Description Higher layers call this function to send configuration.
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 "
// 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);
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) {
/* Send response to the L2CAP layer. */
if (p_ccb->transport == BT_TRANSPORT_BR_EDR)
- L2CA_ErtmConnectRsp(bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_OK,
- L2CAP_CONN_OK, &p_ccb->ertm_info);
+ L2CA_ConnectRsp(bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_OK, L2CAP_CONN_OK);
if (p_ccb->transport == BT_TRANSPORT_LE) {
L2CA_ConnectLECocRsp(bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_OK,
/*******************************************************************************
*
- * 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
- *
- ******************************************************************************/
-extern 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_DisconnectReq
*
* Description Higher layers call this function to disconnect a channel.
status);
}
- return L2CA_ErtmConnectRsp(p_bd_addr, id, lcid, result, status, NULL);
-}
-
-/*******************************************************************************
- *
- * Function L2CA_ErtmConnectRsp
- *
- * Description Higher layers call this function to accept an incoming
- * L2CAP connection, for which they had gotten an connect
- * indication callback.
- *
- * 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) {
- if (bluetooth::shim::is_gd_shim_enabled()) {
- return bluetooth::shim::L2CA_ErtmConnectRsp(p_bd_addr, id, lcid, result,
- status, p_ertm_info);
- }
-
tL2C_LCB* p_lcb;
tL2C_CCB* p_ccb;