Changeset 00006e0 in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2012-07-02T12:31:08Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial

Children:

2f7042e

Parents:

bd250b0f

Message:

audio: Allow client to specify buffer size.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -113 +113 @@
 }
 /*----------------------------------------------------------------------------*/
-static inline int sb_setup_buffer(sb_dsp_t *dsp)
-{
-        assert(dsp);
-        uint8_t *buffer = dma_create_buffer24(BUFFER_SIZE);
+static inline int sb_setup_buffer(sb_dsp_t *dsp, size_t size)
+{
+        assert(dsp);
+        if (size > BUFFER_SIZE || size == 0 || (size % 2) == 1)
+                size = BUFFER_SIZE;
+        uint8_t *buffer = dma_create_buffer24(size);
         if (buffer == NULL) {
                 ddf_log_error("Failed to allocate buffer.\n");
@@ -125 +127 @@
         assert(pa < (1 << 25));
         /* Set 16 bit channel */
-        const int ret = sb_setup_dma(dsp, pa, BUFFER_SIZE);
+        const int ret = sb_setup_dma(dsp, pa, size);
         if (ret == EOK) {
                 dsp->buffer.data = buffer;
-                dsp->buffer.size = BUFFER_SIZE;
-                bzero(buffer, BUFFER_SIZE);
+                dsp->buffer.size = size;
+                bzero(dsp->buffer.data, dsp->buffer.size);
         } else {
                 ddf_log_error("Failed to setup DMA16 channel %s.\n",
@@ -197 +199 @@
 {
         assert(dsp);
-        const int ret = sb_setup_buffer(dsp);
-        ddf_log_debug("Providing buffer(%u): %p, %zu.\n",
+        assert(size);
+
+        const int ret = sb_setup_buffer(dsp, *size);
+        ddf_log_debug("Providing buffer(%u): %p, %zu B.\n",
             BUFFER_ID, dsp->buffer.data, dsp->buffer.size);
+
         if (ret == EOK && buffer)
                 *buffer = dsp->buffer.data;