Skip to content

Commit

Permalink
ALSA: firewire-lib: pass packet descriptor to data block processing l…
Browse files Browse the repository at this point in the history 
…ayer

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 <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
@takaswie @tiwai
takaswie authored and tiwai committed Jul 22, 2019
1 parent 0f5cfcb commit d2c104a
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 88 deletions.
32 changes: 17 additions & 15 deletions sound/firewire/amdtp-am824.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 2 additions & 4 deletions sound/firewire/amdtp-stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
5 changes: 2 additions & 3 deletions sound/firewire/amdtp-stream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
27 changes: 12 additions & 15 deletions sound/firewire/digi00x/amdtp-dot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
23 changes: 12 additions & 11 deletions sound/firewire/fireface/amdtp-ff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,33 +103,34 @@ 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;
}

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 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;
}
Expand Down
53 changes: 30 additions & 23 deletions sound/firewire/motu/amdtp-motu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
39 changes: 22 additions & 17 deletions sound/firewire/tascam/amdtp-tascam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d2c104a

Please sign in to comment.