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

ALSA: firewire-motu: more code refactoring for MOTU data block processing layer 



MOTU data block processing layer has some tracepoints events. This
commit is code refactoring to split probing the events from processing
data blocks.

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

sound/firewire/motu/amdtp-motu.c

+36 −14
Original line number Diff line number Diff line
@@ -310,6 +310,22 @@ static void __maybe_unused copy_message(u64 *frames, __be32 *buffer, 
	}

}



static void probe_tracepoints_events(struct amdtp_stream *s,

				     const struct pkt_desc *descs,

				     unsigned int packets)

{

	int i;



	for (i = 0; i < packets; ++i) {

		const struct pkt_desc *desc = descs + i;

		__be32 *buf = desc->ctx_payload;

		unsigned int data_blocks = desc->data_blocks;



		trace_data_block_sph(s, data_blocks, buf);

		trace_data_block_message(s, data_blocks, buf);

	}

}



static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s,

					    const struct pkt_desc *descs,

					    unsigned int packets,
@@ -319,23 +335,26 @@ static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s, 
	unsigned int pcm_frames = 0;

	int i;



	// For data block processing.

	for (i = 0; i < packets; ++i) {

		const struct pkt_desc *desc = descs + i;

		__be32 *buf = desc->ctx_payload;

		unsigned int data_blocks = desc->data_blocks;



		trace_data_block_sph(s, data_blocks, buf);

		trace_data_block_message(s, data_blocks, buf);



		if (p->midi_ports)

			read_midi_messages(s, buf, data_blocks);



		if (pcm) {

			read_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);

			pcm_frames += data_blocks;

		}



		if (p->midi_ports)

			read_midi_messages(s, buf, data_blocks);

	}



	// For tracepoints.

	if (trace_data_block_sph_enabled() ||

	    trace_data_block_message_enabled())

		probe_tracepoints_events(s, descs, packets);



	return pcm_frames;

}
@@ -390,16 +409,12 @@ static unsigned int process_it_ctx_payloads(struct amdtp_stream *s, 
	unsigned int pcm_frames = 0;

	int i;



	// For data block processing.

	for (i = 0; i < packets; ++i) {

		const struct pkt_desc *desc = descs + i;

		__be32 *buf = desc->ctx_payload;

		unsigned int data_blocks = desc->data_blocks;



		// TODO: how to interact control messages between userspace?



		if (p->midi_ports)

			write_midi_messages(s, buf, data_blocks);



		if (pcm) {

			write_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);

			pcm_frames += data_blocks;
@@ -407,12 +422,19 @@ static unsigned int process_it_ctx_payloads(struct amdtp_stream *s, 
			write_pcm_silence(s, buf, data_blocks);

		}



		write_sph(s, buf, data_blocks);

		if (p->midi_ports)

			write_midi_messages(s, buf, data_blocks);



		trace_data_block_sph(s, data_blocks, buf);

		trace_data_block_message(s, data_blocks, buf);

		// TODO: how to interact control messages between userspace?



		write_sph(s, buf, data_blocks);

	}



	// For tracepoints.

	if (trace_data_block_sph_enabled() ||

	    trace_data_block_message_enabled())

		probe_tracepoints_events(s, descs, packets);



	return pcm_frames;

}