summaryrefslogtreecommitdiffstats
path: root/sound/firewire/amdtp-stream-trace.h
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2017-03-31 15:06:06 +0200
committerTakashi Iwai <tiwai@suse.de>2017-04-05 21:31:38 +0200
commitff0fb5aaa8799701aa01bd1f2cdaf93ce98bbe60 (patch)
tree5de15a0f52736e5ef572ae7d9b671c6bd20b8b31 /sound/firewire/amdtp-stream-trace.h
parentALSA: fireface: add proc node to help debugging (diff)
downloadlinux-ff0fb5aaa8799701aa01bd1f2cdaf93ce98bbe60.tar.xz
linux-ff0fb5aaa8799701aa01bd1f2cdaf93ce98bbe60.zip
ALSA: firewire-lib: use the same prototype for functions to handle packet
Audio and music units of RME Fireface series use its own protocol for isochronous packets to transfer data. This protocol requires ALSA IEC 61883-1/6 engine to have alternative functions. This commit is a preparation for the protocol. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp-stream-trace.h')
-rw-r--r--sound/firewire/amdtp-stream-trace.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
index 9c04faf206b2..850b36e27d0d 100644
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
@@ -14,8 +14,8 @@
#include <linux/tracepoint.h>
TRACE_EVENT(in_packet,
- TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 cip_header[2], unsigned int payload_quadlets, unsigned int index),
- TP_ARGS(s, cycles, cip_header, payload_quadlets, index),
+ TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 cip_header[2], unsigned int payload_length, unsigned int index),
+ TP_ARGS(s, cycles, cip_header, payload_length, index),
TP_STRUCT__entry(
__field(unsigned int, second)
__field(unsigned int, cycle)
@@ -37,7 +37,7 @@ TRACE_EVENT(in_packet,
__entry->dest = fw_parent_device(s->unit)->card->node_id;
__entry->cip_header0 = cip_header[0];
__entry->cip_header1 = cip_header[1];
- __entry->payload_quadlets = payload_quadlets;
+ __entry->payload_quadlets = payload_length / 4;
__entry->packet_index = s->packet_index;
__entry->irq = !!in_interrupt();
__entry->index = index;