Changeset 358 for GPL/branches/uniaud32-2.0/alsa-kernel/drivers/dummy.c

Timestamp:

Jul 16, 2008, 11:53:49 AM (17 years ago)

Author:

Paul Smedley

Message:

Update uniaud32-2.0 branch to ALSA 1.0.17

File:

• GPL/branches/uniaud32-2.0/alsa-kernel/drivers/dummy.c (modified) (4 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/drivers/dummy.c

@@ -182 +182 @@
         spinlock_t lock;
         struct timer_list timer;
-        unsigned int pcm_size;
-        unsigned int pcm_count;
+        unsigned int pcm_buffer_size;
+        unsigned int pcm_period_size;
         unsigned int pcm_bps;           /* bytes per second */
-        unsigned int pcm_jiffie;        /* bytes per one jiffie */
+        unsigned int pcm_hz;            /* HZ */
         unsigned int pcm_irq_pos;       /* IRQ position */
         unsigned int pcm_buf_pos;       /* position in buffer */
@@ -231 +231 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_dummy_pcm *dpcm = runtime->private_data;
-        unsigned int bps;
-
-        bps = runtime->rate * runtime->channels;
-        bps *= snd_pcm_format_width(runtime->format);
-        bps /= 8;
+        int bps;
+
+        bps = snd_pcm_format_width(runtime->format) * runtime->rate *
+                runtime->channels / 8;
+
         if (bps <= 0)
                 return -EINVAL;
+
         dpcm->pcm_bps = bps;
-        dpcm->pcm_jiffie = bps / HZ;
-        dpcm->pcm_size = snd_pcm_lib_buffer_bytes(substream);
-        dpcm->pcm_count = snd_pcm_lib_period_bytes(substream);
+        dpcm->pcm_hz = HZ;
+        dpcm->pcm_buffer_size = snd_pcm_lib_buffer_bytes(substream);
+        dpcm->pcm_period_size = snd_pcm_lib_period_bytes(substream);
         dpcm->pcm_irq_pos = 0;
         dpcm->pcm_buf_pos = 0;
+
+        snd_pcm_format_set_silence(runtime->format, runtime->dma_area,
+                        bytes_to_samples(runtime, runtime->dma_bytes));
+
         return 0;
 }
@@ -255 +260 @@
         dpcm->timer.expires = 1 + jiffies;
         add_timer(&dpcm->timer);
-        dpcm->pcm_irq_pos += dpcm->pcm_jiffie;
-        dpcm->pcm_buf_pos += dpcm->pcm_jiffie;
-        dpcm->pcm_buf_pos %= dpcm->pcm_size;
-        if (dpcm->pcm_irq_pos >= dpcm->pcm_count) {
-                dpcm->pcm_irq_pos %= dpcm->pcm_count;
+        dpcm->pcm_irq_pos += dpcm->pcm_bps;
+        dpcm->pcm_buf_pos += dpcm->pcm_bps;
+        dpcm->pcm_buf_pos %= dpcm->pcm_buffer_size * dpcm->pcm_hz;
+        if (dpcm->pcm_irq_pos >= dpcm->pcm_period_size * dpcm->pcm_hz) {
+                dpcm->pcm_irq_pos %= dpcm->pcm_period_size * dpcm->pcm_hz;
                 spin_unlock_irqrestore(&dpcm->lock, flags);
                 snd_pcm_period_elapsed(dpcm->substream);
@@ -271 +276 @@
         struct snd_dummy_pcm *dpcm = runtime->private_data;
 
-        return bytes_to_frames(runtime, dpcm->pcm_buf_pos);
+        return bytes_to_frames(runtime, dpcm->pcm_buf_pos / dpcm->pcm_hz);
 }