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

ALSA: firewire-lib: pass no syt information to data block processing layer 



In a previous commit, the variable passed from packet streaming layer
for syt variable is useless. This commit obsoletes it.

In my future work, the syt information is passed to data block processing
layer by another way.

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

sound/firewire/amdtp-am824.c

+4 −4
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 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, unsigned int *syt)

				unsigned int data_block_counter)

{

	struct amdtp_am824 *p = s->protocol;

	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);
@@ -359,7 +359,7 @@ 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, unsigned int *syt)

				unsigned int data_block_counter)

{

	struct amdtp_am824 *p = s->protocol;

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

sound/firewire/amdtp-stream.c

+2 −3
Original line number Diff line number Diff line
@@ -714,8 +714,7 @@ static void out_stream_callback(struct fw_iso_context *context, u32 tstamp, 
		data_blocks = calculate_data_blocks(s, syt);

		buffer = s->buffer.packets[s->packet_index].buffer;

		dbc = s->data_block_counter;

		pcm_frames = s->process_data_blocks(s, buffer, data_blocks, dbc,

						    &syt);

		pcm_frames = s->process_data_blocks(s, buffer, data_blocks, dbc);



		if (s->flags & CIP_DBC_IS_END_EVENT)

			dbc = (dbc + data_blocks) & 0xff;
@@ -782,7 +781,7 @@ static void in_stream_callback(struct fw_iso_context *context, u32 tstamp, 
		if (err >= 0) {

			buffer = s->buffer.packets[s->packet_index].buffer;

			pcm_frames = s->process_data_blocks(s, buffer,

				data_blocks, dbc, &syt);

							    data_blocks, dbc);



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

				dbc = (dbc + data_blocks) & 0xff;

sound/firewire/amdtp-stream.h

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ typedef unsigned int (*amdtp_stream_process_data_blocks_t)( 
						struct amdtp_stream *s,

						__be32 *buffer,

						unsigned int data_blocks,

						unsigned int data_block_counter,

						unsigned int *syt);

						unsigned int data_block_counter);

struct amdtp_stream {

	struct fw_unit *unit;

	enum cip_flags flags;

sound/firewire/digi00x/amdtp-dot.c

+4 −4
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ 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, unsigned int *syt)

				unsigned int data_block_counter)

{

	struct snd_pcm_substream *pcm;

	unsigned int pcm_frames;
@@ -351,7 +351,7 @@ static unsigned int process_tx_data_blocks(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, unsigned int *syt)

				unsigned int data_block_counter)

{

	struct snd_pcm_substream *pcm;

	unsigned int pcm_frames;

sound/firewire/fireface/amdtp-ff.c

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 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, unsigned int *syt)

				unsigned int data_block_counter)

{

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

	unsigned int pcm_frames;
@@ -122,7 +122,7 @@ 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, unsigned int *syt)

				unsigned int data_block_counter)

{

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

	unsigned int pcm_frames;

CRA Git | Maintained and supported by SUSTech CRA and CCSE