Changeset 7257eea6 in mainline for uspace/drv/audio/sb16/dsp.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/dsp.c (modified) (4 diffs)

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);