ALSA: fireface: code refactoring for FF data block processing layer

This is code refactoring for FF 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>

diff --git a/sound/firewire/fireface/amdtp-ff.c b/sound/firewire/fireface/amdtp-ff.c
index c36232fc4d3ed0ad5e7c05751402618af7d94416..cb2073cf146bcbaf1209e9ec1c9b9850b40a3ce3 100644 (file)
--- a/sound/firewire/fireface/amdtp-ff.c
+++ b/sound/firewire/fireface/amdtp-ff.c
@@ -27,19 +27,24 @@ int amdtp_ff_set_parameters(struct amdtp_stream *s, unsigned int rate,
        return amdtp_stream_set_parameters(s, rate, data_channels);
 }
 
-static void write_pcm_s32(struct amdtp_stream *s,
-                         struct snd_pcm_substream *pcm,
-                         __le32 *buffer, unsigned int frames)
+static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,
+                         __le32 *buffer, unsigned int frames,
+                         unsigned int pcm_frames)
 {
        struct amdtp_ff *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;
 
        for (i = 0; i < frames; ++i) {
                for (c = 0; c < channels; ++c) {
@@ -52,19 +57,24 @@ static void write_pcm_s32(struct amdtp_stream *s,
        }
 }
 
-static void read_pcm_s32(struct amdtp_stream *s,
-                        struct snd_pcm_substream *pcm,
-                        __le32 *buffer, unsigned int frames)
+static void read_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,
+                        __le32 *buffer, unsigned int frames,
+                        unsigned int pcm_frames)
 {
        struct amdtp_ff *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;
 
        for (i = 0; i < frames; ++i) {
                for (c = 0; c < channels; ++c) {
@@ -106,16 +116,15 @@ 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, (__le32 *)desc->ctx_payload,
-                             desc->data_blocks);
+                             desc->data_blocks, pcm_frames);
                pcm_frames = desc->data_blocks;
        } else {
                write_pcm_silence(s, (__le32 *)desc->ctx_payload,
                                  desc->data_blocks);
-               pcm_frames = 0;
        }
 
        return pcm_frames;
@@ -125,14 +134,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, (__le32 *)desc->ctx_payload,
-                            desc->data_blocks);
+                            desc->data_blocks, pcm_frames);
                pcm_frames = desc->data_blocks;
-       } else {
-               pcm_frames = 0;
        }
 
        return pcm_frames;