Changeset ff396ea in mainline

Timestamp:

2012-08-19T13:23:32Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d2765ab3

Parents:

b881226

Message:

sb16: Interval of 0 frames disables interrupts reporting.

Don't use fifo in single transfers.

Location:

uspace/drv/audio/sb16

Files:

• dsp.c (modified) (7 diffs)
• dsp.h (modified) (1 diff)

uspace/drv/audio/sb16/dsp.c

@@ -167 +167 @@
         dsp->sb_dev = dev;
         dsp->status = DSP_STOPPED;
+        dsp->ignore_interrupts = false;
         sb_dsp_reset(dsp);
         /* "DSP takes about 100 microseconds to initialize itself" */
@@ -192 +193 @@
 {
         assert(dsp);
+
+#ifndef AUTO_DMA_MODE
+        if (dsp->status == DSP_PLAYBACK) {
+                sb_dsp_write(dsp, SINGLE_DMA_16B_DA);
+                sb_dsp_write(dsp, dsp->active.mode);
+                sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
+                sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
+        }
+
+        if (dsp->status == DSP_RECORDING) {
+                sb_dsp_write(dsp, SINGLE_DMA_16B_AD);
+                sb_dsp_write(dsp, dsp->active.mode);
+                sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
+                sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
+        }
+#endif
+
+        if (dsp->ignore_interrupts)
+                return;
+
         dsp->active.frame_count +=
             dsp->active.samples / ((dsp->active.mode & DSP_MODE_STEREO) ? 2 : 1);
@@ -215 +236 @@
                 ddf_log_warning("Interrupt with no event consumer.");
         }
-#ifndef AUTO_DMA_MODE
-        if (dsp->active.playing)
-                sb_dsp_write(dsp, SINGLE_DMA_16B_DA);
-        else
-                sb_dsp_write(dsp, SINGLE_DMA_16B_AD);
-
-        sb_dsp_write(dsp, dsp->active.mode);
-        sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
-        sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
-#endif
 }
 
@@ -333 +344 @@
                 return ENOTSUP;
 
-        dsp->event_exchange = async_exchange_begin(dsp->event_session);
-        if (!dsp->event_exchange)
-                return ENOMEM;
+        /* Client requested regular interrupts */
+        if (frames) {
+                dsp->event_exchange = async_exchange_begin(dsp->event_session);
+                if (!dsp->event_exchange)
+                        return ENOMEM;
+                dsp->ignore_interrupts = false;
+        }
 
         const bool sign = (format == PCM_SAMPLE_SINT16_LE);
@@ -349 +364 @@
         sb_dsp_write(dsp, AUTO_DMA_16B_DA_FIFO);
 #else
-        sb_dsp_write(dsp, SINGLE_DMA_16B_DA_FIFO);
+        sb_dsp_write(dsp, SINGLE_DMA_16B_DA);
 #endif
 
@@ -401 +416 @@
                 return ENOTSUP;
 
-        dsp->event_exchange = async_exchange_begin(dsp->event_session);
-        if (!dsp->event_exchange)
-                return ENOMEM;
+        /* client requested regular interrupts */
+        if (frames) {
+                dsp->event_exchange = async_exchange_begin(dsp->event_session);
+                if (!dsp->event_exchange)
+                        return ENOMEM;
+                dsp->ignore_interrupts = false;
+        }
 
         const bool sign = (format == PCM_SAMPLE_SINT16_LE);
@@ -417 +436 @@
         sb_dsp_write(dsp, AUTO_DMA_16B_AD_FIFO);
 #else
-        sb_dsp_write(dsp, SINGLE_DMA_16B_AD_FIFO);
+        sb_dsp_write(dsp, SINGLE_DMA_16B_AD);
 #endif
 

uspace/drv/audio/sb16/dsp.h

@@ -47 +47 @@
         int dma8_channel;
         int dma16_channel;
+        bool ignore_interrupts;
         struct {
                 uint8_t major;