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

Timestamp:

2011-10-21T16:48:27Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9f351c8

Parents:

1a11a16

Message:

sb16: Add lazy buffer initialization.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -34 +34 @@
 
 #include <libarch/ddi.h>
+#include <str_error.h>
 
 #include "dma.h"
@@ -47 +48 @@
 
 #define DSP_RESET_RESPONSE 0xaa
+#define SB_DMA_CHAN_16 5
+#define SB_DMA_CHAN_8 1
 
 static inline int sb_dsp_read(sb_dsp_t *dsp, uint8_t *data)
@@ -90 +93 @@
 }
 /*----------------------------------------------------------------------------*/
+static inline int sb_setup_buffer(sb_dsp_t *dsp)
+{
+        assert(dsp);
+        uint8_t *buffer = malloc24(PAGE_SIZE);
+
+        const uintptr_t pa = addr_to_phys(buffer);
+        const int ret = dma_setup_channel(SB_DMA_CHAN_16, pa, PAGE_SIZE);
+        if (ret == EOK) {
+                dsp->buffer.buffer_data = buffer;
+                dsp->buffer.buffer_position = buffer;
+                dsp->buffer.buffer_size = PAGE_SIZE;
+        } else {
+                ddf_log_error("Failed to setup DMA buffer %s.\n",
+                    str_error(ret));
+                free24(buffer);
+        }
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
 int sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs)
 {
@@ -112 +134 @@
         sb_dsp_read(dsp, &dsp->version.major);
         sb_dsp_read(dsp, &dsp->version.minor);
-        return EOK;
+
+        return ret;
 }
 /*----------------------------------------------------------------------------*/
@@ -130 +153 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+int sb_dsp_play(sb_dsp_t *dsp, const uint8_t *data, size_t size,
+    unsigned sampling_rate, unsigned channels, unsigned bit_depth)
+{
+        assert(dsp);
+        if (!data)
+                return EOK;
+
+        /* Check supported parameters */
+        if (bit_depth != 8 && bit_depth != 16)
+                return ENOTSUP;
+        if (channels != 1 && channels != 2)
+                return ENOTSUP;
+
+        const int ret = sb_setup_buffer(dsp);
+
+        return ret;
+}
 /**
  * @}