summaryrefslogtreecommitdiffstats
path: root/stack/avdt/avdt_scb_act.c
diff options
context:
space:
mode:
Diffstat (limited to 'stack/avdt/avdt_scb_act.c')
-rw-r--r--stack/avdt/avdt_scb_act.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/stack/avdt/avdt_scb_act.c b/stack/avdt/avdt_scb_act.c
index 87cc61f4b..73c2d9b49 100644
--- a/stack/avdt/avdt_scb_act.c
+++ b/stack/avdt/avdt_scb_act.c
@@ -285,7 +285,7 @@ void avdt_scb_hdl_pkt_no_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
/* do sanity check */
if ((offset > p_data->p_pkt->len) || ((pad_len + offset) > p_data->p_pkt->len))
{
- AVDT_TRACE_WARNING0("Got bad media packet");
+ AVDT_TRACE_WARNING("Got bad media packet");
GKI_freebuf(p_data->p_pkt);
}
/* adjust offset and length and send it up */
@@ -340,7 +340,7 @@ UINT8 * avdt_scb_hdl_report(tAVDT_SCB *p_scb, UINT8 *p, UINT16 len)
AVDT_REPORT_TYPE pt;
tAVDT_REPORT_DATA report, *p_rpt;
- AVDT_TRACE_DEBUG0( "avdt_scb_hdl_report");
+ AVDT_TRACE_DEBUG( "avdt_scb_hdl_report");
if(p_scb->cs.p_report_cback)
{
p_rpt = &report;
@@ -377,14 +377,14 @@ UINT8 * avdt_scb_hdl_report(tAVDT_SCB *p_scb, UINT8 *p, UINT16 len)
}
else
{
- AVDT_TRACE_WARNING5( " - SDES SSRC=0x%08x sc=%d %d len=%d %s",
+ AVDT_TRACE_WARNING( " - SDES SSRC=0x%08x sc=%d %d len=%d %s",
ssrc, o_cc, *p, *(p+1), p+2);
result = AVDT_BUSY;
}
break;
default:
- AVDT_TRACE_ERROR1( "Bad Report pkt - packet type: %d", pt);
+ AVDT_TRACE_ERROR( "Bad Report pkt - packet type: %d", pt);
result = AVDT_BAD_PARAMS;
}
@@ -435,7 +435,7 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
{
if (p_end - p < 4) /* length check. maximum length of AL header = 4 */
{
- AVDT_TRACE_WARNING2("p_end: 0x%x - p:0x%x < 4", p_end, p);
+ AVDT_TRACE_WARNING("p_end: 0x%x - p:0x%x < 4", p_end, p);
break;
}
@@ -485,14 +485,14 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
else
#endif
{
- AVDT_TRACE_WARNING2("bad tsid: %d, mux_tsid_media:%d", al_tsid, p_scb->curr_cfg.mux_tsid_media);
+ AVDT_TRACE_WARNING("bad tsid: %d, mux_tsid_media:%d", al_tsid, p_scb->curr_cfg.mux_tsid_media);
break;
}
}
/* check are buffer for assembling and related callback set */
else if ((p_scb->p_media_buf == NULL) || (p_scb->cs.p_media_cback == NULL))
{
- AVDT_TRACE_WARNING0("NULL p_media_buf or p_media_cback");
+ AVDT_TRACE_WARNING("NULL p_media_buf or p_media_cback");
break;
}
@@ -500,7 +500,7 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
/* it is media fragment beginning */
if(!al_frag) /* is it first fragment of original media packet */
{
- AVDT_TRACE_DEBUG2("al:%d media:%d",
+ AVDT_TRACE_DEBUG("al:%d media:%d",
al_len, p_scb->media_buf_len);
p_scb->frag_off = 0;
@@ -508,31 +508,31 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
/* length check: minimum length of media header is 12 */
if (p_scb->frag_org_len < 12)
{
- AVDT_TRACE_WARNING1("bad al_len: %d(<12)", al_len);
+ AVDT_TRACE_WARNING("bad al_len: %d(<12)", al_len);
break;
}
/* check that data fit into buffer */
if (al_len > p_scb->media_buf_len)
{
- AVDT_TRACE_WARNING2("bad al_len: %d(>%d)", al_len, p_scb->media_buf_len);
+ AVDT_TRACE_WARNING("bad al_len: %d(>%d)", al_len, p_scb->media_buf_len);
break;
}
/* make sure it is the last fragment in l2cap packet */
if (p + al_len < p_end)
{
- AVDT_TRACE_WARNING2("bad al_len: %d(>%d)", al_len, p_scb->media_buf_len);
+ AVDT_TRACE_WARNING("bad al_len: %d(>%d)", al_len, p_scb->media_buf_len);
break;
}
}
else
{
- AVDT_TRACE_DEBUG4("al:%d media:%d frag_org_len:%d frag_off:%d",
+ AVDT_TRACE_DEBUG("al:%d media:%d frag_org_len:%d frag_off:%d",
al_len, p_scb->media_buf_len, p_scb->frag_org_len, p_scb->frag_off);
/* check that remaining length from AL header equals to original len - length of already received fragments */
if(al_len != p_scb->frag_org_len - p_scb->frag_off)
{
- AVDT_TRACE_WARNING4("al_len:%d != (frag_org_len:%d - frag_off:%d) %d",
+ AVDT_TRACE_WARNING("al_len:%d != (frag_org_len:%d - frag_off:%d) %d",
al_len, p_scb->frag_org_len, p_scb->frag_off,
(p_scb->frag_org_len- p_scb->frag_off));
break;
@@ -541,19 +541,19 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
/* do sanity check */
if (p_scb->frag_off == 0)
{
- AVDT_TRACE_WARNING0("frag_off=0");
+ AVDT_TRACE_WARNING("frag_off=0");
break;
}
}
/* do common sanity check */
if((p_scb->frag_org_len <= p_scb->frag_off) || (p_scb->frag_org_len >= p_scb->media_buf_len))
{
- AVDT_TRACE_WARNING3("common sanity frag_off:%d frag_org_len:%d media_buf_len:%d",
+ AVDT_TRACE_WARNING("common sanity frag_off:%d frag_org_len:%d media_buf_len:%d",
p_scb->frag_off, p_scb->frag_org_len, p_scb->media_buf_len);
break;
}
- AVDT_TRACE_DEBUG4("Received fragment org_len=%d off=%d al_len=%d frag_len=%d",
+ AVDT_TRACE_DEBUG("Received fragment org_len=%d off=%d al_len=%d frag_len=%d",
p_scb->frag_org_len, p_scb->frag_off, al_len, frag_len);
/* copy fragment into buffer */
@@ -581,7 +581,7 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
{
if(p_scb->p_media_buf + p_scb->frag_off - p_payload < 4)
{
- AVDT_TRACE_WARNING3("length check frag_off:%d p_media_buf:%d p_payload:%d",
+ AVDT_TRACE_WARNING("length check frag_off:%d p_media_buf:%d p_payload:%d",
p_scb->frag_off, p_scb->p_media_buf, p_payload);
break;/* length check */
}
@@ -592,7 +592,7 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
if(p_payload >= p_scb->p_media_buf + p_scb->frag_off)
{
- AVDT_TRACE_WARNING3("length check2 frag_off:%d p_media_buf:%d p_payload:%d",
+ AVDT_TRACE_WARNING("length check2 frag_off:%d p_media_buf:%d p_payload:%d",
p_scb->frag_off, p_scb->p_media_buf, p_payload);
break;/* length check */
}
@@ -608,7 +608,7 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
/* payload length */
payload_len = (UINT32)(p_scb->p_media_buf + p_scb->frag_off - pad_len - p_payload);
- AVDT_TRACE_DEBUG2("Received last fragment header=%d len=%d",
+ AVDT_TRACE_DEBUG("Received last fragment header=%d len=%d",
p_payload - p_scb->p_media_buf,payload_len);
/* send total media packet up */
@@ -622,7 +622,7 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
if(p < p_end)
{
- AVDT_TRACE_WARNING0("*** Got bad media packet");
+ AVDT_TRACE_WARNING("*** Got bad media packet");
}
GKI_freebuf(p_data->p_pkt);
}
@@ -678,7 +678,7 @@ void avdt_scb_drop_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
UNUSED(p_scb);
GKI_freebuf(p_data->p_pkt);
- AVDT_TRACE_ERROR0(" avdt_scb_drop_pkt Dropped incoming media packet");
+ AVDT_TRACE_ERROR(" avdt_scb_drop_pkt Dropped incoming media packet");
}
/*******************************************************************************
@@ -1153,7 +1153,7 @@ void avdt_scb_hdl_tc_open(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
event = (p_scb->role == AVDT_OPEN_INT) ? AVDT_OPEN_CFM_EVT : AVDT_OPEN_IND_EVT;
p_data->open.hdr.err_code = 0;
- AVDT_TRACE_DEBUG3("psc_mask: cfg: 0x%x, req:0x%x, cur: 0x%x",
+ AVDT_TRACE_DEBUG("psc_mask: cfg: 0x%x, req:0x%x, cur: 0x%x",
p_scb->cs.cfg.psc_mask, p_scb->req_cfg.psc_mask, p_scb->curr_cfg.psc_mask);
#if AVDT_REPORTING == TRUE
if(p_scb->curr_cfg.psc_mask & AVDT_PSC_REPORT)
@@ -1223,7 +1223,7 @@ void avdt_scb_hdl_write_req_no_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
GKI_freebuf(p_scb->p_pkt);
/* this shouldn't be happening */
- AVDT_TRACE_WARNING0("Dropped media packet; congested");
+ AVDT_TRACE_WARNING("Dropped media packet; congested");
}
/* build a media packet */
@@ -1274,7 +1274,7 @@ void avdt_scb_hdl_write_req_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
GKI_freebuf(p_frag);
/* this shouldn't be happening */
- AVDT_TRACE_WARNING0("*** Dropped media packet; congested");
+ AVDT_TRACE_WARNING("*** Dropped media packet; congested");
}
/* build a media fragments */
@@ -1422,7 +1422,7 @@ void avdt_scb_snd_stream_close(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
#if AVDT_MULTIPLEXING == TRUE
BT_HDR *p_frag;
- AVDT_TRACE_WARNING2("avdt_scb_snd_stream_close c:%d, off:%d",
+ AVDT_TRACE_WARNING("avdt_scb_snd_stream_close c:%d, off:%d",
p_scb->frag_q.count, p_scb->frag_off);
/* clean fragments queue */
while((p_frag = (BT_HDR*)GKI_dequeue (&p_scb->frag_q)) != NULL)
@@ -1872,7 +1872,7 @@ void avdt_scb_free_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
GKI_freebuf(p_frag);
#endif
- AVDT_TRACE_WARNING0("Dropped media packet");
+ AVDT_TRACE_WARNING("Dropped media packet");
/* we need to call callback to keep data flow going */
(*p_scb->cs.p_ctrl_cback)(avdt_scb_to_hdl(p_scb), NULL, AVDT_WRITE_CFM_EVT,
@@ -1917,7 +1917,7 @@ void avdt_scb_clr_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
GKI_freebuf(p_scb->p_pkt);
p_scb->p_pkt = NULL;
- AVDT_TRACE_DEBUG0("Dropped stored media packet");
+ AVDT_TRACE_DEBUG("Dropped stored media packet");
/* we need to call callback to keep data flow going */
(*p_scb->cs.p_ctrl_cback)(avdt_scb_to_hdl(p_scb), NULL, AVDT_WRITE_CFM_EVT,
@@ -1926,7 +1926,7 @@ void avdt_scb_clr_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
#if AVDT_MULTIPLEXING == TRUE
else if(!GKI_queue_is_empty (&p_scb->frag_q))
{
- AVDT_TRACE_DEBUG0("Dropped fragments queue");
+ AVDT_TRACE_DEBUG("Dropped fragments queue");
/* clean fragments queue */
while((p_frag = (BT_HDR*)GKI_dequeue (&p_scb->frag_q)) != NULL)
GKI_freebuf(p_frag);
@@ -1980,24 +1980,24 @@ void avdt_scb_chk_snd_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
else
{
#if 0
- AVDT_TRACE_DEBUG1("num_q=%d",
+ AVDT_TRACE_DEBUG("num_q=%d",
L2CA_FlushChannel(avdt_cb.ad.rt_tbl[avdt_ccb_to_idx(p_scb->p_ccb)][avdt_ad_type_to_tcid(AVDT_CHAN_MEDIA, p_scb)].lcid),
L2CAP_FLUSH_CHANS_GET);
#endif
while((p_pkt = (BT_HDR*)GKI_dequeue (&p_scb->frag_q)) != NULL)
{
sent = TRUE;
- AVDT_TRACE_DEBUG1("Send fragment len=%d",p_pkt->len);
+ AVDT_TRACE_DEBUG("Send fragment len=%d",p_pkt->len);
/* fragments queue contains fragment to send */
res = avdt_ad_write_req(AVDT_CHAN_MEDIA, p_scb->p_ccb, p_scb, p_pkt);
if(AVDT_AD_CONGESTED == res)
{
p_scb->cong = TRUE;
- AVDT_TRACE_DEBUG0("avdt/l2c congested!!");
+ AVDT_TRACE_DEBUG("avdt/l2c congested!!");
break;/* exit loop if channel became congested */
}
}
- AVDT_TRACE_DEBUG2("res=%d left=%d",res, p_scb->frag_off);
+ AVDT_TRACE_DEBUG("res=%d left=%d",res, p_scb->frag_off);
if(p_scb->frag_off)
{
@@ -2106,7 +2106,7 @@ void avdt_scb_queue_frags(tAVDT_SCB *p_scb, UINT8 **pp_data, UINT32 *p_data_len,
else
{
num_frag = L2CA_FlushChannel(lcid, L2CAP_FLUSH_CHANS_GET);
- AVDT_TRACE_DEBUG2("num_q=%d lcid=%d", num_frag, lcid);
+ AVDT_TRACE_DEBUG("num_q=%d lcid=%d", num_frag, lcid);
if(num_frag >= AVDT_MAX_FRAG_COUNT)
{
num_frag = 0;
@@ -2120,7 +2120,7 @@ void avdt_scb_queue_frags(tAVDT_SCB *p_scb, UINT8 **pp_data, UINT32 *p_data_len,
/* look up transport channel table entry to get peer mtu */
p_tbl = avdt_ad_tc_tbl_by_type(AVDT_CHAN_MEDIA, p_scb->p_ccb, p_scb);
buf_size = p_tbl->peer_mtu + BT_HDR_SIZE;
- AVDT_TRACE_DEBUG3("peer_mtu: %d, buf_size: %d num_frag=%d",
+ AVDT_TRACE_DEBUG("peer_mtu: %d, buf_size: %d num_frag=%d",
p_tbl->peer_mtu, buf_size, num_frag);
if(buf_size > AVDT_DATA_POOL_SIZE)
@@ -2133,7 +2133,7 @@ void avdt_scb_queue_frags(tAVDT_SCB *p_scb, UINT8 **pp_data, UINT32 *p_data_len,
/* allocate buffer for fragment */
if(NULL == (p_frag = (BT_HDR*)GKI_getbuf(buf_size)))
{
- AVDT_TRACE_WARNING1("avdt_scb_queue_frags len=%d(out of GKI buffers)",*p_data_len);
+ AVDT_TRACE_WARNING("avdt_scb_queue_frags len=%d(out of GKI buffers)",*p_data_len);
break;
}
/* fill fragment by chunk of media payload */
@@ -2148,7 +2148,7 @@ void avdt_scb_queue_frags(tAVDT_SCB *p_scb, UINT8 **pp_data, UINT32 *p_data_len,
memcpy((UINT8*)(p_frag+1) + p_frag->offset, *pp_data, p_frag->len);
*pp_data += p_frag->len;
*p_data_len -= p_frag->len;
- AVDT_TRACE_DEBUG1("Prepared fragment len=%d", p_frag->len);
+ AVDT_TRACE_DEBUG("Prepared fragment len=%d", p_frag->len);
if(al_hdr)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 09:20:57 +0000