Changeset 5984107 in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2011-10-22T09:47:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ac149d5

Parents:

962ef67

Message:

sb16: Add non-automode alternative.

File:

• uspace/drv/audio/sb16/dsp.c (modified) (7 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -53 +53 @@
 #define SB_DMA_CHAN_8 1
 
+#define AUTO_DMA_MODE
+
+#ifdef AUTO_DMA_MODE
+#undef AUTO_DMA_MODE
+#define AUTO_DMA_MODE true
+#else
+#define AUTO_DMA_MODE false
+#endif
+
 static inline int sb_dsp_read(sb_dsp_t *dsp, uint8_t *data)
 {
@@ -103 +112 @@
                 return ENOMEM;
         }
-
 
         const uintptr_t pa = addr_to_phys(buffer);
@@ -115 +123 @@
                 dsp->buffer.size = BUFFER_SIZE;
                 bzero(buffer, BUFFER_SIZE);
-                dma_prepare_channel(SB_DMA_CHAN_16, false, true, BLOCK_DMA);
+                dma_prepare_channel(
+                    SB_DMA_CHAN_16, false, AUTO_DMA_MODE, BLOCK_DMA);
                 /* Set 8bit channel */
                 const int ret = dma_setup_channel(SB_DMA_CHAN_8, pa, BUFFER_SIZE);
                 if (ret == EOK) {
                         dma_prepare_channel(
-                            SB_DMA_CHAN_8, false, true, BLOCK_DMA);
+                            SB_DMA_CHAN_8, false, AUTO_DMA_MODE, BLOCK_DMA);
+                } else {
+                        ddf_log_warning("Failed to setup DMA8 channel: %s.\n",
+                            str_error(ret));
                 }
         } else {
-                ddf_log_error("Failed to setup DMA buffer %s.\n",
+                ddf_log_error("Failed to setup DMA16 channel %s.\n",
                     str_error(ret));
                 free24(buffer);
@@ -207 +219 @@
         if (dsp->buffer.position == (dsp->buffer.data + dsp->buffer.size))
                 dsp->buffer.position = dsp->buffer.data;
+        if (!AUTO_DMA_MODE) {
+                sb_dsp_write(dsp, SINGLE_DMA_16B_DA_FIFO);
+                sb_dsp_write(dsp, dsp->playing.mode);
+                sb_dsp_write(dsp, (PLAY_BLOCK_SIZE - 1) & 0xff);
+                sb_dsp_write(dsp, (PLAY_BLOCK_SIZE - 1) >> 8);
+        }
 
 }
@@ -239 +257 @@
                 return ENOTSUP;
 
-        ddf_log_fatal("Buffer prepare.\n");
+        ddf_log_debug("Buffer prepare.\n");
         const int ret = sb_setup_buffer(dsp);
         if (ret != EOK)
@@ -248 +266 @@
         memcpy(dsp->buffer.data, dsp->playing.data, play_size);
 
-        ddf_log_note("Playing sound: %zu(%zu) bytes.\n", play_size, size);
+        ddf_log_debug("Playing sound: %zu(%zu) bytes.\n", play_size, size);
 
         dsp->playing.data = data;
@@ -256 +274 @@
             (bit_depth == 16 ? 0x10 : 0) | (channels == 2 ? 0x20 : 0);
 
+        ddf_log_debug("Setting mode %hhx.\n", dsp->playing.mode);
         sb_dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
         sb_dsp_write(dsp, sampling_rate >> 8);
         sb_dsp_write(dsp, sampling_rate & 0xff);
 
-        sb_dsp_write(dsp, AUTO_DMA_16B_DA_FIFO);
+        ddf_log_debug("Set sampling rate %hhx:%hhx.\n",
+            sampling_rate >> 8, sampling_rate & 0xff);
+
+        if (AUTO_DMA_MODE) {
+                sb_dsp_write(dsp, AUTO_DMA_16B_DA_FIFO);
+        } else {
+                sb_dsp_write(dsp, SINGLE_DMA_16B_DA_FIFO);
+        }
         sb_dsp_write(dsp, dsp->playing.mode);
         sb_dsp_write(dsp, (play_size - 1) & 0xff);