Logging cleanup: AVRC, MCA, GATT, and SMP.

Change-Id: I6d1e61ff023b5fd19f144955cff16831cc18c6e6

6 files changed, 82 insertions, 82 deletions

diff --git a/stack/mcap/mca_api.c b/stack/mcap/mca_api.c
index 1792f8cce..2a2ff8ca1 100644
--- a/stack/mcap/mca_api.c
+++ b/stack/mcap/mca_api.c
@@ -128,7 +128,7 @@ tMCA_HANDLE MCA_Register(tMCA_REG *p_reg, tMCA_CTRL_CBACK *p_cback)
     WC_ASSERT(p_reg != NULL );
     WC_ASSERT(p_cback != NULL );
 
-    MCA_TRACE_API2 ("MCA_Register: ctrl_psm:0x%x, data_psm:0x%x", p_reg->ctrl_psm, p_reg->data_psm);
+    MCA_TRACE_API ("MCA_Register: ctrl_psm:0x%x, data_psm:0x%x", p_reg->ctrl_psm, p_reg->data_psm);
 
     if ( (p_rcb = mca_rcb_alloc (p_reg)) != NULL)
     {
@@ -136,7 +136,7 @@ tMCA_HANDLE MCA_Register(tMCA_REG *p_reg, tMCA_CTRL_CBACK *p_cback)
         {
             if (L2C_INVALID_PSM(p_reg->ctrl_psm) || L2C_INVALID_PSM(p_reg->data_psm))
             {
-                MCA_TRACE_ERROR0 ("INVALID_PSM");
+                MCA_TRACE_ERROR ("INVALID_PSM");
                 return 0;
             }
 
@@ -161,7 +161,7 @@ tMCA_HANDLE MCA_Register(tMCA_REG *p_reg, tMCA_CTRL_CBACK *p_cback)
             }
             else
             {
-                MCA_TRACE_ERROR0 ("Failed to register to L2CAP");
+                MCA_TRACE_ERROR ("Failed to register to L2CAP");
                 return 0;
             }
         }
@@ -190,7 +190,7 @@ void MCA_Deregister(tMCA_HANDLE handle)
 {
     tMCA_RCB *p_rcb = mca_rcb_by_handle(handle);
 
-    MCA_TRACE_API1 ("MCA_Deregister: %d", handle);
+    MCA_TRACE_API ("MCA_Deregister: %d", handle);
     if (p_rcb && p_rcb->reg.ctrl_psm)
     {
         L2CA_Deregister(p_rcb->reg.ctrl_psm);
@@ -225,12 +225,12 @@ tMCA_RESULT MCA_CreateDep(tMCA_HANDLE handle, tMCA_DEP *p_dep, tMCA_CS *p_cs)
     WC_ASSERT(p_cs != NULL );
     WC_ASSERT(p_cs->p_data_cback != NULL );
 
-    MCA_TRACE_API1 ("MCA_CreateDep: %d", handle);
+    MCA_TRACE_API ("MCA_CreateDep: %d", handle);
     if (p_rcb)
     {
         if (p_cs->max_mdl > MCA_NUM_MDLS)
         {
-            MCA_TRACE_ERROR1 ("max_mdl: %d is too big", p_cs->max_mdl );
+            MCA_TRACE_ERROR ("max_mdl: %d is too big", p_cs->max_mdl );
             result = MCA_BAD_PARAMS;
         }
         else
@@ -240,7 +240,7 @@ tMCA_RESULT MCA_CreateDep(tMCA_HANDLE handle, tMCA_DEP *p_dep, tMCA_CS *p_cs)
             {
                 if (p_depcs->p_data_cback)
                 {
-                    MCA_TRACE_ERROR0 ("Already has ECHO MDEP");
+                    MCA_TRACE_ERROR ("Already has ECHO MDEP");
                     return MCA_NO_RESOURCES;
                 }
                 memcpy (p_depcs, p_cs, sizeof (tMCA_CS));
@@ -292,7 +292,7 @@ tMCA_RESULT MCA_DeleteDep(tMCA_HANDLE handle, tMCA_DEP dep)
     int      i, max;
     tMCA_CS  *p_depcs;
 
-    MCA_TRACE_API2 ("MCA_DeleteDep: %d dep:%d", handle, dep);
+    MCA_TRACE_API ("MCA_DeleteDep: %d dep:%d", handle, dep);
     if (p_rcb)
     {
         if (dep < MCA_NUM_DEPS && p_rcb->dep[dep].p_data_cback)
@@ -339,12 +339,12 @@ tMCA_RESULT MCA_ConnectReq(tMCA_HANDLE handle, BD_ADDR bd_addr,
     tMCA_CCB    *p_ccb;
     tMCA_TC_TBL *p_tbl;
 
-    MCA_TRACE_API2 ("MCA_ConnectReq: %d psm:0x%x", handle, ctrl_psm);
+    MCA_TRACE_API ("MCA_ConnectReq: %d psm:0x%x", handle, ctrl_psm);
     if ((p_ccb = mca_ccb_by_bd(handle, bd_addr)) == NULL)
         p_ccb = mca_ccb_alloc(handle, bd_addr);
     else
     {
-        MCA_TRACE_ERROR0 ("control channel already exists");
+        MCA_TRACE_ERROR ("control channel already exists");
         return MCA_BUSY;
     }
 
@@ -393,7 +393,7 @@ tMCA_RESULT MCA_DisconnectReq(tMCA_CL mcl)
     tMCA_RESULT result = MCA_BAD_HANDLE;
     tMCA_CCB *p_ccb = mca_ccb_by_hdl(mcl);
 
-    MCA_TRACE_API1 ("MCA_DisconnectReq: %d ", mcl);
+    MCA_TRACE_API ("MCA_DisconnectReq: %d ", mcl);
     if (p_ccb)
     {
         result = MCA_SUCCESS;
@@ -429,24 +429,24 @@ tMCA_RESULT MCA_CreateMdl(tMCA_CL mcl, tMCA_DEP dep, UINT16 data_psm,
     tMCA_CCB_MSG    *p_evt_data;
     tMCA_DCB        *p_dcb;
 
-    MCA_TRACE_API4 ("MCA_CreateMdl: %d dep=%d mdl_id=%d peer_dep_id=%d", mcl, dep, mdl_id, peer_dep_id);
+    MCA_TRACE_API ("MCA_CreateMdl: %d dep=%d mdl_id=%d peer_dep_id=%d", mcl, dep, mdl_id, peer_dep_id);
     if (p_ccb)
     {
         if (p_ccb->p_tx_req || p_ccb->p_rx_msg || p_ccb->cong)
         {
-            MCA_TRACE_ERROR0 ("pending req");
+            MCA_TRACE_ERROR ("pending req");
             return MCA_BUSY;
         }
 
         if ((peer_dep_id > MCA_MAX_MDEP_ID) || (!MCA_IS_VALID_MDL_ID(mdl_id)))
         {
-            MCA_TRACE_ERROR2 ("bad peer dep id:%d or bad mdl id: %d ", peer_dep_id, mdl_id);
+            MCA_TRACE_ERROR ("bad peer dep id:%d or bad mdl id: %d ", peer_dep_id, mdl_id);
             return MCA_BAD_PARAMS;
         }
 
         if (mca_ccb_uses_mdl_id(p_ccb, mdl_id))
         {
-            MCA_TRACE_ERROR1 ("mdl id: %d is used in the control link", mdl_id);
+            MCA_TRACE_ERROR ("mdl id: %d is used in the control link", mdl_id);
             return MCA_BAD_MDL_ID;
         }
 
@@ -507,13 +507,13 @@ tMCA_RESULT MCA_CreateMdlRsp(tMCA_CL mcl, tMCA_DEP dep,
     tMCA_CCB_MSG    evt_data;
     tMCA_DCB        *p_dcb;
 
-    MCA_TRACE_API5 ("MCA_CreateMdlRsp: %d dep=%d mdl_id=%d cfg=%d rsp_code=%d", mcl, dep, mdl_id, cfg, rsp_code);
+    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 );
     if (p_ccb)
     {
         if (p_ccb->cong)
         {
-            MCA_TRACE_ERROR0 ("congested");
+            MCA_TRACE_ERROR ("congested");
             return MCA_BUSY;
         }
         if (p_ccb->p_rx_msg && (p_ccb->p_rx_msg->mdep_id == dep )
@@ -548,7 +548,7 @@ tMCA_RESULT MCA_CreateMdlRsp(tMCA_CL mcl, tMCA_DEP dep,
         }
         else
         {
-            MCA_TRACE_ERROR0 ("The given MCL is not expecting a MCA_CreateMdlRsp with the given parameters" );
+            MCA_TRACE_ERROR ("The given MCL is not expecting a MCA_CreateMdlRsp with the given parameters" );
             result = MCA_BAD_PARAMS;
         }
     }
@@ -571,7 +571,7 @@ tMCA_RESULT MCA_CloseReq(tMCA_DL mdl)
     tMCA_RESULT     result = MCA_BAD_HANDLE;
     tMCA_DCB *p_dcb = mca_dcb_by_hdl(mdl);
 
-    MCA_TRACE_API1 ("MCA_CloseReq: %d ", mdl);
+    MCA_TRACE_API ("MCA_CloseReq: %d ", mdl);
     if (p_dcb)
     {
         result = MCA_SUCCESS;
@@ -604,25 +604,25 @@ tMCA_RESULT MCA_ReconnectMdl(tMCA_CL mcl, tMCA_DEP dep, UINT16 data_psm,
     tMCA_CCB_MSG    *p_evt_data;
     tMCA_DCB        *p_dcb;
 
-    MCA_TRACE_API1 ("MCA_ReconnectMdl: %d ", mcl);
+    MCA_TRACE_API ("MCA_ReconnectMdl: %d ", mcl);
     WC_ASSERT(p_chnl_cfg != NULL );
     if (p_ccb)
     {
         if (p_ccb->p_tx_req || p_ccb->p_rx_msg || p_ccb->cong)
         {
-            MCA_TRACE_ERROR0 ("pending req");
+            MCA_TRACE_ERROR ("pending req");
             return MCA_BUSY;
         }
 
         if (!MCA_IS_VALID_MDL_ID(mdl_id))
         {
-            MCA_TRACE_ERROR1 ("bad mdl id: %d ", mdl_id);
+            MCA_TRACE_ERROR ("bad mdl id: %d ", mdl_id);
             return MCA_BAD_PARAMS;
         }
 
         if (mca_ccb_uses_mdl_id(p_ccb, mdl_id))
         {
-            MCA_TRACE_ERROR1 ("mdl id: %d is used in the control link", mdl_id);
+            MCA_TRACE_ERROR ("mdl id: %d is used in the control link", mdl_id);
             return MCA_BAD_MDL_ID;
         }
 
@@ -673,13 +673,13 @@ tMCA_RESULT MCA_ReconnectMdlRsp(tMCA_CL mcl, tMCA_DEP dep,
     tMCA_CCB_MSG    evt_data;
     tMCA_DCB        *p_dcb;
 
-    MCA_TRACE_API1 ("MCA_ReconnectMdlRsp: %d ", mcl);
+    MCA_TRACE_API ("MCA_ReconnectMdlRsp: %d ", mcl);
     WC_ASSERT(p_chnl_cfg != NULL );
     if (p_ccb)
     {
         if (p_ccb->cong)
         {
-            MCA_TRACE_ERROR0 ("congested");
+            MCA_TRACE_ERROR ("congested");
             return MCA_BUSY;
         }
         if (p_ccb->p_rx_msg && (p_ccb->p_rx_msg->mdl_id == mdl_id) &&
@@ -698,7 +698,7 @@ tMCA_RESULT MCA_ReconnectMdlRsp(tMCA_CL mcl, tMCA_DEP dep,
                 }
                 else
                 {
-                    MCA_TRACE_ERROR0 ("Out of MDL for this MDEP");
+                    MCA_TRACE_ERROR ("Out of MDL for this MDEP");
                     rsp_code = MCA_RSP_MDEP_BUSY;
                     result = MCA_NO_RESOURCES;
                 }
@@ -711,7 +711,7 @@ tMCA_RESULT MCA_ReconnectMdlRsp(tMCA_CL mcl, tMCA_DEP dep,
         }
         else
         {
-            MCA_TRACE_ERROR0 ("The given MCL is not expecting a MCA_ReconnectMdlRsp with the given parameters" );
+            MCA_TRACE_ERROR ("The given MCL is not expecting a MCA_ReconnectMdlRsp with the given parameters" );
             result = MCA_BAD_PARAMS;
         }
     }
@@ -738,7 +738,7 @@ tMCA_RESULT MCA_DataChnlCfg(tMCA_CL mcl, const tMCA_CHNL_CFG *p_chnl_cfg)
     tMCA_DCB        *p_dcb;
     tMCA_TC_TBL *p_tbl;
 
-    MCA_TRACE_API1 ("MCA_DataChnlCfg: %d ", mcl);
+    MCA_TRACE_API ("MCA_DataChnlCfg: %d ", mcl);
     WC_ASSERT(p_chnl_cfg != NULL );
     if (p_ccb)
     {
@@ -746,7 +746,7 @@ tMCA_RESULT MCA_DataChnlCfg(tMCA_CL mcl, const tMCA_CHNL_CFG *p_chnl_cfg)
         if ((p_ccb->p_tx_req == NULL) || (p_ccb->status != MCA_CCB_STAT_PENDING) ||
             ((p_dcb = mca_dcb_by_hdl(p_ccb->p_tx_req->dcb_idx)) == NULL))
         {
-            MCA_TRACE_ERROR1 ("The given MCL is not expecting this API:%d", p_ccb->status);
+            MCA_TRACE_ERROR ("The given MCL is not expecting this API:%d", p_ccb->status);
             return result;
         }
 
@@ -785,7 +785,7 @@ tMCA_RESULT MCA_Abort(tMCA_CL mcl)
     tMCA_CCB_MSG    *p_evt_data;
     tMCA_DCB        *p_dcb;
 
-    MCA_TRACE_API1 ("MCA_Abort: %d", mcl);
+    MCA_TRACE_API ("MCA_Abort: %d", mcl);
     if (p_ccb)
     {
         result = MCA_NO_RESOURCES;
@@ -793,13 +793,13 @@ tMCA_RESULT MCA_Abort(tMCA_CL mcl)
         if ((p_ccb->p_tx_req == NULL) || (p_ccb->status != MCA_CCB_STAT_PENDING) ||
             ((p_dcb = mca_dcb_by_hdl(p_ccb->p_tx_req->dcb_idx)) == NULL))
         {
-            MCA_TRACE_ERROR1 ("The given MCL is not expecting this API:%d", p_ccb->status);
+            MCA_TRACE_ERROR ("The given MCL is not expecting this API:%d", p_ccb->status);
             return result;
         }
 
         if (p_ccb->cong)
         {
-            MCA_TRACE_ERROR0 ("congested");
+            MCA_TRACE_ERROR ("congested");
             return MCA_BUSY;
         }
 
@@ -834,17 +834,17 @@ tMCA_RESULT MCA_Delete(tMCA_CL mcl, UINT16 mdl_id)
     tMCA_CCB        *p_ccb = mca_ccb_by_hdl(mcl);
     tMCA_CCB_MSG    *p_evt_data;
 
-    MCA_TRACE_API1 ("MCA_Delete: %d ", mcl);
+    MCA_TRACE_API ("MCA_Delete: %d ", mcl);
     if (p_ccb)
     {
         if (p_ccb->cong)
         {
-            MCA_TRACE_ERROR0 ("congested");
+            MCA_TRACE_ERROR ("congested");
             return MCA_BUSY;
         }
         if (!MCA_IS_VALID_MDL_ID(mdl_id) && (mdl_id != MCA_ALL_MDL_ID))
         {
-            MCA_TRACE_ERROR1 ("bad mdl id: %d ", mdl_id);
+            MCA_TRACE_ERROR ("bad mdl id: %d ", mdl_id);
             return MCA_BAD_PARAMS;
         }
         p_evt_data = (tMCA_CCB_MSG *)GKI_getbuf (sizeof(tMCA_CCB_MSG));
@@ -886,7 +886,7 @@ tMCA_RESULT MCA_WriteReq(tMCA_DL mdl, BT_HDR *p_pkt)
     tMCA_DCB *p_dcb = mca_dcb_by_hdl(mdl);
     tMCA_DCB_EVT    evt_data;
 
-    MCA_TRACE_API1 ("MCA_WriteReq: %d ", mdl);
+    MCA_TRACE_API ("MCA_WriteReq: %d ", mdl);
     if (p_dcb)
     {
         if (p_dcb->cong)
@@ -917,7 +917,7 @@ UINT16 MCA_GetL2CapChannel (tMCA_DL mdl)
     UINT16  lcid = 0;
     tMCA_DCB *p_dcb = mca_dcb_by_hdl(mdl);
 
-    MCA_TRACE_API1 ("MCA_GetL2CapChannel: %d ", mdl);
+    MCA_TRACE_API ("MCA_GetL2CapChannel: %d ", mdl);
     if (p_dcb)
         lcid = p_dcb->lcid;
     return lcid;
diff --git a/stack/mcap/mca_cact.c b/stack/mcap/mca_cact.c
index 16a8cecdb..bab3c76db 100644
--- a/stack/mcap/mca_cact.c
+++ b/stack/mcap/mca_cact.c
@@ -101,7 +101,7 @@ void mca_ccb_snd_req(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
     BOOLEAN is_abort = FALSE;
     tMCA_DCB *p_dcb;
 
-    MCA_TRACE_DEBUG2 ("mca_ccb_snd_req cong=%d req=%d", p_ccb->cong, p_msg->op_code);
+    MCA_TRACE_DEBUG ("mca_ccb_snd_req cong=%d req=%d", p_ccb->cong, p_msg->op_code);
     /* check for abort request */
     if ((p_ccb->status == MCA_CCB_STAT_PENDING) && (p_msg->op_code == MCA_OP_MDL_ABORT_REQ))
     {
@@ -144,7 +144,7 @@ void mca_ccb_snd_req(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
     }
     else
     {
-        MCA_TRACE_WARNING0 ("dropping api req");
+        MCA_TRACE_WARNING ("dropping api req");
         GKI_freebuf (p_data);
     }
 }
@@ -167,7 +167,7 @@ void mca_ccb_snd_rsp(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
     BOOLEAN chk_mdl = FALSE;
     tMCA_DCB    *p_dcb;
 
-    MCA_TRACE_DEBUG2 ("mca_ccb_snd_rsp cong=%d req=%d", p_ccb->cong, p_msg->op_code);
+    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 */
     p_pkt = (BT_HDR *)GKI_getbuf (MCA_CTRL_MTU);
     if (p_pkt)
@@ -232,7 +232,7 @@ void mca_ccb_do_disconn (tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
 *******************************************************************************/
 void mca_ccb_cong(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
 {
-    MCA_TRACE_DEBUG2 ("mca_ccb_cong cong=%d/%d", p_ccb->cong, p_data->llcong);
+    MCA_TRACE_DEBUG ("mca_ccb_cong cong=%d/%d", p_ccb->cong, p_data->llcong);
     p_ccb->cong = p_data->llcong;
     if (!p_ccb->cong)
     {
@@ -270,17 +270,17 @@ void mca_ccb_hdl_req(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
     BOOLEAN         check_req = FALSE;
     UINT8           reject_opcode;
 
-    MCA_TRACE_DEBUG1 ("mca_ccb_hdl_req status:%d", p_ccb->status);
+    MCA_TRACE_DEBUG ("mca_ccb_hdl_req status:%d", p_ccb->status);
     p_rx_msg = (tMCA_CCB_MSG *)p_pkt;
     p = (UINT8 *)(p_pkt + 1) + p_pkt->offset;
     evt_data.hdr.op_code = *p++;
     BE_STREAM_TO_UINT16 (evt_data.hdr.mdl_id, p);
     reject_opcode = evt_data.hdr.op_code+1;
 
-    MCA_TRACE_DEBUG1 ("received mdl id: %d ", evt_data.hdr.mdl_id);
+    MCA_TRACE_DEBUG ("received mdl id: %d ", evt_data.hdr.mdl_id);
     if (p_ccb->status == MCA_CCB_STAT_PENDING)
     {
-        MCA_TRACE_DEBUG0 ("received req inpending state");
+        MCA_TRACE_DEBUG ("received req inpending state");
         /* allow abort in pending state */
         if ((p_ccb->status == MCA_CCB_STAT_PENDING) && (evt_data.hdr.op_code == MCA_OP_MDL_ABORT_REQ))
         {
@@ -299,17 +299,17 @@ void mca_ccb_hdl_req(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
     }
     else if (p_ccb->p_rx_msg)
     {
-        MCA_TRACE_DEBUG0 ("still handling prev req");
+        MCA_TRACE_DEBUG ("still handling prev req");
         /* still holding previous message, reject this new one ?? */
 
     }
     else if (p_ccb->p_tx_req)
     {
-        MCA_TRACE_DEBUG1 ("still waiting for a response ctrl_vpsm:0x%x", p_ccb->ctrl_vpsm);
+        MCA_TRACE_DEBUG ("still waiting for a response ctrl_vpsm:0x%x", p_ccb->ctrl_vpsm);
         /* sent a request; waiting for response */
         if (p_ccb->ctrl_vpsm == 0)
         {
-            MCA_TRACE_DEBUG0 ("local is ACP. accept the cmd from INT");
+            MCA_TRACE_DEBUG ("local is ACP. accept the cmd from INT");
             /* local is acceptor, need to handle the request */
             check_req = TRUE;
             reject_code = MCA_RSP_SUCCESS;
@@ -366,12 +366,12 @@ void mca_ccb_hdl_req(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
                     p_rx_msg->mdep_id = evt_data.create_ind.dep_id;
                     if (!mca_is_valid_dep_id(p_ccb->p_rcb, p_rx_msg->mdep_id))
                     {
-                        MCA_TRACE_ERROR0 ("not a valid local mdep id");
+                        MCA_TRACE_ERROR ("not a valid local mdep id");
                         reject_code = MCA_RSP_BAD_MDEP;
                     }
                     else if (mca_ccb_uses_mdl_id(p_ccb, evt_data.hdr.mdl_id))
                     {
-                        MCA_TRACE_DEBUG0 ("the mdl_id is currently used in the CL(create)");
+                        MCA_TRACE_DEBUG ("the mdl_id is currently used in the CL(create)");
                         mca_dcb_close_by_mdl_id(p_ccb, evt_data.hdr.mdl_id);
                     }
                     else
@@ -379,7 +379,7 @@ void mca_ccb_hdl_req(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
                         /* check if this dep still have MDL available */
                         if (mca_dep_free_mdl(p_ccb, evt_data.create_ind.dep_id) == 0)
                         {
-                            MCA_TRACE_ERROR0 ("the mdep is currently using max_mdl");
+                            MCA_TRACE_ERROR ("the mdep is currently using max_mdl");
                             reject_code = MCA_RSP_MDEP_BUSY;
                         }
                     }
@@ -388,7 +388,7 @@ void mca_ccb_hdl_req(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
                 case MCA_OP_MDL_RECONNECT_REQ:
                     if (mca_ccb_uses_mdl_id(p_ccb, evt_data.hdr.mdl_id))
                     {
-                        MCA_TRACE_ERROR0 ("the mdl_id is currently used in the CL(reconn)");
+                        MCA_TRACE_ERROR ("the mdl_id is currently used in the CL(reconn)");
                         reject_code = MCA_RSP_MDL_BUSY;
                     }
                     break;
@@ -494,7 +494,7 @@ void mca_ccb_hdl_rsp(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
                 {
                     if (evt_data.hdr.mdl_id != p_dcb->mdl_id)
                     {
-                        MCA_TRACE_ERROR2 ("peer's mdl_id=%d != our mdl_id=%d", evt_data.hdr.mdl_id, p_dcb->mdl_id);
+                        MCA_TRACE_ERROR ("peer's mdl_id=%d != our mdl_id=%d", evt_data.hdr.mdl_id, p_dcb->mdl_id);
                         /* change the response code to be an error */
                         if (evt_data.rsp.rsp_code == MCA_RSP_SUCCESS)
                         {
@@ -544,7 +544,7 @@ void mca_ccb_hdl_rsp(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
     else
     {
         /* not expecting any response. drop it */
-        MCA_TRACE_WARNING0 ("dropping received rsp (not expecting a response)");
+        MCA_TRACE_WARNING ("dropping received rsp (not expecting a response)");
     }
     GKI_freebuf (p_data);
 }
diff --git a/stack/mcap/mca_csm.c b/stack/mcap/mca_csm.c
index af43bef9d..0077f350d 100644
--- a/stack/mcap/mca_csm.c
+++ b/stack/mcap/mca_csm.c
@@ -190,9 +190,9 @@ void mca_ccb_event(tMCA_CCB *p_ccb, UINT8 event, tMCA_CCB_EVT *p_data)
     UINT8              action;
 
 #if (BT_TRACE_VERBOSE == TRUE)
-    MCA_TRACE_EVENT3("CCB ccb=%d event=%s state=%s", mca_ccb_to_hdl(p_ccb), mca_ccb_evt_str[event], mca_ccb_st_str[p_ccb->state]);
+    MCA_TRACE_EVENT("CCB ccb=%d event=%s state=%s", mca_ccb_to_hdl(p_ccb), mca_ccb_evt_str[event], mca_ccb_st_str[p_ccb->state]);
 #else
-    MCA_TRACE_EVENT3("CCB ccb=%d event=%d state=%d", mca_ccb_to_hdl(p_ccb), event, p_ccb->state);
+    MCA_TRACE_EVENT("CCB ccb=%d event=%d state=%d", mca_ccb_to_hdl(p_ccb), event, p_ccb->state);
 #endif
 
     /* look up the state table for the current state */
@@ -260,7 +260,7 @@ tMCA_CCB *mca_ccb_alloc(tMCA_HANDLE handle, BD_ADDR bd_addr)
     tMCA_CCB *p_ccb_tmp;
     int       i;
 
-    MCA_TRACE_DEBUG1("mca_ccb_alloc handle:0x%x", handle);
+    MCA_TRACE_DEBUG("mca_ccb_alloc handle:0x%x", handle);
     if (p_rcb)
     {
         i = handle-1;
@@ -295,7 +295,7 @@ void mca_ccb_dealloc(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data)
 {
     tMCA_CTRL   evt_data;
 
-    MCA_TRACE_DEBUG1("mca_ccb_dealloc ctrl_vpsm:0x%x", p_ccb->ctrl_vpsm);
+    MCA_TRACE_DEBUG("mca_ccb_dealloc ctrl_vpsm:0x%x", p_ccb->ctrl_vpsm);
     mca_dcb_close_by_mdl_id (p_ccb, MCA_ALL_MDL_ID);
     if (p_ccb->ctrl_vpsm)
     {
diff --git a/stack/mcap/mca_dsm.c b/stack/mcap/mca_dsm.c
index 255b5d4c3..8b57a695f 100644
--- a/stack/mcap/mca_dsm.c
+++ b/stack/mcap/mca_dsm.c
@@ -142,9 +142,9 @@ void mca_dcb_event(tMCA_DCB *p_dcb, UINT8 event, tMCA_DCB_EVT *p_data)
     if (p_dcb == NULL)
         return;
 #if (BT_TRACE_VERBOSE == TRUE)
-    MCA_TRACE_EVENT3("DCB dcb=%d event=%s state=%s", mca_dcb_to_hdl(p_dcb), mca_dcb_evt_str[event], mca_dcb_st_str[p_dcb->state]);
+    MCA_TRACE_EVENT("DCB dcb=%d event=%s state=%s", mca_dcb_to_hdl(p_dcb), mca_dcb_evt_str[event], mca_dcb_st_str[p_dcb->state]);
 #else
-    MCA_TRACE_EVENT3("DCB dcb=%d event=%d state=%d", mca_dcb_to_hdl(p_dcb), event, p_dcb->state);
+    MCA_TRACE_EVENT("DCB dcb=%d event=%d state=%d", mca_dcb_to_hdl(p_dcb), event, p_dcb->state);
 #endif
 
     /* look up the state table for the current state */
@@ -238,7 +238,7 @@ UINT8 mca_dep_free_mdl(tMCA_CCB *p_ccb, tMCA_DEP dep)
     else
     {
         max = 0;
-        MCA_TRACE_WARNING0("Invalid Dep ID");
+        MCA_TRACE_WARNING("Invalid Dep ID");
     }
     left = max - count;
     return left;
@@ -259,7 +259,7 @@ void mca_dcb_dealloc(tMCA_DCB *p_dcb, tMCA_DCB_EVT *p_data)
     UINT8    event = MCA_CLOSE_IND_EVT;
     tMCA_CTRL   evt_data;
 
-    MCA_TRACE_DEBUG0("mca_dcb_dealloc");
+    MCA_TRACE_DEBUG("mca_dcb_dealloc");
     mca_free_buf ((void **)&p_dcb->p_data);
     if (p_data)
     {
@@ -325,7 +325,7 @@ void mca_dcb_close_by_mdl_id(tMCA_CCB*p_ccb, UINT16 mdl_id)
     tMCA_DCB *p_dcb;
     int       i;
 
-    MCA_TRACE_DEBUG1("mca_dcb_close_by_mdl_id mdl_id=%d", mdl_id);
+    MCA_TRACE_DEBUG("mca_dcb_close_by_mdl_id mdl_id=%d", mdl_id);
     i = mca_ccb_to_hdl(p_ccb)-1;
     p_dcb = &mca_cb.dcb[i*MCA_NUM_MDLS];
     for (i=0; i<MCA_NUM_MDLS; i++, p_dcb++)
diff --git a/stack/mcap/mca_l2c.c b/stack/mcap/mca_l2c.c
index d792bfcfc..fdd9d0936 100644
--- a/stack/mcap/mca_l2c.c
+++ b/stack/mcap/mca_l2c.c
@@ -78,11 +78,11 @@ static void mca_sec_check_complete_term (BD_ADDR bd_addr, tBT_TRANSPORT transpor
 
     UNUSED(transport);
 
-    MCA_TRACE_DEBUG1("mca_sec_check_complete_term res: %d", res);
+    MCA_TRACE_DEBUG("mca_sec_check_complete_term res: %d", res);
 
     if ( res == BTM_SUCCESS )
     {
-        MCA_TRACE_DEBUG2 ("lcid:x%x id:x%x", p_tbl->lcid, p_tbl->id);
+        MCA_TRACE_DEBUG ("lcid:x%x id:x%x", p_tbl->lcid, p_tbl->id);
         /* Set the FCR options: control channel mandates ERTM */
         ertm_info.preferred_mode    = mca_l2c_fcr_opts_def.mode;
         ertm_info.allowed_modes     = L2CAP_FCR_CHAN_OPT_ERTM;
@@ -124,7 +124,7 @@ static void mca_sec_check_complete_orig (BD_ADDR bd_addr, tBT_TRANSPORT transpor
     UNUSED(bd_addr);
     UNUSED(transport);
 
-    MCA_TRACE_DEBUG1("mca_sec_check_complete_orig res: %d", res);
+    MCA_TRACE_DEBUG("mca_sec_check_complete_orig res: %d", res);
 
     if ( res == BTM_SUCCESS )
     {
@@ -160,7 +160,7 @@ void mca_l2c_cconn_ind_cback(BD_ADDR bd_addr, UINT16 lcid, UINT16 psm, UINT8 id)
     tL2CAP_ERTM_INFO ertm_info, *p_ertm_info = NULL;
     tL2CAP_CFG_INFO  cfg;
 
-    MCA_TRACE_EVENT3 ("mca_l2c_cconn_ind_cback: lcid:x%x psm:x%x id:x%x", lcid, psm, id);
+    MCA_TRACE_EVENT ("mca_l2c_cconn_ind_cback: lcid:x%x psm:x%x id:x%x", lcid, psm, id);
 
     /* do we already have a control channel for this peer? */
     if ((p_ccb = mca_ccb_by_bd(handle, bd_addr)) == NULL)
@@ -237,7 +237,7 @@ void mca_l2c_dconn_ind_cback(BD_ADDR bd_addr, UINT16 lcid, UINT16 psm, UINT8 id)
     tL2CAP_ERTM_INFO *p_ertm_info = NULL, ertm_info;
     const tMCA_CHNL_CFG   *p_chnl_cfg;
 
-    MCA_TRACE_EVENT2 ("mca_l2c_dconn_ind_cback: lcid:x%x psm:x%x ", lcid, psm);
+    MCA_TRACE_EVENT ("mca_l2c_dconn_ind_cback: lcid:x%x psm:x%x ", lcid, psm);
 
     if (((p_ccb = mca_ccb_by_bd(handle, bd_addr)) != NULL) && /* find the CCB */
         (p_ccb->status == MCA_CCB_STAT_PENDING) &&  /* this CCB is expecting a MDL */
@@ -299,12 +299,12 @@ void mca_l2c_connect_cfm_cback(UINT16 lcid, UINT16 result)
     tL2CAP_CFG_INFO cfg;
     tMCA_CCB *p_ccb;
 
-    MCA_TRACE_DEBUG2("mca_l2c_connect_cfm_cback lcid: x%x, result: %d",
+    MCA_TRACE_DEBUG("mca_l2c_connect_cfm_cback lcid: x%x, result: %d",
                      lcid, result);
     /* look up info for this channel */
     if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
     {
-        MCA_TRACE_DEBUG2("p_tbl state: %d, tcid: %d", p_tbl->state, p_tbl->tcid);
+        MCA_TRACE_DEBUG("p_tbl state: %d, tcid: %d", p_tbl->state, p_tbl->tcid);
         /* if in correct state */
         if (p_tbl->state == MCA_TC_ST_CONN)
         {
@@ -426,7 +426,7 @@ void mca_l2c_config_ind_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
         {
             p_tbl->peer_mtu = L2CAP_DEFAULT_MTU;
         }
-        MCA_TRACE_DEBUG3("peer_mtu: %d, lcid: x%x mtu_present:%d",p_tbl->peer_mtu, lcid, p_cfg->mtu_present);
+        MCA_TRACE_DEBUG("peer_mtu: %d, lcid: x%x mtu_present:%d",p_tbl->peer_mtu, lcid, p_cfg->mtu_present);
 
         /* send L2CAP configure response */
         memset(p_cfg, 0, sizeof(tL2CAP_CFG_INFO));
@@ -463,7 +463,7 @@ void mca_l2c_disconnect_ind_cback(UINT16 lcid, BOOLEAN ack_needed)
     tMCA_TC_TBL    *p_tbl;
     UINT16         reason = L2CAP_DISC_TIMEOUT;
 
-    MCA_TRACE_DEBUG2("mca_l2c_disconnect_ind_cback lcid: %d, ack_needed: %d",
+    MCA_TRACE_DEBUG("mca_l2c_disconnect_ind_cback lcid: %d, ack_needed: %d",
                      lcid, ack_needed);
     /* look up info for this channel */
     if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
@@ -495,7 +495,7 @@ void mca_l2c_disconnect_cfm_cback(UINT16 lcid, UINT16 result)
 {
     tMCA_TC_TBL    *p_tbl;
 
-    MCA_TRACE_DEBUG2("mca_l2c_disconnect_cfm_cback lcid: x%x, result: %d",
+    MCA_TRACE_DEBUG("mca_l2c_disconnect_cfm_cback lcid: x%x, result: %d",
                      lcid, result);
     /* look up info for this channel */
     if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
diff --git a/stack/mcap/mca_main.c b/stack/mcap/mca_main.c
index d09319df5..60b99d9da 100644
--- a/stack/mcap/mca_main.c
+++ b/stack/mcap/mca_main.c
@@ -145,7 +145,7 @@ tMCA_TC_TBL * mca_tc_tbl_calloc(tMCA_CCB *p_ccb)
     p_tbl->state    = MCA_TC_ST_IDLE;
     p_tbl->lcid     = p_ccb->lcid;
     mca_cb.tc.lcid_tbl[p_ccb->lcid - L2CAP_BASE_APPL_CID] = i;
-    MCA_TRACE_DEBUG1("mca_tc_tbl_calloc cb_idx: %d", p_tbl->cb_idx);
+    MCA_TRACE_DEBUG("mca_tc_tbl_calloc cb_idx: %d", p_tbl->cb_idx);
 
     return p_tbl;
 }
@@ -186,7 +186,7 @@ tMCA_TC_TBL * mca_tc_tbl_dalloc(tMCA_DCB *p_dcb)
     p_tbl->state    = MCA_TC_ST_IDLE;
     p_tbl->lcid     = p_dcb->lcid;
     mca_cb.tc.lcid_tbl[p_dcb->lcid - L2CAP_BASE_APPL_CID] = i;
-    MCA_TRACE_DEBUG2("mca_tc_tbl_dalloc tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
+    MCA_TRACE_DEBUG("mca_tc_tbl_dalloc tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
 
     return p_tbl;
 }
@@ -303,7 +303,7 @@ void mca_tc_close_ind(tMCA_TC_TBL *p_tbl, UINT16 reason)
     close.reason = reason;
     close.lcid   = p_tbl->lcid;
 
-    MCA_TRACE_DEBUG3("mca_tc_close_ind tcid: %d, cb_idx:%d, old: %d",
+    MCA_TRACE_DEBUG("mca_tc_close_ind tcid: %d, cb_idx:%d, old: %d",
                      p_tbl->tcid, p_tbl->cb_idx, p_tbl->state);
 
     /* Check if the transport channel is in use */
@@ -352,7 +352,7 @@ void mca_tc_open_ind(tMCA_TC_TBL *p_tbl)
     tMCA_DCB   *p_dcb;
     tMCA_OPEN  open;
 
-    MCA_TRACE_DEBUG2("mca_tc_open_ind tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
+    MCA_TRACE_DEBUG("mca_tc_open_ind tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
     p_tbl->state = MCA_TC_ST_OPEN;
 
     open.peer_mtu = p_tbl->peer_mtu;
@@ -406,7 +406,7 @@ void mca_tc_cong_ind(tMCA_TC_TBL *p_tbl, BOOLEAN is_congested)
     tMCA_CCB   *p_ccb;
     tMCA_DCB   *p_dcb;
 
-    MCA_TRACE_DEBUG2("mca_tc_cong_ind tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
+    MCA_TRACE_DEBUG("mca_tc_cong_ind tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
     /* if control channel, notify ccb of congestion */
     if (p_tbl->tcid == MCA_CTRL_TCID)
     {
@@ -445,7 +445,7 @@ void mca_tc_data_ind(tMCA_TC_TBL *p_tbl, BT_HDR *p_buf)
     UINT8       *p;
     UINT8       rej_rsp_code = MCA_RSP_SUCCESS;
 
-    MCA_TRACE_DEBUG2("mca_tc_data_ind tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
+    MCA_TRACE_DEBUG("mca_tc_data_ind tcid: %d, cb_idx: %d", p_tbl->tcid, p_tbl->cb_idx);
 
 
     /* if control channel, handle control message */
@@ -463,19 +463,19 @@ void mca_tc_data_ind(tMCA_TC_TBL *p_tbl, BT_HDR *p_buf)
             {
                 if (p_buf->len != mca_std_msg_len[*p])
                 {
-                    MCA_TRACE_ERROR3 ("opcode: %d required len:%d, got len:%d", *p, mca_std_msg_len[*p], p_buf->len);
+                    MCA_TRACE_ERROR ("opcode: %d required len:%d, got len:%d", *p, mca_std_msg_len[*p], p_buf->len);
                     rej_rsp_code = MCA_RSP_BAD_PARAM;
                 }
             }
             else if ((*p >= MCA_FIRST_SYNC_OP) && (*p <= MCA_LAST_SYNC_OP))
             {
-                MCA_TRACE_ERROR2 ("unsupported SYNC opcode: %d len:%d", *p, p_buf->len);
+                MCA_TRACE_ERROR ("unsupported SYNC opcode: %d len:%d", *p, p_buf->len);
                 /* reject unsupported request */
                 rej_rsp_code = MCA_RSP_NO_SUPPORT;
             }
             else
             {
-                MCA_TRACE_ERROR2 ("bad opcode: %d len:%d", *p, p_buf->len);
+                MCA_TRACE_ERROR ("bad opcode: %d len:%d", *p, p_buf->len);
                 /* reject unsupported request */
                 rej_rsp_code = MCA_RSP_BAD_OPCODE;
             }
@@ -563,7 +563,7 @@ void mca_rcb_dealloc(tMCA_HANDLE handle)
             if (done)
             {
                 memset (p_rcb, 0, sizeof(tMCA_RCB));
-                MCA_TRACE_DEBUG1("Reset MCA_RCB index=%d",handle);
+                MCA_TRACE_DEBUG("Reset MCA_RCB index=%d",handle);
             }
         }
     }