Logging cleanup: A2D, AVDT, and AVCT.

Change-Id: I5a9d4bcdd65f6e965b434bf86949bba7155fd300

5 files changed, 63 insertions, 63 deletions

diff --git a/stack/avct/avct_api.c b/stack/avct/avct_api.c
index d590cb552..5b27cc879 100644
--- a/stack/avct/avct_api.c
+++ b/stack/avct/avct_api.c
@@ -56,7 +56,7 @@ void AVCT_Register(UINT16 mtu, UINT16 mtu_br, UINT8 sec_mask)
 {
     UNUSED(mtu_br);
 
-    AVCT_TRACE_API0("AVCT_Register");
+    AVCT_TRACE_API("AVCT_Register");
 
     /* register PSM with L2CAP */
     L2CA_Register(AVCT_PSM, (tL2CAP_APPL_INFO *) &avct_l2c_appl);
@@ -108,7 +108,7 @@ void AVCT_Register(UINT16 mtu, UINT16 mtu_br, UINT8 sec_mask)
 *******************************************************************************/
 void AVCT_Deregister(void)
 {
-    AVCT_TRACE_API0("AVCT_Deregister");
+    AVCT_TRACE_API("AVCT_Deregister");
 
     /* deregister PSM with L2CAP */
     L2CA_Deregister(AVCT_PSM);
@@ -136,7 +136,7 @@ UINT16 AVCT_CreateConn(UINT8 *p_handle, tAVCT_CC *p_cc, BD_ADDR peer_addr)
     tAVCT_CCB   *p_ccb;
     tAVCT_LCB   *p_lcb;
 
-    AVCT_TRACE_API2("AVCT_CreateConn: %d, control:%d", p_cc->role, p_cc->control);
+    AVCT_TRACE_API("AVCT_CreateConn: %d, control:%d", p_cc->role, p_cc->control);
 
     /* Allocate ccb; if no ccbs, return failure */
     if ((p_ccb = avct_ccb_alloc(p_cc)) == NULL)
@@ -172,7 +172,7 @@ UINT16 AVCT_CreateConn(UINT8 *p_handle, tAVCT_CC *p_cc, BD_ADDR peer_addr)
             {
                 /* bind lcb to ccb */
                 p_ccb->p_lcb = p_lcb;
-                AVCT_TRACE_DEBUG1("ch_state: %d", p_lcb->ch_state);
+                AVCT_TRACE_DEBUG("ch_state: %d", p_lcb->ch_state);
                 avct_lcb_event(p_lcb, AVCT_LCB_UL_BIND_EVT, (tAVCT_LCB_EVT *) &p_ccb);
             }
         }
@@ -198,7 +198,7 @@ UINT16 AVCT_RemoveConn(UINT8 handle)
     UINT16              result = AVCT_SUCCESS;
     tAVCT_CCB           *p_ccb;
 
-    AVCT_TRACE_API0("AVCT_RemoveConn");
+    AVCT_TRACE_API("AVCT_RemoveConn");
 
     /* map handle to ccb */
     if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
@@ -242,7 +242,7 @@ UINT16 AVCT_CreateBrowse (UINT8 handle, UINT8 role)
     tAVCT_BCB   *p_bcb;
     int         index;
 
-    AVCT_TRACE_API1("AVCT_CreateBrowse: %d", role);
+    AVCT_TRACE_API("AVCT_CreateBrowse: %d", role);
 
     /* map handle to ccb */
     if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
@@ -285,7 +285,7 @@ UINT16 AVCT_CreateBrowse (UINT8 handle, UINT8 role)
         {
             /* bind bcb to ccb */
             p_ccb->p_bcb = p_bcb;
-            AVCT_TRACE_DEBUG1("ch_state: %d", p_bcb->ch_state);
+            AVCT_TRACE_DEBUG("ch_state: %d", p_bcb->ch_state);
             avct_bcb_event(p_bcb, AVCT_LCB_UL_BIND_EVT, (tAVCT_LCB_EVT *) &p_ccb);
         }
     }
@@ -317,7 +317,7 @@ UINT16 AVCT_RemoveBrowse (UINT8 handle)
     UINT16              result = AVCT_SUCCESS;
     tAVCT_CCB           *p_ccb;
 
-    AVCT_TRACE_API0("AVCT_RemoveBrowse");
+    AVCT_TRACE_API("AVCT_RemoveBrowse");
 
     /* map handle to ccb */
     if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
@@ -416,14 +416,14 @@ UINT16 AVCT_MsgReq(UINT8 handle, UINT8 label, UINT8 cr, BT_HDR *p_msg)
     tAVCT_CCB       *p_ccb;
     tAVCT_UL_MSG    ul_msg;
 
-    AVCT_TRACE_API0("AVCT_MsgReq");
+    AVCT_TRACE_API("AVCT_MsgReq");
 
     /* verify p_msg parameter */
     if (p_msg == NULL)
     {
         return AVCT_NO_RESOURCES;
     }
-    AVCT_TRACE_API1("len: %d", p_msg->len);
+    AVCT_TRACE_API("len: %d", p_msg->len);
 
     /* map handle to ccb */
     if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
diff --git a/stack/avct/avct_ccb.c b/stack/avct/avct_ccb.c
index 09051b1b9..f2c821c13 100644
--- a/stack/avct/avct_ccb.c
+++ b/stack/avct/avct_ccb.c
@@ -50,7 +50,7 @@ tAVCT_CCB *avct_ccb_alloc(tAVCT_CC *p_cc)
         {
             p_ccb->allocated = AVCT_ALOC_LCB;
             memcpy(&p_ccb->cc, p_cc, sizeof(tAVCT_CC));
-            AVCT_TRACE_DEBUG1("avct_ccb_alloc %d", i);
+            AVCT_TRACE_DEBUG("avct_ccb_alloc %d", i);
             break;
         }
     }
@@ -59,7 +59,7 @@ tAVCT_CCB *avct_ccb_alloc(tAVCT_CC *p_cc)
     {
         /* out of ccbs */
         p_ccb = NULL;
-        AVCT_TRACE_WARNING0("Out of ccbs");
+        AVCT_TRACE_WARNING("Out of ccbs");
     }
     return p_ccb;
 }
@@ -79,7 +79,7 @@ void avct_ccb_dealloc(tAVCT_CCB *p_ccb, UINT8 event, UINT16 result, BD_ADDR bd_a
 {
     tAVCT_CTRL_CBACK    *p_cback = p_ccb->cc.p_ctrl_cback;
 
-    AVCT_TRACE_DEBUG1("avct_ccb_dealloc %d", avct_ccb_to_idx(p_ccb));
+    AVCT_TRACE_DEBUG("avct_ccb_dealloc %d", avct_ccb_to_idx(p_ccb));
 #if (AVCT_BROWSE_INCLUDED == TRUE)
     if(p_ccb->p_bcb == NULL)
         memset(p_ccb, 0, sizeof(tAVCT_CCB));
@@ -138,13 +138,13 @@ tAVCT_CCB *avct_ccb_by_idx(UINT8 idx)
         if (!p_ccb->allocated)
         {
             p_ccb = NULL;
-            AVCT_TRACE_WARNING1("ccb %d not allocated", idx);
+            AVCT_TRACE_WARNING("ccb %d not allocated", idx);
         }
     }
     else
     {
         p_ccb = NULL;
-        AVCT_TRACE_WARNING1("No ccb for idx %d", idx);
+        AVCT_TRACE_WARNING("No ccb for idx %d", idx);
     }
     return p_ccb;
 }
diff --git a/stack/avct/avct_l2c.c b/stack/avct/avct_l2c.c
index aabcd0e1c..bb01e89b0 100644
--- a/stack/avct/avct_l2c.c
+++ b/stack/avct/avct_l2c.c
@@ -80,7 +80,7 @@ static BOOLEAN avct_l2c_is_passive (tAVCT_LCB *p_lcb)
     {
         if (p_ccb->allocated && (p_ccb->p_lcb == p_lcb))
         {
-            AVCT_TRACE_DEBUG1("avct_l2c_is_ct control:x%x", p_ccb->cc.control);
+            AVCT_TRACE_DEBUG("avct_l2c_is_ct control:x%x", p_ccb->cc.control);
             if (p_ccb->cc.control & AVCT_PASSIVE)
             {
                 is_passive = TRUE;
@@ -130,13 +130,13 @@ void avct_l2c_connect_ind_cback(BD_ADDR bd_addr, UINT16 lcid, UINT16 psm, UINT8
         {
             /* TG role only - accept the connection from CT. move the channel ID to the conflict list */
             p_lcb->conflict_lcid = p_lcb->ch_lcid;
-            AVCT_TRACE_DEBUG1("avct_l2c_connect_ind_cback conflict_lcid:0x%x", p_lcb->conflict_lcid);
+            AVCT_TRACE_DEBUG("avct_l2c_connect_ind_cback conflict_lcid:0x%x", p_lcb->conflict_lcid);
         }
     }
 
     if(p_lcb)
     {
-        AVCT_TRACE_DEBUG3("avct_l2c_connect_ind_cback: 0x%x, res: %d, ch_state: %d",
+        AVCT_TRACE_DEBUG("avct_l2c_connect_ind_cback: 0x%x, res: %d, ch_state: %d",
             lcid, result, p_lcb->ch_state);
     }
     /* Send L2CAP connect rsp */
@@ -156,12 +156,12 @@ void avct_l2c_connect_ind_cback(BD_ADDR bd_addr, UINT16 lcid, UINT16 psm, UINT8
         cfg.mtu_present = TRUE;
         cfg.mtu = avct_cb.mtu;
         L2CA_ConfigReq(lcid, &cfg);
-        AVCT_TRACE_DEBUG0("avct_l2c snd Cfg Req");
+        AVCT_TRACE_DEBUG("avct_l2c snd Cfg Req");
     }
 
 #if (BT_USE_TRACES == TRUE)
     if(p_lcb)
-        AVCT_TRACE_DEBUG1("ch_state cni: %d ", p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("ch_state cni: %d ", p_lcb->ch_state);
 #endif
 }
 
@@ -183,7 +183,7 @@ void avct_l2c_connect_cfm_cback(UINT16 lcid, UINT16 result)
     /* look up lcb for this channel */
     if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
     {
-        AVCT_TRACE_DEBUG4("avct_l2c_connect_cfm_cback lcid:0x%x result: %d ch_state: %d, conflict_lcid:0x%x",
+        AVCT_TRACE_DEBUG("avct_l2c_connect_cfm_cback lcid:0x%x result: %d ch_state: %d, conflict_lcid:0x%x",
             lcid, result, p_lcb->ch_state, p_lcb->conflict_lcid);
         /* if in correct state */
         if (p_lcb->ch_state == AVCT_CH_CONN)
@@ -199,12 +199,12 @@ void avct_l2c_connect_cfm_cback(UINT16 lcid, UINT16 result)
                 cfg.mtu_present = TRUE;
                 cfg.mtu = avct_cb.mtu;
                 L2CA_ConfigReq(lcid, &cfg);
-                AVCT_TRACE_DEBUG0("avct_l2c snd Cfg Req");
+                AVCT_TRACE_DEBUG("avct_l2c snd Cfg Req");
             }
             /* else failure */
             else
             {
-                AVCT_TRACE_DEBUG1("avct_l2c_connect_cfm_cback conflict_lcid:0x%x", p_lcb->conflict_lcid);
+                AVCT_TRACE_DEBUG("avct_l2c_connect_cfm_cback conflict_lcid:0x%x", p_lcb->conflict_lcid);
                 if (p_lcb->conflict_lcid == lcid)
                     p_lcb->conflict_lcid = 0;
                 else
@@ -214,7 +214,7 @@ void avct_l2c_connect_cfm_cback(UINT16 lcid, UINT16 result)
         else if (p_lcb->conflict_lcid == lcid)
         {
             /* we must be in AVCT_CH_CFG state for the ch_lcid channel */
-            AVCT_TRACE_DEBUG2("avct_l2c_connect_cfm_cback ch_state: %d, conflict_lcid:0x%x", p_lcb->ch_state, p_lcb->conflict_lcid);
+            AVCT_TRACE_DEBUG("avct_l2c_connect_cfm_cback ch_state: %d, conflict_lcid:0x%x", p_lcb->ch_state, p_lcb->conflict_lcid);
             if (result == L2CAP_CONN_OK)
             {
                 /* just in case the peer also accepts our connection - Send L2CAP disconnect req */
@@ -222,7 +222,7 @@ void avct_l2c_connect_cfm_cback(UINT16 lcid, UINT16 result)
             }
             p_lcb->conflict_lcid = 0;
         }
-        AVCT_TRACE_DEBUG1("ch_state cnc: %d ", p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("ch_state cnc: %d ", p_lcb->ch_state);
     }
 }
 
@@ -243,7 +243,7 @@ void avct_l2c_config_cfm_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
     /* look up lcb for this channel */
     if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
     {
-        AVCT_TRACE_DEBUG3("avct_l2c_config_cfm_cback: 0x%x, ch_state: %d, res: %d",
+        AVCT_TRACE_DEBUG("avct_l2c_config_cfm_cback: 0x%x, ch_state: %d, res: %d",
             lcid, p_lcb->ch_state, p_cfg->result);
         /* if in correct state */
         if (p_lcb->ch_state == AVCT_CH_CFG)
@@ -264,7 +264,7 @@ void avct_l2c_config_cfm_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
             /* else failure */
             else
             {
-                AVCT_TRACE_DEBUG1("ERROR avct_l2c_config_cfm_cback L2CA_DisconnectReq %d ", p_lcb->ch_state);
+                AVCT_TRACE_DEBUG("ERROR avct_l2c_config_cfm_cback L2CA_DisconnectReq %d ", p_lcb->ch_state);
                 /* store result value */
                 p_lcb->ch_result = p_cfg->result;
 
@@ -272,7 +272,7 @@ void avct_l2c_config_cfm_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
                 L2CA_DisconnectReq(lcid);
             }
         }
-        AVCT_TRACE_DEBUG1("ch_state cfc: %d ", p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("ch_state cfc: %d ", p_lcb->ch_state);
     }
 }
 
@@ -293,7 +293,7 @@ void avct_l2c_config_ind_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
     /* look up lcb for this channel */
     if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
     {
-        AVCT_TRACE_DEBUG2("avct_l2c_config_ind_cback: 0x%x, ch_state: %d", lcid, p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("avct_l2c_config_ind_cback: 0x%x, ch_state: %d", lcid, p_lcb->ch_state);
         /* store the mtu in tbl */
         if (p_cfg->mtu_present)
         {
@@ -322,7 +322,7 @@ void avct_l2c_config_ind_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
                 avct_lcb_event(p_lcb, AVCT_LCB_LL_OPEN_EVT, NULL);
             }
         }
-        AVCT_TRACE_DEBUG1("ch_state cfi: %d ", p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("ch_state cfi: %d ", p_lcb->ch_state);
     }
 }
 
@@ -344,7 +344,7 @@ void avct_l2c_disconnect_ind_cback(UINT16 lcid, BOOLEAN ack_needed)
     /* look up lcb for this channel */
     if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
     {
-        AVCT_TRACE_DEBUG2("avct_l2c_disconnect_ind_cback: 0x%x, ch_state: %d", lcid, p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("avct_l2c_disconnect_ind_cback: 0x%x, ch_state: %d", lcid, p_lcb->ch_state);
         if (ack_needed)
         {
             /* send L2CAP disconnect response */
@@ -352,7 +352,7 @@ void avct_l2c_disconnect_ind_cback(UINT16 lcid, BOOLEAN ack_needed)
         }
 
         avct_lcb_event(p_lcb, AVCT_LCB_LL_CLOSE_EVT, (tAVCT_LCB_EVT *) &result);
-        AVCT_TRACE_DEBUG1("ch_state di: %d ", p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("ch_state di: %d ", p_lcb->ch_state);
     }
 }
 
@@ -374,14 +374,14 @@ void avct_l2c_disconnect_cfm_cback(UINT16 lcid, UINT16 result)
     /* look up lcb for this channel */
     if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
     {
-        AVCT_TRACE_DEBUG3("avct_l2c_disconnect_cfm_cback: 0x%x, ch_state: %d, res: %d",
+        AVCT_TRACE_DEBUG("avct_l2c_disconnect_cfm_cback: 0x%x, ch_state: %d, res: %d",
             lcid, p_lcb->ch_state, result);
         /* result value may be previously stored */
         res = (p_lcb->ch_result != 0) ? p_lcb->ch_result : result;
         p_lcb->ch_result = 0;
 
         avct_lcb_event(p_lcb, AVCT_LCB_LL_CLOSE_EVT, (tAVCT_LCB_EVT *) &res);
-        AVCT_TRACE_DEBUG1("ch_state dc: %d ", p_lcb->ch_state);
+        AVCT_TRACE_DEBUG("ch_state dc: %d ", p_lcb->ch_state);
     }
 }
 
@@ -399,7 +399,7 @@ void avct_l2c_congestion_ind_cback(UINT16 lcid, BOOLEAN is_congested)
 {
     tAVCT_LCB       *p_lcb;
 
-    AVCT_TRACE_DEBUG1("avct_l2c_congestion_ind_cback: 0x%x", lcid);
+    AVCT_TRACE_DEBUG("avct_l2c_congestion_ind_cback: 0x%x", lcid);
     /* look up lcb for this channel */
     if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
     {
@@ -421,7 +421,7 @@ void avct_l2c_data_ind_cback(UINT16 lcid, BT_HDR *p_buf)
 {
     tAVCT_LCB       *p_lcb;
 
-    AVCT_TRACE_DEBUG1("avct_l2c_data_ind_cback: 0x%x", lcid);
+    AVCT_TRACE_DEBUG("avct_l2c_data_ind_cback: 0x%x", lcid);
     /* look up lcb for this channel */
     if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
     {
@@ -429,7 +429,7 @@ void avct_l2c_data_ind_cback(UINT16 lcid, BT_HDR *p_buf)
     }
     else /* prevent buffer leak */
     {
-        AVCT_TRACE_WARNING0("ERROR -> avct_l2c_data_ind_cback drop buffer");
+        AVCT_TRACE_WARNING("ERROR -> avct_l2c_data_ind_cback drop buffer");
         GKI_freebuf(p_buf);
     }
 }
diff --git a/stack/avct/avct_lcb.c b/stack/avct/avct_lcb.c
index 6bc7e51e1..6c8fd2e74 100644
--- a/stack/avct/avct_lcb.c
+++ b/stack/avct/avct_lcb.c
@@ -198,9 +198,9 @@ void avct_lcb_event(tAVCT_LCB *p_lcb, UINT8 event, tAVCT_LCB_EVT *p_data)
     int                 i;
 
 #if BT_TRACE_VERBOSE == TRUE
-    AVCT_TRACE_EVENT3("LCB lcb=%d event=%s state=%s", p_lcb->allocated, avct_lcb_evt_str[event], avct_lcb_st_str[p_lcb->state]);
+    AVCT_TRACE_EVENT("LCB lcb=%d event=%s state=%s", p_lcb->allocated, avct_lcb_evt_str[event], avct_lcb_st_str[p_lcb->state]);
 #else
-    AVCT_TRACE_EVENT3("LCB lcb=%d event=%d state=%d", p_lcb->allocated, event, p_lcb->state);
+    AVCT_TRACE_EVENT("LCB lcb=%d event=%d state=%d", p_lcb->allocated, event, p_lcb->state);
 #endif
 
     /* look up the state table for the current state */
@@ -241,9 +241,9 @@ void avct_bcb_event(tAVCT_BCB *p_bcb, UINT8 event, tAVCT_LCB_EVT *p_data)
     int                 i;
 
 #if BT_TRACE_VERBOSE == TRUE
-    AVCT_TRACE_EVENT3("BCB lcb=%d event=%s state=%s", p_bcb->allocated, avct_lcb_evt_str[event], avct_lcb_st_str[p_bcb->state]);
+    AVCT_TRACE_EVENT("BCB lcb=%d event=%s state=%s", p_bcb->allocated, avct_lcb_evt_str[event], avct_lcb_st_str[p_bcb->state]);
 #else
-    AVCT_TRACE_EVENT3("BCB lcb=%d event=%d state=%d", p_bcb->allocated, event, p_bcb->state);
+    AVCT_TRACE_EVENT("BCB lcb=%d event=%d state=%d", p_bcb->allocated, event, p_bcb->state);
 #endif
 
     /* look up the state table for the current state */
@@ -296,7 +296,7 @@ tAVCT_LCB *avct_lcb_by_bd(BD_ADDR bd_addr)
         /* if no lcb found */
         p_lcb = NULL;
 
-        AVCT_TRACE_DEBUG6("No lcb for addr %02x-%02x-%02x-%02x-%02x-%02x",
+        AVCT_TRACE_DEBUG("No lcb for addr %02x-%02x-%02x-%02x-%02x-%02x",
                           bd_addr[0], bd_addr[1], bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5]);
     }
     return p_lcb;
@@ -323,7 +323,7 @@ tAVCT_LCB *avct_lcb_alloc(BD_ADDR bd_addr)
         {
             p_lcb->allocated = (UINT8)(i + 1);
             memcpy(p_lcb->peer_addr, bd_addr, BD_ADDR_LEN);
-            AVCT_TRACE_DEBUG1("avct_lcb_alloc %d", p_lcb->allocated);
+            AVCT_TRACE_DEBUG("avct_lcb_alloc %d", p_lcb->allocated);
             break;
         }
     }
@@ -332,7 +332,7 @@ tAVCT_LCB *avct_lcb_alloc(BD_ADDR bd_addr)
     {
         /* out of lcbs */
         p_lcb = NULL;
-        AVCT_TRACE_WARNING0("Out of lcbs");
+        AVCT_TRACE_WARNING("Out of lcbs");
     }
     return p_lcb;
 }
@@ -354,7 +354,7 @@ void avct_lcb_dealloc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
     int         i;
     UNUSED(p_data);
 
-    AVCT_TRACE_DEBUG1("avct_lcb_dealloc %d", p_lcb->allocated);
+    AVCT_TRACE_DEBUG("avct_lcb_dealloc %d", p_lcb->allocated);
 
     for (i = 0; i < AVCT_NUM_CONN; i++, p_ccb++)
     {
@@ -363,7 +363,7 @@ void avct_lcb_dealloc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
         {
             if (p_ccb->p_lcb == p_lcb)
             {
-                AVCT_TRACE_DEBUG1("avct_lcb_dealloc used by ccb: %d", i);
+                AVCT_TRACE_DEBUG("avct_lcb_dealloc used by ccb: %d", i);
                 found = TRUE;
                 break;
             }
@@ -372,7 +372,7 @@ void avct_lcb_dealloc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 
     if (!found)
     {
-        AVCT_TRACE_DEBUG0("avct_lcb_dealloc now");
+        AVCT_TRACE_DEBUG("avct_lcb_dealloc now");
 
         /* clear reassembled msg buffer if in use */
         if (p_lcb->p_rx_msg != NULL)
@@ -410,7 +410,7 @@ tAVCT_LCB *avct_lcb_by_lcid(UINT16 lcid)
     {
         /* out of lcbs */
         p_lcb = NULL;
-        AVCT_TRACE_WARNING1("No lcb for lcid %x", lcid);
+        AVCT_TRACE_WARNING("No lcb for lcid %x", lcid);
     }
 
     return p_lcb;
@@ -456,10 +456,10 @@ BOOLEAN avct_lcb_last_ccb(tAVCT_LCB *p_lcb, tAVCT_CCB *p_ccb_last)
     tAVCT_CCB   *p_ccb = &avct_cb.ccb[0];
     int         i;
 
-    AVCT_TRACE_WARNING0("avct_lcb_last_ccb");
+    AVCT_TRACE_WARNING("avct_lcb_last_ccb");
     for (i = 0; i < AVCT_NUM_CONN; i++, p_ccb++)
     {
-        AVCT_TRACE_WARNING6("%x: aloc:%d, lcb:0x%x/0x%x, ccb:0x%x/0x%x",
+        AVCT_TRACE_WARNING("%x: aloc:%d, lcb:0x%x/0x%x, ccb:0x%x/0x%x",
             i, p_ccb->allocated, p_ccb->p_lcb, p_lcb, p_ccb, p_ccb_last);
         if (p_ccb->allocated && (p_ccb->p_lcb == p_lcb) && (p_ccb != p_ccb_last))
         {
diff --git a/stack/avct/avct_lcb_act.c b/stack/avct/avct_lcb_act.c
index 2fc92173e..17d5d3d30 100644
--- a/stack/avct/avct_lcb_act.c
+++ b/stack/avct/avct_lcb_act.c
@@ -65,7 +65,7 @@ static BT_HDR *avct_lcb_msg_asmbl(tAVCT_LCB *p_lcb, BT_HDR *p_buf)
     if (p_buf->len < avct_lcb_pkt_type_len[pkt_type])
     {
         GKI_freebuf(p_buf);
-        AVCT_TRACE_WARNING0("Bad length during reassembly");
+        AVCT_TRACE_WARNING("Bad length during reassembly");
         p_ret = NULL;
     }
     /* single packet */
@@ -76,7 +76,7 @@ static BT_HDR *avct_lcb_msg_asmbl(tAVCT_LCB *p_lcb, BT_HDR *p_buf)
         {
             GKI_freebuf(p_lcb->p_rx_msg);
             p_lcb->p_rx_msg = NULL;
-            AVCT_TRACE_WARNING0("Got single during reassembly");
+            AVCT_TRACE_WARNING("Got single during reassembly");
         }
         p_ret = p_buf;
     }
@@ -87,7 +87,7 @@ static BT_HDR *avct_lcb_msg_asmbl(tAVCT_LCB *p_lcb, BT_HDR *p_buf)
         if (p_lcb->p_rx_msg != NULL)
         {
             GKI_freebuf(p_lcb->p_rx_msg);
-            AVCT_TRACE_WARNING0("Got start during reassembly");
+            AVCT_TRACE_WARNING("Got start during reassembly");
         }
         p_lcb->p_rx_msg = p_buf;
 
@@ -109,7 +109,7 @@ static BT_HDR *avct_lcb_msg_asmbl(tAVCT_LCB *p_lcb, BT_HDR *p_buf)
         if (p_lcb->p_rx_msg == NULL)
         {
             GKI_freebuf(p_buf);
-            AVCT_TRACE_WARNING1("Pkt type=%d out of order", pkt_type);
+            AVCT_TRACE_WARNING("Pkt type=%d out of order", pkt_type);
             p_ret = NULL;
         }
         else
@@ -129,7 +129,7 @@ static BT_HDR *avct_lcb_msg_asmbl(tAVCT_LCB *p_lcb, BT_HDR *p_buf)
                 p_lcb->p_rx_msg = NULL;
                 GKI_freebuf(p_buf);
                 p_ret = NULL;
-                AVCT_TRACE_WARNING0("Fragmented message to big!");
+                AVCT_TRACE_WARNING("Fragmented message to big!");
             }
             else
             {
@@ -392,19 +392,19 @@ void avct_lcb_bind_conn(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 *******************************************************************************/
 void avct_lcb_chk_disc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 {
-    AVCT_TRACE_WARNING0("avct_lcb_chk_disc");
+    AVCT_TRACE_WARNING("avct_lcb_chk_disc");
 #if (AVCT_BROWSE_INCLUDED == TRUE)
     avct_close_bcb(p_lcb, p_data);
 #endif
     if (avct_lcb_last_ccb(p_lcb, p_data->p_ccb))
     {
-        AVCT_TRACE_WARNING0("closing");
+        AVCT_TRACE_WARNING("closing");
         p_data->p_ccb->ch_close = TRUE;
         avct_lcb_event(p_lcb, AVCT_LCB_INT_CLOSE_EVT, p_data);
     }
     else
     {
-        AVCT_TRACE_WARNING0("dealloc ccb");
+        AVCT_TRACE_WARNING("dealloc ccb");
         avct_lcb_unbind_disc(p_lcb, p_data);
     }
 }
@@ -499,7 +499,7 @@ void avct_lcb_discard_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 {
     UNUSED(p_lcb);
 
-    AVCT_TRACE_WARNING0("Dropping msg");
+    AVCT_TRACE_WARNING("Dropping msg");
 
     GKI_freebuf(p_data->ul_msg.p_buf);
 }
@@ -556,7 +556,7 @@ void avct_lcb_send_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
             if ((p_buf = (BT_HDR *) GKI_getbuf(buf_size)) == NULL)
             {
                 /* whoops; free original msg buf and bail */
-                AVCT_TRACE_ERROR0 ("avct_lcb_send_msg cannot alloc buffer!!");
+                AVCT_TRACE_ERROR ("avct_lcb_send_msg cannot alloc buffer!!");
                 GKI_freebuf(p_data->ul_msg.p_buf);
                 break;
             }
@@ -618,7 +618,7 @@ void avct_lcb_send_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
             pkt_type = AVCT_PKT_TYPE_END;
         }
     }
-    AVCT_TRACE_DEBUG1 ("avct_lcb_send_msg tx_q_count:%d", p_lcb->tx_q.count);
+    AVCT_TRACE_DEBUG ("avct_lcb_send_msg tx_q_count:%d", p_lcb->tx_q.count);
     return;
 }
 
@@ -678,7 +678,7 @@ void avct_lcb_msg_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
     /* check for invalid cr_ipid */
     if (cr_ipid == AVCT_CR_IPID_INVALID)
     {
-        AVCT_TRACE_WARNING1("Invalid cr_ipid", cr_ipid);
+        AVCT_TRACE_WARNING("Invalid cr_ipid", cr_ipid);
         GKI_freebuf(p_data->p_buf);
         return;
     }
@@ -695,7 +695,7 @@ void avct_lcb_msg_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
     else
     {
         /* PID not found; drop message */
-        AVCT_TRACE_WARNING1("No ccb for PID=%x", pid);
+        AVCT_TRACE_WARNING("No ccb for PID=%x", pid);
         GKI_freebuf(p_data->p_buf);
 
         /* if command send reject */