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

ALSA: firewire-lib: pass packet descriptor to data block processing layer 



This commit changes signature of callback function to call data block
processing layer with packet descriptor. At present, the layer is called
per packet.

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

sound/firewire/amdtp-am824.c

+17 −15
Original line number Diff line number Diff line
@@ -336,44 +336,46 @@ static void read_midi_messages(struct amdtp_stream *s, __be32 *buffer, 
}



static unsigned int process_rx_data_blocks(struct amdtp_stream *s,

				__be32 *buffer, unsigned int data_blocks,

				unsigned int data_block_counter)

					   const struct pkt_desc *desc,

					   struct snd_pcm_substream *pcm)

{

	struct amdtp_am824 *p = s->protocol;

	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);

	unsigned int pcm_frames;



	if (pcm) {

		write_pcm_s32(s, pcm, buffer, data_blocks);

		pcm_frames = data_blocks * p->frame_multiplier;

		write_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);

		pcm_frames = desc->data_blocks * p->frame_multiplier;

	} else {

		write_pcm_silence(s, buffer, data_blocks);

		write_pcm_silence(s, desc->ctx_payload, desc->data_blocks);

		pcm_frames = 0;

	}



	if (p->midi_ports)

		write_midi_messages(s, buffer, data_blocks, data_block_counter);

	if (p->midi_ports) {

		write_midi_messages(s, desc->ctx_payload, desc->data_blocks,

				    desc->data_block_counter);

	}



	return pcm_frames;

}



static unsigned int process_tx_data_blocks(struct amdtp_stream *s,

				__be32 *buffer, unsigned int data_blocks,

				unsigned int data_block_counter)

					   const struct pkt_desc *desc,

					   struct snd_pcm_substream *pcm)

{

	struct amdtp_am824 *p = s->protocol;

	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);

	unsigned int pcm_frames;



	if (pcm) {

		read_pcm_s32(s, pcm, buffer, data_blocks);

		pcm_frames = data_blocks * p->frame_multiplier;

		read_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);

		pcm_frames = desc->data_blocks * p->frame_multiplier;

	} else {

		pcm_frames = 0;

	}



	if (p->midi_ports)

		read_midi_messages(s, buffer, data_blocks, data_block_counter);

	if (p->midi_ports) {

		read_midi_messages(s, desc->ctx_payload, desc->data_blocks,

				   desc->data_block_counter);

	}



	return pcm_frames;

}

sound/firewire/amdtp-stream.c

+2 −4
Original line number Diff line number Diff line
@@ -768,13 +768,11 @@ static void process_ctx_payloads(struct amdtp_stream *s, 


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

		const struct pkt_desc *desc = descs + i;

		struct snd_pcm_substream *pcm;

		struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);

		unsigned int pcm_frames;



		pcm_frames = s->process_data_blocks(s, desc->ctx_payload,

				desc->data_blocks, desc->data_block_counter);

		pcm_frames = s->process_data_blocks(s, desc, pcm);



		pcm = READ_ONCE(s->pcm);

		if (pcm && pcm_frames > 0)

			update_pcm_pointers(s, pcm, pcm_frames);

	}

sound/firewire/amdtp-stream.h

+2 −3
Original line number Diff line number Diff line
@@ -105,9 +105,8 @@ struct pkt_desc { 
struct amdtp_stream;

typedef unsigned int (*amdtp_stream_process_data_blocks_t)(

						struct amdtp_stream *s,

						__be32 *buffer,

						unsigned int data_blocks,

						unsigned int data_block_counter);

						const struct pkt_desc *desc,

						struct snd_pcm_substream *pcm);

struct amdtp_stream {

	struct fw_unit *unit;

	enum cip_flags flags;

sound/firewire/digi00x/amdtp-dot.c

+12 −15
Original line number Diff line number Diff line
@@ -330,42 +330,39 @@ void amdtp_dot_midi_trigger(struct amdtp_stream *s, unsigned int port, 
}



static unsigned int process_tx_data_blocks(struct amdtp_stream *s,

				__be32 *buffer, unsigned int data_blocks,

				unsigned int data_block_counter)

					   const struct pkt_desc *desc,

					   struct snd_pcm_substream *pcm)

{

	struct snd_pcm_substream *pcm;

	unsigned int pcm_frames;



	pcm = READ_ONCE(s->pcm);

	if (pcm) {

		read_pcm_s32(s, pcm, buffer, data_blocks);

		pcm_frames = data_blocks;

		read_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);

		pcm_frames = desc->data_blocks;

	} else {

		pcm_frames = 0;

	}



	read_midi_messages(s, buffer, data_blocks);

	read_midi_messages(s, desc->ctx_payload, desc->data_blocks);



	return pcm_frames;

}



static unsigned int process_rx_data_blocks(struct amdtp_stream *s,

				__be32 *buffer, unsigned int data_blocks,

				unsigned int data_block_counter)

					   const struct pkt_desc *desc,

					   struct snd_pcm_substream *pcm)

{

	struct snd_pcm_substream *pcm;

	unsigned int pcm_frames;



	pcm = READ_ONCE(s->pcm);

	if (pcm) {

		write_pcm_s32(s, pcm, buffer, data_blocks);

		pcm_frames = data_blocks;

		write_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);

		pcm_frames = desc->data_blocks;

	} else {

		write_pcm_silence(s, buffer, data_blocks);

		write_pcm_silence(s, desc->ctx_payload, desc->data_blocks);

		pcm_frames = 0;

	}



	write_midi_messages(s, buffer, data_blocks, data_block_counter);

	write_midi_messages(s, desc->ctx_payload, desc->data_blocks,

			    desc->data_block_counter);



	return pcm_frames;

}

sound/firewire/fireface/amdtp-ff.c

+12 −11
Original line number Diff line number Diff line
@@ -103,17 +103,18 @@ int amdtp_ff_add_pcm_hw_constraints(struct amdtp_stream *s, 
}



static unsigned int process_rx_data_blocks(struct amdtp_stream *s,

				__be32 *buffer, unsigned int data_blocks,

				unsigned int data_block_counter)

					   const struct pkt_desc *desc,

					   struct snd_pcm_substream *pcm)

{

	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);

	unsigned int pcm_frames;



	if (pcm) {

		write_pcm_s32(s, pcm, (__le32 *)buffer, data_blocks);

		pcm_frames = data_blocks;

		write_pcm_s32(s, pcm, (__le32 *)desc->ctx_payload,

			      desc->data_blocks);

		pcm_frames = desc->data_blocks;

	} else {

		write_pcm_silence(s, (__le32 *)buffer, data_blocks);

		write_pcm_silence(s, (__le32 *)desc->ctx_payload,

				  desc->data_blocks);

		pcm_frames = 0;

	}
@@ -121,15 +122,15 @@ static unsigned int process_rx_data_blocks(struct amdtp_stream *s, 
}



static unsigned int process_tx_data_blocks(struct amdtp_stream *s,

				__be32 *buffer, unsigned int data_blocks,

				unsigned int data_block_counter)

					   const struct pkt_desc *desc,

					   struct snd_pcm_substream *pcm)

{

	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);

	unsigned int pcm_frames;



	if (pcm) {

		read_pcm_s32(s, pcm, (__le32 *)buffer, data_blocks);

		pcm_frames = data_blocks;

		read_pcm_s32(s, pcm, (__le32 *)desc->ctx_payload,

			     desc->data_blocks);

		pcm_frames = desc->data_blocks;

	} else {

		pcm_frames = 0;

	}