Merge commit 'f7f839985b3931682363d2ef3b7c5cae55a842ee' into merge

Change-Id: Iaaec1ea0bf3009b7e32a9a60f697631a3f56e889

4 files changed, 16 insertions, 17 deletions

diff --git a/stack/mcap/mca_api.c b/stack/mcap/mca_api.c
index 2a2ff8ca1..ae4cdb22b 100644
--- a/stack/mcap/mca_api.c
+++ b/stack/mcap/mca_api.c
@@ -22,6 +22,7 @@
  *  Protocol (MCAP).
  *
  ******************************************************************************/
+#include <assert.h>
 #include <string.h>
 
 #include "bt_target.h"
@@ -31,7 +32,6 @@
 #include "mca_defs.h"
 #include "mca_int.h"
 
-#include "wcassert.h"
 #include "btu.h"
 
 
@@ -125,8 +125,8 @@ tMCA_HANDLE MCA_Register(tMCA_REG *p_reg, tMCA_CTRL_CBACK *p_cback)
     tL2CAP_APPL_INFO l2c_cacp_appl;
     tL2CAP_APPL_INFO l2c_dacp_appl;
 
-    WC_ASSERT(p_reg != NULL );
-    WC_ASSERT(p_cback != NULL );
+    assert(p_reg != NULL );
+    assert(p_cback != NULL );
 
     MCA_TRACE_API ("MCA_Register: ctrl_psm:0x%x, data_psm:0x%x", p_reg->ctrl_psm, p_reg->data_psm);
 
@@ -221,9 +221,9 @@ tMCA_RESULT MCA_CreateDep(tMCA_HANDLE handle, tMCA_DEP *p_dep, tMCA_CS *p_cs)
     tMCA_RCB *p_rcb = mca_rcb_by_handle(handle);
     tMCA_CS  *p_depcs;
 
-    WC_ASSERT(p_dep != NULL );
-    WC_ASSERT(p_cs != NULL );
-    WC_ASSERT(p_cs->p_data_cback != NULL );
+    assert(p_dep != NULL );
+    assert(p_cs != NULL );
+    assert(p_cs->p_data_cback != NULL );
 
     MCA_TRACE_API ("MCA_CreateDep: %d", handle);
     if (p_rcb)
@@ -508,7 +508,7 @@ tMCA_RESULT MCA_CreateMdlRsp(tMCA_CL mcl, tMCA_DEP dep,
     tMCA_DCB        *p_dcb;
 
     MCA_TRACE_API ("MCA_CreateMdlRsp: %d dep=%d mdl_id=%d cfg=%d rsp_code=%d", mcl, dep, mdl_id, cfg, rsp_code);
-    WC_ASSERT(p_chnl_cfg != NULL );
+    assert(p_chnl_cfg != NULL );
     if (p_ccb)
     {
         if (p_ccb->cong)
@@ -605,7 +605,7 @@ tMCA_RESULT MCA_ReconnectMdl(tMCA_CL mcl, tMCA_DEP dep, UINT16 data_psm,
     tMCA_DCB        *p_dcb;
 
     MCA_TRACE_API ("MCA_ReconnectMdl: %d ", mcl);
-    WC_ASSERT(p_chnl_cfg != NULL );
+    assert(p_chnl_cfg != NULL );
     if (p_ccb)
     {
         if (p_ccb->p_tx_req || p_ccb->p_rx_msg || p_ccb->cong)
@@ -674,7 +674,7 @@ tMCA_RESULT MCA_ReconnectMdlRsp(tMCA_CL mcl, tMCA_DEP dep,
     tMCA_DCB        *p_dcb;
 
     MCA_TRACE_API ("MCA_ReconnectMdlRsp: %d ", mcl);
-    WC_ASSERT(p_chnl_cfg != NULL );
+    assert(p_chnl_cfg != NULL );
     if (p_ccb)
     {
         if (p_ccb->cong)
@@ -739,7 +739,7 @@ tMCA_RESULT MCA_DataChnlCfg(tMCA_CL mcl, const tMCA_CHNL_CFG *p_chnl_cfg)
     tMCA_TC_TBL *p_tbl;
 
     MCA_TRACE_API ("MCA_DataChnlCfg: %d ", mcl);
-    WC_ASSERT(p_chnl_cfg != NULL );
+    assert(p_chnl_cfg != NULL );
     if (p_ccb)
     {
         result = MCA_NO_RESOURCES;
diff --git a/stack/mcap/mca_cact.c b/stack/mcap/mca_cact.c
index bab3c76db..7ac0efb0d 100644
--- a/stack/mcap/mca_cact.c
+++ b/stack/mcap/mca_cact.c
@@ -165,7 +165,6 @@ void mca_ccb_snd_rsp(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
     BT_HDR  *p_pkt;
     UINT8   *p, *p_start;
     BOOLEAN chk_mdl = FALSE;
-    tMCA_DCB    *p_dcb;
 
     MCA_TRACE_DEBUG ("mca_ccb_snd_rsp cong=%d req=%d", p_ccb->cong, p_msg->op_code);
     /* assume that API functions verified the parameters */
@@ -187,7 +186,7 @@ void mca_ccb_snd_rsp(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
 
         if (chk_mdl && p_msg->rsp_code == MCA_RSP_SUCCESS)
         {
-            p_dcb = mca_dcb_by_hdl(p_msg->dcb_idx);
+            mca_dcb_by_hdl(p_msg->dcb_idx);
             BTM_SetSecurityLevel(FALSE, "", BTM_SEC_SERVICE_MCAP_DATA, p_ccb->sec_mask,
                 p_ccb->p_rcb->reg.data_psm, BTM_SEC_PROTO_MCA, p_msg->dcb_idx);
             p_ccb->status = MCA_CCB_STAT_PENDING;
diff --git a/stack/mcap/mca_int.h b/stack/mcap/mca_int.h
index 54ff0c039..9a7d0fdf0 100644
--- a/stack/mcap/mca_int.h
+++ b/stack/mcap/mca_int.h
@@ -347,9 +347,9 @@ extern "C"
 ** Main Control Block
 *******************************************************************************/
 #if MCA_DYNAMIC_MEMORY == FALSE
-MCA_API extern tMCA_CB  mca_cb;
+extern tMCA_CB  mca_cb;
 #else
-MCA_API extern tMCA_CB *mca_cb_ptr;
+extern tMCA_CB *mca_cb_ptr;
 #define mca_cb (*mca_cb_ptr)
 #endif
 
diff --git a/stack/mcap/mca_main.c b/stack/mcap/mca_main.c
index 60b99d9da..44307d24a 100644
--- a/stack/mcap/mca_main.c
+++ b/stack/mcap/mca_main.c
@@ -22,6 +22,7 @@
  *  Utility functions.
  *
  ******************************************************************************/
+#include <assert.h>
 #include <string.h>
 
 #include "bt_target.h"
@@ -29,7 +30,6 @@
 #include "mca_api.h"
 #include "mca_defs.h"
 #include "mca_int.h"
-#include "wcassert.h"
 #include "l2c_api.h"
 
 /* Main Control block for MCA */
@@ -134,7 +134,7 @@ tMCA_TC_TBL * mca_tc_tbl_calloc(tMCA_CCB *p_ccb)
     }
 
     /* sanity check */
-    WC_ASSERT(i != MCA_NUM_TC_TBL);
+    assert(i != MCA_NUM_TC_TBL);
 
     /* initialize entry */
     p_tbl->peer_mtu = L2CAP_DEFAULT_MTU;
@@ -175,7 +175,7 @@ tMCA_TC_TBL * mca_tc_tbl_dalloc(tMCA_DCB *p_dcb)
     }
 
     /* sanity check */
-    WC_ASSERT(i != MCA_NUM_TC_TBL);
+    assert(i != MCA_NUM_TC_TBL);
 
     /* initialize entry */
     p_tbl->peer_mtu = L2CAP_DEFAULT_MTU;