Commit cdefaa44 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: pass data block count as an argument to tracepoints event 



This is a preparation for future commit that 'struct
amdtp_stream.data_block_count' does not represent the value of
data block count for current data block.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 588f2e2c

sound/firewire/amdtp-stream-trace.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <linux/tracepoint.h>



TRACE_EVENT(amdtp_packet,

	TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int data_blocks, unsigned int index),

	TP_ARGS(s, cycles, cip_header, payload_length, data_blocks, index),

	TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int data_blocks, unsigned int data_block_counter, unsigned int index),

	TP_ARGS(s, cycles, cip_header, payload_length, data_blocks, data_block_counter, index),

	TP_STRUCT__entry(

		__field(unsigned int, second)

		__field(unsigned int, cycle)
@@ -47,7 +47,7 @@ TRACE_EVENT(amdtp_packet, 
		}

		__entry->payload_quadlets = payload_length / sizeof(__be32);

		__entry->data_blocks = data_blocks;

		__entry->data_block_counter = s->data_block_counter,

		__entry->data_block_counter = data_block_counter,

		__entry->packet_index = s->packet_index;

		__entry->irq = !!in_interrupt();

		__entry->index = index;

sound/firewire/amdtp-stream.c

+2 −2
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void build_it_pkt_header(struct amdtp_stream *s, unsigned int cycle, 
	}



	trace_amdtp_packet(s, cycle, cip_header, payload_length, data_blocks,

			   index);

			   s->data_block_counter, index);



	if (!(s->flags & CIP_DBC_IS_END_EVENT)) {

		s->data_block_counter =
@@ -653,7 +653,7 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle, 
	s->data_block_counter = dbc;



	trace_amdtp_packet(s, cycle, cip_header, *payload_length, *data_blocks,

			   index);

			   s->data_block_counter, index);



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE