mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 17:30:02 +00:00
Code Issues Releases Wiki Activity

ALSA: firewire-lib: refactoring to obsolete IR packet handler

Browse source 
As a result of heavy refactoring based on IR context header, the packet
handler becomes simpler.

This commit merges the packet handler into function for IR context
callback. The logic to parse IR context header and tracepoints event is
split to a function.

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-05-24 18:03:42 +09:00 committed by Takashi Iwai
parent 6bc1a2699b
commit 98e3e43b59
1 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -619,59 +619,42 @@ static int check_cip_header(struct amdtp_stream *s, const __be32 *buf,
return 0;
}
static int handle_in_packet(struct amdtp_stream *s, unsigned int cycle,
const __be32 *ctx_header, __be32 *buffer,
unsigned int index)
static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle,
const __be32 *ctx_header,
unsigned int *payload_length,
unsigned int *data_blocks,
unsigned int *syt, unsigned int index)
{
unsigned int payload_length;
const __be32 *cip_header;
unsigned int syt;
unsigned int data_blocks;
struct snd_pcm_substream *pcm;
unsigned int pcm_frames;
struct fw_iso_packet params = {0};
int err;
payload_length = be32_to_cpu(ctx_header[0]) >> ISO_DATA_LENGTH_SHIFT;
if (payload_length > s->ctx_data.tx.ctx_header_size +
*payload_length = be32_to_cpu(ctx_header[0]) >> ISO_DATA_LENGTH_SHIFT;
if (*payload_length > s->ctx_data.tx.ctx_header_size +
s->ctx_data.tx.max_ctx_payload_length) {
dev_err(&s->unit->device,
"Detect jumbo payload: %04x %04x\n",
payload_length, s->ctx_data.tx.max_ctx_payload_length);
*payload_length, s->ctx_data.tx.max_ctx_payload_length);
return -EIO;
}
cip_header = ctx_header + 2;
if (!(s->flags & CIP_NO_HEADER)) {
cip_header = &ctx_header[2];
err = check_cip_header(s, cip_header, payload_length,
&data_blocks, &syt);
if (err < 0) {
if (err != -EAGAIN)
return err;
pcm_frames = 0;
goto end;
}
cip_header = ctx_header + 2;
err = check_cip_header(s, cip_header, *payload_length,
data_blocks, syt);
if (err < 0)
return err;
} else {
cip_header = NULL;
data_blocks = payload_length / 4 / s->data_block_quadlets;
syt = 0;
*data_blocks = *payload_length / sizeof(__be32) /
s->data_block_quadlets;
*syt = 0;
s->data_block_counter =
(s->data_block_counter + data_blocks) & 0xff;
(s->data_block_counter + *data_blocks) & 0xff;
}
trace_amdtp_packet(s, cycle, cip_header, payload_length, data_blocks,
trace_amdtp_packet(s, cycle, cip_header, *payload_length, *data_blocks,
index);
pcm_frames = s->process_data_blocks(s, buffer, data_blocks, &syt);
end:
if (queue_in_packet(s, &params) < 0)
return -EIO;
pcm = READ_ONCE(s->pcm);
if (pcm && pcm_frames > 0)
update_pcm_pointers(s, pcm, pcm_frames);
return 0;
}
@ -773,13 +756,32 @@ static void in_stream_callback(struct fw_iso_context *context, u32 tstamp,
for (i = 0; i < packets; i++) {
u32 cycle;
unsigned int payload_length;
unsigned int data_block;
unsigned int syt;
__be32 *buffer;
unsigned int pcm_frames = 0;
struct fw_iso_packet params = {0};
struct snd_pcm_substream *pcm;
int err;
cycle = compute_cycle_count(ctx_header[1]);
buffer = s->buffer.packets[s->packet_index].buffer;
if (handle_in_packet(s, cycle, ctx_header, buffer, i) < 0)
err = parse_ir_ctx_header(s, cycle, ctx_header, &payload_length,
&data_block, &syt, i);
if (err < 0 && err != -EAGAIN)
break;
if (err >= 0) {
buffer = s->buffer.packets[s->packet_index].buffer;
pcm_frames = s->process_data_blocks(s, buffer,
data_block, &syt);
}
if (queue_in_packet(s, &params) < 0)
break;
pcm = READ_ONCE(s->pcm);
if (pcm && pcm_frames > 0)
update_pcm_pointers(s, pcm, pcm_frames);
ctx_header += s->ctx_data.tx.ctx_header_size / sizeof(*ctx_header);
}