Changeset 43dec08 in mainline

Timestamp:

2011-12-05T00:51:42Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e44385d

Parents:

c09ad29e

Message:

sb16, dsp: Add external buffer manipulation.

Location:

uspace/drv/audio/sb16

Files:

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

uspace/drv/audio/sb16/dsp.c

@@ -45 +45 @@
 #include "dsp.h"
 
+#define BUFFER_ID 1
 #define BUFFER_SIZE (PAGE_SIZE)
 #define PLAY_BLOCK_SIZE (BUFFER_SIZE / 2)
@@ -146 +147 @@
 }
 /*----------------------------------------------------------------------------*/
-static inline size_t sample_count(uint8_t mode, size_t byte_count)
-{
-        // FIXME we only support 16 bit playback for now.
-        return byte_count / 2;
-
-        if (mode & DSP_MODE_SIGNED) {
+static inline size_t sample_count(unsigned sample_size, size_t byte_count)
+{
+        if (sample_size == 16) {
                 return byte_count / 2;
         }
@@ -189 +187 @@
 void sb_dsp_interrupt(sb_dsp_t *dsp)
 {
+#if 0
         assert(dsp);
         const size_t remain_size =
@@ -232 +231 @@
         sb_dsp_write(dsp, (samples - 1) >> 8);
 #endif
-
+#endif
 }
 /*----------------------------------------------------------------------------*/
@@ -282 +281 @@
                 dsp->playing.mode |= DSP_MODE_STEREO;
 
-        const size_t samples = sample_count(dsp->playing.mode, play_size);
+        const size_t samples = sample_count(sample_size, play_size);
 
         ddf_log_debug("Playing %s sound: %zu(%zu) bytes => %zu samples.\n",
@@ -313 +312 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size, unsigned *id)
+{
+        assert(dsp);
+        const int ret = sb_setup_buffer(dsp);
+        ddf_log_debug("Providing buffer(%u): %p, %zu.\n",
+            BUFFER_ID, dsp->buffer.data, dsp->buffer.size);
+        if (ret == EOK && buffer)
+                *buffer = dsp->buffer.data;
+        if (ret == EOK && size)
+                *size = dsp->buffer.size;
+        if (ret == EOK && id)
+                *id = BUFFER_ID;
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
+int sb_dsp_release_buffer(sb_dsp_t *dsp, unsigned id)
+{
+        assert(dsp);
+        if (id != BUFFER_ID)
+                return ENOENT;
+        sb_clear_buffer(dsp);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned id, unsigned sampling_rate,
+    unsigned sample_size, unsigned channels, bool sign)
+{
+        assert(dsp);
+
+        /* Check supported parameters */
+        ddf_log_debug("Starting playback on buffer(%u): rate: %u, size: %u, "
+            " channels: %u, signed: %s.\n", id, sampling_rate, sample_size,
+            channels, sign ? "YES" : "NO" );
+        if (id != BUFFER_ID)
+                return ENOENT;
+        if (sample_size != 16) // FIXME We only support 16 bit playback
+                return ENOTSUP;
+        if (channels != 1 && channels != 2)
+                return ENOTSUP;
+        if (sampling_rate > 44100)
+                return ENOTSUP;
+
+
+        sb_dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
+        sb_dsp_write(dsp, sampling_rate >> 8);
+        sb_dsp_write(dsp, sampling_rate & 0xff);
+
+        ddf_log_debug("Sampling rate: %hhx:%hhx.\n",
+            sampling_rate >> 8, sampling_rate & 0xff);
+
+#ifdef AUTO_DMA_MODE
+        sb_dsp_write(dsp, AUTO_DMA_16B_DA_FIFO);
+#else
+        sb_dsp_write(dsp, SINGLE_DMA_16B_DA_FIFO);
+#endif
+
+        const uint8_t mode =
+            (sign ? DSP_MODE_SIGNED : 0) | (channels == 2 ? DSP_MODE_STEREO : 0);
+        sb_dsp_write(dsp, mode);
+
+        const uint16_t samples = sample_count(sample_size, PLAY_BLOCK_SIZE);
+        sb_dsp_write(dsp, (samples - 1) & 0xff);
+        sb_dsp_write(dsp, (samples - 1) >> 8);
+
+        return EOK;
+        return ENOTSUP;
+}
+/*----------------------------------------------------------------------------*/
+int sb_dsp_stop_playback(sb_dsp_t *dsp, unsigned id)
+{
+        assert(dsp);
+        if (id != BUFFER_ID)
+                return ENOENT;
+        sb_dsp_write(dsp, DMA_16B_EXIT);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+int sb_dsp_start_record(sb_dsp_t *dsp, unsigned id, unsigned sample_rate,
+    unsigned sample_size, unsigned channels, bool sign)
+{
+        return ENOTSUP;
+}
+/*----------------------------------------------------------------------------*/
+int sb_dsp_stop_record(sb_dsp_t *dsp, unsigned id)
+{
+        return ENOTSUP;
+}
 /**
  * @}

uspace/drv/audio/sb16/dsp.h

@@ -71 +71 @@
     uint16_t sample_rate, unsigned channels, unsigned bit_depth);
 
+int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size, unsigned *id);
+int sb_dsp_release_buffer(sb_dsp_t *dsp, unsigned id);
+int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned id, unsigned sample_rate,
+    unsigned sample_size, unsigned channels, bool sign);
+int sb_dsp_stop_playback(sb_dsp_t *dsp, unsigned id);
+int sb_dsp_start_record(sb_dsp_t *dsp, unsigned id, unsigned sample_rate,
+    unsigned sample_size, unsigned channels, bool sign);
+int sb_dsp_stop_record(sb_dsp_t *dsp, unsigned id);
+
 #endif
 /**