Changeset 7257eea6 in mainline for uspace/drv/audio/sb16/dma_controller.c

Timestamp:

2011-10-21T19:01:15Z (14 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.

File:

• uspace/drv/audio/sb16/dma_controller.c (modified) (3 diffs)

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;
 }
 /**