Changeset 7257eea6 in mainline

Timestamp:

2011-10-21T19:01:15Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f14e6ea

Parents:

9f351c8

Message:

sb16: Setup both channels (8/16 bit) to the same buffer and set channel mode.

Location:

uspace/drv/audio/sb16

Files:

• dma_controller.c (modified) (3 diffs)
• dma_controller.h (modified) (1 diff)
• dsp.c (modified) (4 diffs)
• dsp.h (modified) (1 diff)

uspace/drv/audio/sb16/dma_controller.c

@@ -67 +67 @@
 #define DMA_MODE_CHAN_SELECT_MASK (0x3)
 #define DMA_MODE_CHAN_SELECT_SHIFT (0)
+#define DMA_MODE_CHAN_TO_REG(x) \
+    (((x % 4) & DMA_MODE_CHAN_SELECT_MASK) << DMA_MODE_CHAN_SELECT_SHIFT)
 #define DMA_MODE_CHAN_TRA_MASK (0x3)
 #define DMA_MODE_CHAN_TRA_SHIFT (2)
 #define DMA_MODE_CHAN_TRA_SELF_TEST (0)
-#define DMA_MODE_CHAN_TRA_WRITE (1)
-#define DMA_MODE_CHAN_TRA_READ (2)
+#define DMA_MODE_CHAN_TRA_WRITE (0x1)
+#define DMA_MODE_CHAN_TRA_READ (0x2)
 #define DMA_MODE_CHAN_AUTO_FLAG (1 << 4)
 #define DMA_MODE_CHAN_DOWN_FLAG (1 << 5)
@@ -216 +218 @@
         if (channel == 0 || channel == 4)
                 return ENOTSUP;
-
         if (channel > 7)
                 return ENOENT;
@@ -267 +268 @@
 }
 /*----------------------------------------------------------------------------*/
-int dma_prepare_channel(unsigned channel, bool write, transfer_mode_t mode)
+int dma_prepare_channel(
+    unsigned channel, bool write, bool auto_mode, transfer_mode_t mode)
 {
+        if (channel == 0 || channel == 4)
+                return ENOTSUP;
+        if (channel > 7)
+                return ENOENT;
+
         if (!controller_8237.initialized)
                 return EIO;
 
-        return ENOTSUP;
+        dma_channel_t dma_channel = controller_8237.channels[channel];
+
+        /* Mask DMA request */
+        uint8_t value = DMA_SINGLE_MASK_CHAN_TO_REG(channel)
+            | DMA_SINGLE_MASK_MASKED_FLAG;
+        pio_write_8(dma_channel.single_mask_address, value);
+
+        /* Set DMA mode */
+        value = DMA_MODE_CHAN_TO_REG(channel)
+            | ((write ? DMA_MODE_CHAN_TRA_WRITE : DMA_MODE_CHAN_TRA_READ)
+                << DMA_MODE_CHAN_TRA_SHIFT)
+            | (auto_mode ? DMA_MODE_CHAN_AUTO_FLAG : 0)
+            | (mode << DMA_MODE_CHAN_MOD_SHIFT);
+        pio_write_8(dma_channel.mode_address, value);
+
+        /* Unmask DMA request */
+        value = DMA_SINGLE_MASK_CHAN_TO_REG(channel);
+        pio_write_8(dma_channel.single_mask_address, value);
+
+        return EOK;
 }
 /**

uspace/drv/audio/sb16/dma_controller.h

@@ -45 +45 @@
 int dma_setup_channel(unsigned channel, uintptr_t pa, size_t size);
 
-int dma_prepare_channel(unsigned channel, bool write, transfer_mode_t mode);
+int dma_prepare_channel(
+    unsigned channel, bool write, bool auto_mode, transfer_mode_t mode);
 
 #endif

uspace/drv/audio/sb16/dsp.c

@@ -99 +99 @@
 
         const uintptr_t pa = addr_to_phys(buffer);
+        /* Set 16 bit channel */
         const int ret = dma_setup_channel(SB_DMA_CHAN_16, pa, PAGE_SIZE);
         if (ret == EOK) {
@@ -104 +105 @@
                 dsp->buffer.buffer_position = buffer;
                 dsp->buffer.buffer_size = PAGE_SIZE;
+                dma_prepare_channel(SB_DMA_CHAN_16, false, true, BLOCK_DMA);
+                /* Set 8bit channel */
+                const int ret = dma_setup_channel(SB_DMA_CHAN_8, pa, PAGE_SIZE);
+                if (ret == EOK) {
+                        dma_prepare_channel(
+                            SB_DMA_CHAN_8, false, true, BLOCK_DMA);
+                }
         } else {
                 ddf_log_error("Failed to setup DMA buffer %s.\n",
@@ -110 +118 @@
         }
         return ret;
+}
+/*----------------------------------------------------------------------------*/
+static inline void sb_clear_buffer(sb_dsp_t *dsp)
+{
+        free24(dsp->buffer.buffer_data);
+        dsp->buffer.buffer_data = NULL;
+        dsp->buffer.buffer_position = NULL;
+        dsp->buffer.buffer_size = 0;
 }
 /*----------------------------------------------------------------------------*/
@@ -155 +171 @@
 /*----------------------------------------------------------------------------*/
 int sb_dsp_play(sb_dsp_t *dsp, const uint8_t *data, size_t size,
-    unsigned sampling_rate, unsigned channels, unsigned bit_depth)
+    uint16_t sampling_rate, unsigned channels, unsigned bit_depth)
 {
         assert(dsp);

uspace/drv/audio/sb16/dsp.h

@@ -57 +57 @@
     unsigned sample_rate, unsigned channels, unsigned bit_depth);
 int sb_dsp_play(sb_dsp_t *dsp, const uint8_t *data, size_t size,
-    unsigned sample_rate, unsigned channels, unsigned bit_depth);
+    uint16_t sample_rate, unsigned channels, unsigned bit_depth);
 
 #endif