Changeset b7f7183 in mainline

Timestamp:

2011-10-24T15:40:37Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7785e951

Parents:

b130d0e

Message:

sb16: Minor DMA changes.

Clear flip-flop by writing 0.
buffer size is limited to uint16_t.

Location:

uspace/drv/audio/sb16

Files:

• dma_controller.c (modified) (6 diffs)
• dma_controller.h (modified) (1 diff)

uspace/drv/audio/sb16/dma_controller.c

@@ -62 +62 @@
 #define DMA_SINGLE_MASK_CHAN_SEL_SHIFT (0)
 #define DMA_SINGLE_MASK_CHAN_TO_REG(x) \
-    (((x % 4) & DMA_SINGLE_MASK_CHAN_SEL_MASK) << DMA_SINGLE_MASK_CHAN_SEL_SHIFT)
+    ((x & DMA_SINGLE_MASK_CHAN_SEL_MASK) << DMA_SINGLE_MASK_CHAN_SEL_SHIFT)
 #define DMA_SINGLE_MASK_MASKED_FLAG (1 << 2)
 
@@ -69 +69 @@
 #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)
+    ((x & DMA_MODE_CHAN_SELECT_MASK) << DMA_MODE_CHAN_SELECT_SHIFT)
 #define DMA_MODE_CHAN_TRA_MASK (0x3)
 #define DMA_MODE_CHAN_TRA_SHIFT (2)
@@ -217 +217 @@
 }
 /*----------------------------------------------------------------------------*/
-int dma_setup_channel(unsigned channel, uintptr_t pa, size_t size)
+int dma_setup_channel(unsigned channel, uintptr_t pa, uint16_t size)
 {
         if (channel == 0 || channel == 4)
@@ -235 +235 @@
                 /* Size is the count of 16bit words */
                 assert(size % 2 == 0);
-                size /= 2;
+                size >>= 1;
                 /* Address is fun: lower 16bits need to be shifted by 1 */
                 pa = ((pa & 0xffff) >> 1) | (pa & 0xff0000);
@@ -250 +250 @@
 
         /* Set address -- reset flip-flop*/
-        pio_write_8(dma_channel.flip_flop_address, 1);
+        pio_write_8(dma_channel.flip_flop_address, 0);
 
         /* Low byte */
@@ -268 +268 @@
 
         /* Set size -- reset flip-flop */
-        pio_write_8(dma_channel.flip_flop_address, 1);
+        pio_write_8(dma_channel.flip_flop_address, 0);
 
         /* Low byte */

uspace/drv/audio/sb16/dma_controller.h

@@ -43 +43 @@
 } transfer_mode_t;
 
-int dma_setup_channel(unsigned channel, uintptr_t pa, size_t size);
+int dma_setup_channel(unsigned channel, uintptr_t pa, uint16_t size);
 
 int dma_prepare_channel(