ALSA: firewire-digi00x: code refactoring for DOT data block processing layer
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 22 Jul 2019 03:37:05 +0000 (12:37 +0900)
committerTakashi Iwai <tiwai@suse.de>
Mon, 22 Jul 2019 14:05:09 +0000 (16:05 +0200)
This is code refactoring for DOT data block processing layer so that
it can receive list of packet descriptor.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/digi00x/amdtp-dot.c

index 83ac4b37f26d361fd03fec3fa83c5678b859121b..cef5caf9723680c90d3f41b573191d90ac4d3397 100644 (file)
@@ -143,17 +143,23 @@ int amdtp_dot_set_parameters(struct amdtp_stream *s, unsigned int rate,
 }
 
 static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,
-                         __be32 *buffer, unsigned int frames)
+                         __be32 *buffer, unsigned int frames,
+                         unsigned int pcm_frames)
 {
        struct amdtp_dot *p = s->protocol;
+       unsigned int channels = p->pcm_channels;
        struct snd_pcm_runtime *runtime = pcm->runtime;
-       unsigned int channels, remaining_frames, i, c;
+       unsigned int pcm_buffer_pointer;
+       int remaining_frames;
        const u32 *src;
+       int i, c;
+
+       pcm_buffer_pointer = s->pcm_buffer_pointer + pcm_frames;
+       pcm_buffer_pointer %= runtime->buffer_size;
 
-       channels = p->pcm_channels;
        src = (void *)runtime->dma_area +
-                       frames_to_bytes(runtime, s->pcm_buffer_pointer);
-       remaining_frames = runtime->buffer_size - s->pcm_buffer_pointer;
+                               frames_to_bytes(runtime, pcm_buffer_pointer);
+       remaining_frames = runtime->buffer_size - pcm_buffer_pointer;
 
        buffer++;
        for (i = 0; i < frames; ++i) {
@@ -169,17 +175,23 @@ static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,
 }
 
 static void read_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,
-                        __be32 *buffer, unsigned int frames)
+                        __be32 *buffer, unsigned int frames,
+                        unsigned int pcm_frames)
 {
        struct amdtp_dot *p = s->protocol;
+       unsigned int channels = p->pcm_channels;
        struct snd_pcm_runtime *runtime = pcm->runtime;
-       unsigned int channels, remaining_frames, i, c;
+       unsigned int pcm_buffer_pointer;
+       int remaining_frames;
        u32 *dst;
+       int i, c;
+
+       pcm_buffer_pointer = s->pcm_buffer_pointer + pcm_frames;
+       pcm_buffer_pointer %= runtime->buffer_size;
 
-       channels = p->pcm_channels;
        dst  = (void *)runtime->dma_area +
-                       frames_to_bytes(runtime, s->pcm_buffer_pointer);
-       remaining_frames = runtime->buffer_size - s->pcm_buffer_pointer;
+                               frames_to_bytes(runtime, pcm_buffer_pointer);
+       remaining_frames = runtime->buffer_size - pcm_buffer_pointer;
 
        buffer++;
        for (i = 0; i < frames; ++i) {
@@ -333,13 +345,12 @@ static unsigned int process_tx_data_blocks(struct amdtp_stream *s,
                                           const struct pkt_desc *desc,
                                           struct snd_pcm_substream *pcm)
 {
-       unsigned int pcm_frames;
+       unsigned int pcm_frames = 0;
 
        if (pcm) {
-               read_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);
+               read_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks,
+                            pcm_frames);
                pcm_frames = desc->data_blocks;
-       } else {
-               pcm_frames = 0;
        }
 
        read_midi_messages(s, desc->ctx_payload, desc->data_blocks);
@@ -351,14 +362,14 @@ static unsigned int process_rx_data_blocks(struct amdtp_stream *s,
                                           const struct pkt_desc *desc,
                                           struct snd_pcm_substream *pcm)
 {
-       unsigned int pcm_frames;
+       unsigned int pcm_frames = 0;
 
        if (pcm) {
-               write_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);
+               write_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks,
+                             pcm_frames);
                pcm_frames = desc->data_blocks;
        } else {
                write_pcm_silence(s, desc->ctx_payload, desc->data_blocks);
-               pcm_frames = 0;
        }
 
        write_midi_messages(s, desc->ctx_payload, desc->data_blocks,