mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2019-07-22 12:36:57 +09:00 committed by Takashi Iwai
parent 3baf30532f
commit 600c8018df
7 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/firewire/amdtp-am824.c
View file

@ -336,8 +336,8 @@ 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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct amdtp_am824 *p = s->protocol;
struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);
@ -358,8 +358,8 @@ 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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct amdtp_am824 *p = s->protocol;
struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);

5
sound/firewire/amdtp-stream.c
View file

@ -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;

3
sound/firewire/amdtp-stream.h
View file

@ -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;

8
sound/firewire/digi00x/amdtp-dot.c
View file

@ -330,8 +330,8 @@ 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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct snd_pcm_substream *pcm;
unsigned int pcm_frames;
@ -350,8 +350,8 @@ 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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct snd_pcm_substream *pcm;
unsigned int pcm_frames;

8
sound/firewire/fireface/amdtp-ff.c
View file

@ -103,8 +103,8 @@ 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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);
unsigned int pcm_frames;
@ -121,8 +121,8 @@ 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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);
unsigned int pcm_frames;

11
sound/firewire/motu/amdtp-motu.c
View file

@ -299,8 +299,8 @@ static void __maybe_unused copy_message(u64 *frames, __be32 *buffer,
}
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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct amdtp_motu *p = s->protocol;
struct snd_pcm_substream *pcm;
@ -361,15 +361,12 @@ static void write_sph(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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct amdtp_motu *p = (struct amdtp_motu *)s->protocol;
struct snd_pcm_substream *pcm;
/* Not used. */
*syt = 0xffff;
/* TODO: how to interact control messages between userspace? */
if (p->midi_ports)

11
sound/firewire/tascam/amdtp-tascam.c
View file

@ -166,8 +166,8 @@ static void read_status_messages(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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct snd_pcm_substream *pcm;
@ -181,14 +181,11 @@ 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)
__be32 *buffer, unsigned int data_blocks,
unsigned int data_block_counter)
{
struct snd_pcm_substream *pcm;
/* This field is not used. */
*syt = 0x0000;
pcm = READ_ONCE(s->pcm);
if (pcm)
write_pcm_s32(s, pcm, buffer, data_blocks);