Bluetooth_ext: Remove code related to MCAP Protocol
- MCAP protocol has been largely replaced by BLE.
New applications shuold use Bluetoth low energy
instead of MCAP.
- This patch will remove code related to MCAP protocol.
CRs-Fixed: 2403566
Change-Id: I4ce5910878179db209fe1cce0124f54fc1679143
diff --git a/certification_tools/blegatt_test/gatt_test.cpp b/certification_tools/blegatt_test/gatt_test.cpp
index 8c78d82..c980ad4 100644
--- a/certification_tools/blegatt_test/gatt_test.cpp
+++ b/certification_tools/blegatt_test/gatt_test.cpp
@@ -326,18 +326,18 @@
tL2CAP_FCR_OPTS ertm_fcr_opts_def = {
L2CAP_FCR_ERTM_MODE,
3, /* Tx window size */
- MCA_FCR_OPT_MAX_TX_B4_DISCNT, /* Maximum transmissions before disconnecting */
+ 20, /* Maximum transmissions before disconnecting */
2000, /* Retransmission timeout (2 secs) */
- MCA_FCR_OPT_MONITOR_TOUT, /* Monitor timeout (12 secs) */
+ 12000, /* Monitor timeout (12 secs) */
100 /* MPS segment size */
};
tL2CAP_FCR_OPTS stream_fcr_opts_def = {
L2CAP_FCR_STREAM_MODE,
3,/* Tx window size */
- MCA_FCR_OPT_MAX_TX_B4_DISCNT, /* Maximum transmissions before disconnecting */
+ 20, /* Maximum transmissions before disconnecting */
2000, /* Retransmission timeout (2 secs) */
- MCA_FCR_OPT_MONITOR_TOUT, /* Monitor timeout (12 secs) */
+ 12000, /* Monitor timeout (12 secs) */
100 /* MPS segment size */
};
static tL2CAP_ERTM_INFO t_ertm_info = {0, 0, 0, 0, 0, 0};
diff --git a/certification_tools/l2test_ertm/l2test_ertm.cpp b/certification_tools/l2test_ertm/l2test_ertm.cpp
index a97272c..2c3b4ae 100644
--- a/certification_tools/l2test_ertm/l2test_ertm.cpp
+++ b/certification_tools/l2test_ertm/l2test_ertm.cpp
@@ -139,18 +139,18 @@
tL2CAP_FCR_OPTS ertm_fcr_opts_def = {
L2CAP_FCR_ERTM_MODE,
3, /* Tx window size */
- MCA_FCR_OPT_MAX_TX_B4_DISCNT, /* Maximum transmissions before disconnecting */
+ 20, /* Maximum transmissions before disconnecting */
2000, /* Retransmission timeout (2 secs) */
- MCA_FCR_OPT_MONITOR_TOUT, /* Monitor timeout (12 secs) */
+ 12000, /* Monitor timeout (12 secs) */
100 /* MPS segment size */
};
tL2CAP_FCR_OPTS stream_fcr_opts_def = {
L2CAP_FCR_STREAM_MODE,
3,/* Tx window size */
- MCA_FCR_OPT_MAX_TX_B4_DISCNT, /* Maximum transmissions before disconnecting */
+ 20, /* Maximum transmissions before disconnecting */
2000, /* Retransmission timeout (2 secs) */
- MCA_FCR_OPT_MONITOR_TOUT, /* Monitor timeout (12 secs) */
+ 12000, /* Monitor timeout (12 secs) */
100 /* MPS segment size */
};
static tL2CAP_ERTM_INFO t_ertm_info = {0,0,0,0,0,0};
diff --git a/system_bt_ext/btif/Android.bp b/system_bt_ext/btif/Android.bp
index 6047291..5c104c1 100644
--- a/system_bt_ext/btif/Android.bp
+++ b/system_bt_ext/btif/Android.bp
@@ -23,7 +23,6 @@
],
srcs: [
"src/btif_l2cap.cc",
- "src/btif_mcap.cc",
"src/btif_rfcomm.cc",
"src/btif_vendor.cc",
"src/btif_vendor_socket.cc",
diff --git a/system_bt_ext/btif/src/btif_mcap.cc b/system_bt_ext/btif/src/btif_mcap.cc
deleted file mode 100644
index 2a37b35..0000000
--- a/system_bt_ext/btif/src/btif_mcap.cc
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the followin conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the followin disclaimer.
- * * Redistributions in binary form must reproduce the above copyriht
- * notice, this list of conditions and the followin disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of The Linux Foundation nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <hardware/bluetooth.h>
-
-
-#define LOG_NDDEBUG 0
-#define LOG_TAG "bluedroid"
-
-#include "btif_api.h"
-#include "bt_utils.h"
-#include "bt_testapp.h"
-#include "btm_api.h"
-#include "btu.h"
-#include "btm_api.h"
-#include "mca_api.h"
-
-#ifdef TEST_APP_INTERFACE
-
-static void McaInit(void)
-{
- MCA_Init();
-}
-
-static tMCA_HANDLE McaRegister(tMCA_REG *p_reg, tMCA_CTRL_CBACK *p_cback)
-{
- tMCA_HANDLE Ret = 0;
- BTM_SetConnectability (1, 0, 0);
- Ret = MCA_Register(p_reg, p_cback);
- ALOGI("McaRegister");
- return Ret;
-}
-
-static void Mca_Deregister(tMCA_HANDLE handle)
-{
- MCA_Deregister(handle);
- ALOGI("McaRegister");
-}
-
-static tMCA_RESULT Mca_CreateDep(tMCA_HANDLE handle, tMCA_DEP *p_dep, tMCA_CS *p_cs)
-{
- tMCA_RESULT Ret = 0;
- ALOGI("Mca_CreateDep Enter");
- Ret = MCA_CreateDep(handle, p_dep, p_cs);
- ALOGI("Mca_CreateDep Exit");
- return Ret;
-}
-
-static tMCA_RESULT Mca_DeleteDep(tMCA_HANDLE handle, tMCA_DEP dep)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_DeleteDep(handle, dep);
- ALOGI("MCA_DeleteDep Exit");
- return Ret;
-}
-
-
-static tMCA_RESULT Mca_ConnectReq(tMCA_HANDLE handle, RawAddress bd_addr, uint16_t ctrl_psm, uint16_t sec_mask)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_ConnectReq(handle, bd_addr, ctrl_psm, sec_mask);
- ALOGI("MCA_ConnectReq");
- return Ret;
-}
-
-static tMCA_RESULT Mca_DisconnectReq(tMCA_CL mcl)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_DisconnectReq(mcl);
- ALOGI("Mca_DisconnectReq");
- return Ret;
-}
-
-
-static tMCA_RESULT Mca_CreateMdl(tMCA_CL mcl, tMCA_DEP dep, uint16_t data_psm,
- uint16_t mdl_id, uint8_t peer_dep_id,
- uint8_t cfg, const tMCA_CHNL_CFG *p_chnl_cfg)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_CreateMdl(mcl, dep, data_psm, mdl_id, peer_dep_id, cfg, p_chnl_cfg);
- ALOGI("MCA_CreateMdl");
- return Ret;
-}
-
-
-static tMCA_RESULT Mca_CreateMdlRsp(tMCA_CL mcl, tMCA_DEP dep, uint16_t mdl_id, uint8_t cfg, uint8_t rsp_code, const tMCA_CHNL_CFG *p_chnl_cfg)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_CreateMdlRsp(mcl, dep, mdl_id, cfg, rsp_code, p_chnl_cfg);
- ALOGI("Mca_CreateMdlRsp");
- return Ret;
-}
-
-
-static tMCA_RESULT Mca_CloseReq(tMCA_DL mdl)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_CloseReq(mdl);
- ALOGI("Mca_CloseReq");
- return Ret;
-}
-
-static tMCA_RESULT Mca_ReconnectMdl(tMCA_CL mcl, tMCA_DEP dep, uint16_t data_psm, uint16_t mdl_id, const tMCA_CHNL_CFG *p_chnl_cfg)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_ReconnectMdl(mcl, dep, data_psm, mdl_id, p_chnl_cfg);
- ALOGI("Mca_ReconnectMdl");
- return Ret;
-}
-
-static tMCA_RESULT Mca_ReconnectMdlRsp(tMCA_CL mcl, tMCA_DEP dep, uint16_t mdl_id, uint8_t rsp_code, const tMCA_CHNL_CFG *p_chnl_cfg)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_ReconnectMdlRsp(mcl, dep, mdl_id, rsp_code, p_chnl_cfg);
- ALOGI("Mca_ReconnectMdl");
- return Ret;
-}
-
-static tMCA_RESULT Mca_DataChnlCfg(tMCA_CL mcl, const tMCA_CHNL_CFG *p_chnl_cfg)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_DataChnlCfg(mcl, p_chnl_cfg);
- ALOGI("Mca_DataChnlCfg");
- return Ret;
-}
-
-static tMCA_RESULT Mca_Abort(tMCA_CL mcl)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_Abort(mcl);
- ALOGI("MCA_Abort");
- return Ret;
-}
-
-
-static tMCA_RESULT Mca_Delete(tMCA_CL mcl, uint16_t mdl_id)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_Delete(mcl, mdl_id);
- ALOGI("Mca_Delete");
- return Ret;
-}
-
-static tMCA_RESULT Mca_WriteReq(tMCA_DL mdl, BT_HDR *p_pkt)
-{
- tMCA_RESULT Ret = 0;
- Ret = MCA_WriteReq(mdl, p_pkt);
- ALOGI("Mca_Delete");
- return Ret;
-}
-
-static uint16_t Mca_GetL2CapChannel (tMCA_DL mdl)
-{
- uint16_t Ret = 0;
- Ret = MCA_GetL2CapChannel(mdl);
- ALOGI("Mca_GetL2CapChannel");
- return Ret;
-}
-
-static const btmcap_interface_t btmcaInterface = {
- sizeof(btmcap_interface_t),
- McaInit,
- McaRegister,
- Mca_Deregister,
- Mca_CreateDep,
- Mca_DeleteDep,
- Mca_ConnectReq,
- Mca_DisconnectReq,
- Mca_CreateMdl,
- Mca_CreateMdlRsp,
- Mca_CloseReq,
- Mca_ReconnectMdl,
- Mca_ReconnectMdlRsp,
- Mca_DataChnlCfg,
- Mca_Abort,
- Mca_Delete,
- Mca_WriteReq,
- Mca_GetL2CapChannel
-};
-
-
-const btmcap_interface_t *btif_mcap_get_interface(void)
-{
- //BTIF_TRACE_EVENT1("%s", __FUNCTION__);
- //printf("\n%s\n", __FUNCTION__);
- return &btmcaInterface;
-}
-
-
-#endif
diff --git a/system_bt_ext/btif/src/btif_vendor.cc b/system_bt_ext/btif/src/btif_vendor.cc
index 202381b..fd5d62b 100644
--- a/system_bt_ext/btif/src/btif_vendor.cc
+++ b/system_bt_ext/btif/src/btif_vendor.cc
@@ -122,7 +122,6 @@
#if TEST_APP_INTERFACE == TRUE
extern const btl2cap_interface_t *btif_l2cap_get_interface(void);
extern const btrfcomm_interface_t *btif_rfcomm_get_interface(void);
-extern const btmcap_interface_t *btif_mcap_get_interface(void);
extern const btgatt_test_interface_t *btif_gatt_test_get_interface(void);
extern const btsmp_interface_t *btif_smp_get_interface(void);
extern const btgap_interface_t *btif_gap_get_interface(void);
@@ -431,8 +430,6 @@
return btif_l2cap_get_interface();
case TEST_APP_RFCOMM:
return btif_rfcomm_get_interface();
- case TEST_APP_MCAP:
- return btif_mcap_get_interface();
case TEST_APP_GATT:
return btif_gatt_test_get_interface();
case TEST_APP_SMP:
diff --git a/system_bt_ext/include/bt_testapp.h b/system_bt_ext/include/bt_testapp.h
index a8681ed..e302bdc 100644
--- a/system_bt_ext/include/bt_testapp.h
+++ b/system_bt_ext/include/bt_testapp.h
@@ -50,7 +50,6 @@
#include "sdp_api.h"
#include "gatt_api.h"
#include "gap_api.h"
-#include "mca_api.h"
#include <hardware/hardware.h>
#include "btm_api.h"
#include "bt_types.h"
@@ -138,37 +137,6 @@
typedef struct
{
size_t size;
- void (*Init)(void);
- tMCA_HANDLE (*Register)(tMCA_REG *p_reg, tMCA_CTRL_CBACK *p_cback);
- void (*Deregister)(tMCA_HANDLE handle);
- tMCA_RESULT (*CreateDep)(tMCA_HANDLE handle, tMCA_DEP *p_dep, tMCA_CS *p_cs);
- tMCA_RESULT (*DeleteDep)(tMCA_HANDLE handle, tMCA_DEP dep);
- tMCA_RESULT (*ConnectReq)(tMCA_HANDLE handle, RawAddress bd_addr,
- uint16_t ctrl_psm,
- uint16_t sec_mask);
- tMCA_RESULT (*DisconnectReq)(tMCA_CL mcl);
- tMCA_RESULT (*CreateMdl)(tMCA_CL mcl, tMCA_DEP dep, uint16_t data_psm,
- uint16_t mdl_id, uint8_t peer_dep_id,
- uint8_t cfg, const tMCA_CHNL_CFG *p_chnl_cfg);
- tMCA_RESULT (*CreateMdlRsp)(tMCA_CL mcl, tMCA_DEP dep,
- uint16_t mdl_id, uint8_t cfg, uint8_t rsp_code,
- const tMCA_CHNL_CFG *p_chnl_cfg);
- tMCA_RESULT (*CloseReq)(tMCA_DL mdl);
- tMCA_RESULT (*ReconnectMdl)(tMCA_CL mcl, tMCA_DEP dep, uint16_t data_psm,
- uint16_t mdl_id, const tMCA_CHNL_CFG *p_chnl_cfg);
- tMCA_RESULT (*ReconnectMdlRsp)(tMCA_CL mcl, tMCA_DEP dep,
- uint16_t mdl_id, uint8_t rsp_code,
- const tMCA_CHNL_CFG *p_chnl_cfg);
- tMCA_RESULT (*DataChnlCfg)(tMCA_CL mcl, const tMCA_CHNL_CFG *p_chnl_cfg);
- tMCA_RESULT (*Abort)(tMCA_CL mcl);
- tMCA_RESULT (*Delete)(tMCA_CL mcl, uint16_t mdl_id);
- tMCA_RESULT (*WriteReq)(tMCA_DL mdl, BT_HDR *p_pkt);
- uint16_t (*GetL2CapChannel) (tMCA_DL mdl);
-}btmcap_interface_t;
-
-typedef struct
-{
- size_t size;
//GATT common APIs (Both client and server)
tGATT_IF (*Register) (bluetooth::Uuid& p_app_uuid128, tGATT_CBACK *p_cb_info);
void (*Deregister) (tGATT_IF gatt_if);