Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: 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:37:03 +09:00 committed by Takashi Iwai
parent 0f5cfcb24d
commit d2c104a342
7 changed files with 97 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sound/firewire/amdtp-am824.c
View File

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

6
sound/firewire/amdtp-stream.c
View File

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

5
sound/firewire/amdtp-stream.h
View File

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

27
sound/firewire/digi00x/amdtp-dot.c
View File

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

23
sound/firewire/fireface/amdtp-ff.c
View File

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

53
sound/firewire/motu/amdtp-motu.c
View File

@ -299,23 +299,27 @@ 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)
const struct pkt_desc *desc,
struct snd_pcm_substream *pcm)
{
struct amdtp_motu *p = s->protocol;
struct snd_pcm_substream *pcm;
unsigned int pcm_frames;
trace_data_block_sph(s, data_blocks, buffer);
trace_data_block_message(s, data_blocks, buffer);
trace_data_block_sph(s, desc->data_blocks, desc->ctx_payload);
trace_data_block_message(s, desc->data_blocks, desc->ctx_payload);
if (p->midi_ports)
read_midi_messages(s, buffer, data_blocks);
read_midi_messages(s, desc->ctx_payload, desc->data_blocks);
pcm = READ_ONCE(s->pcm);
if (data_blocks > 0 && pcm)
read_pcm_s32(s, pcm->runtime, buffer, data_blocks);
if (pcm) {
read_pcm_s32(s, pcm->runtime, desc->ctx_payload,
desc->data_blocks);
pcm_frames = desc->data_blocks;
} else {
pcm_frames = 0;
}
return data_blocks;
return pcm_frames;
}
static inline void compute_next_elapse_from_start(struct amdtp_motu *p)
@ -361,29 +365,32 @@ 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)
const struct pkt_desc *desc,
struct snd_pcm_substream *pcm)
{
struct amdtp_motu *p = (struct amdtp_motu *)s->protocol;
struct snd_pcm_substream *pcm;
unsigned int pcm_frames;
/* TODO: how to interact control messages between userspace? */
if (p->midi_ports)
write_midi_messages(s, buffer, data_blocks);
write_midi_messages(s, desc->ctx_payload, desc->data_blocks);
pcm = READ_ONCE(s->pcm);
if (pcm)
write_pcm_s32(s, pcm->runtime, buffer, data_blocks);
else
write_pcm_silence(s, buffer, data_blocks);
if (pcm) {
write_pcm_s32(s, pcm->runtime, desc->ctx_payload,
desc->data_blocks);
pcm_frames = desc->data_blocks;
} else {
write_pcm_silence(s, desc->ctx_payload, desc->data_blocks);
pcm_frames = 0;
}
write_sph(s, buffer, data_blocks);
write_sph(s, desc->ctx_payload, desc->data_blocks);
trace_data_block_sph(s, data_blocks, buffer);
trace_data_block_message(s, data_blocks, buffer);
trace_data_block_sph(s, desc->data_blocks, desc->ctx_payload);
trace_data_block_message(s, desc->data_blocks, desc->ctx_payload);
return data_blocks;
return pcm_frames;
}
int amdtp_motu_init(struct amdtp_stream *s, struct fw_unit *unit,

39
sound/firewire/tascam/amdtp-tascam.c
View File

@ -166,33 +166,38 @@ 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)
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 (data_blocks > 0 && pcm)
read_pcm_s32(s, pcm, buffer, data_blocks);
if (pcm) {
read_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);
pcm_frames = desc->data_blocks;
} else {
pcm_frames = 0;
}
read_status_messages(s, buffer, data_blocks);
read_status_messages(s, desc->ctx_payload, desc->data_blocks);
return 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);
else
write_pcm_silence(s, buffer, data_blocks);
if (pcm) {
write_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);
pcm_frames = desc->data_blocks;
} else {
write_pcm_silence(s, desc->ctx_payload, desc->data_blocks);
pcm_frames = 0;
}
return data_blocks;
return pcm_frames;
}
int amdtp_tscm_init(struct amdtp_stream *s, struct fw_unit *unit,