Changeset 00006e0 in mainline

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2f7042e

Parents:

bd250b0f

Message:

audio: Allow client to specify buffer size.

Location:

uspace

Files:

• drv/audio/sb16/dsp.c (modified) (3 diffs)
• lib/drv/generic/remote_audio_pcm_buffer.c (modified) (4 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;

uspace/lib/drv/generic/remote_audio_pcm_buffer.c

@@ -34 +34 @@
 #include <async.h>
 #include <errno.h>
-#include <assert.h>
 #include <str.h>
 #include <as.h>
@@ -85 +84 @@
     unsigned *id)
 {
-        if (!exch || !buffer || !size)
-                return EINVAL;
-        sysarg_t buffer_size, buffer_id;
-        const int ret = async_req_1_2(exch,
+        if (!exch || !buffer || !size || !id)
+                return EINVAL;
+
+        sysarg_t buffer_size = *size, buffer_id = 0;
+        const int ret = async_req_2_2(exch,
             DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_GET_BUFFER,
-            &buffer_size, &buffer_id);
+            (sysarg_t)buffer_size, &buffer_size, &buffer_id);
         if (ret == EOK) {
                 void *dst = NULL;
-                const int ret =
-                    async_share_in_start_0_0(exch, buffer_size, &dst);
+                // FIXME Do we need to know the flags?
+                const int ret = async_share_in_start_0_0(exch, buffer_size, &dst);
                 if (ret != EOK) {
                         return ret;
@@ -100 +100 @@
                 *buffer = dst;
                 *size = buffer_size;
-        }
-        if (ret == EOK && id)
                 *id = buffer_id;
+        }
         return ret;
 }
@@ -219 +218 @@
         }
         void *buffer = NULL;
-        size_t size = 0;
+        size_t size = DEV_IPC_GET_ARG1(*call);
         unsigned id = 0;
         const int ret = pcm_iface->get_buffer(fun, &buffer, &size, &id);