Changeset 63c34d7 in mainline

Timestamp:

2012-07-15T18:35:41Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b7c080c

Parents:

5cd5079

Message:

libdrv/audio: Add 'test_format' call.

Location:

uspace/lib/drv

Files:

• generic/remote_audio_pcm.c (modified) (5 diffs)
• include/audio_pcm_iface.h (modified) (2 diffs)

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -45 +45 @@
 typedef enum {
         IPC_M_AUDIO_PCM_GET_INFO_STR,
+        IPC_M_AUDIO_PCM_TEST_FORMAT,
         IPC_M_AUDIO_PCM_GET_BUFFER,
         IPC_M_AUDIO_PCM_RELEASE_BUFFER,
@@ -106 +107 @@
 }
 
+int audio_pcm_test_format(audio_pcm_sess_t *sess, unsigned *channels,
+    unsigned *rate, pcm_sample_format_t *format)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        sysarg_t channels_arg = channels ? *channels : 0;
+        sysarg_t rate_arg = rate ? *rate : 0;
+        sysarg_t format_arg = format ? *format : 0;
+        const int ret = async_req_4_3(exch,
+            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE),
+            IPC_M_AUDIO_PCM_TEST_FORMAT, channels_arg, rate_arg, format_arg,
+            &channels_arg, &rate_arg, &format_arg);
+        async_exchange_end(exch);
+
+        /* All OK or something has changed. Verify that it was not one of the
+         * params we care about */
+        if ((ret == EOK || ret == ELIMIT)
+            && (!channels || *channels == channels_arg)
+            && (!rate || *rate == rate_arg)
+            && (!format || *format == format_arg))
+                return EOK;
+        if (channels)
+                *channels = channels_arg;
+        if (rate)
+                *rate = rate_arg;
+        if (format)
+                *format = format_arg;
+        return ret;
+}
+
 int audio_pcm_get_buffer(audio_pcm_sess_t *sess, void **buffer, size_t *size,
     async_client_conn_t event_rec, void* arg)
@@ -202 +232 @@
  */
 static void remote_audio_pcm_get_info_str(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_audio_pcm_test_format(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_audio_pcm_get_buffer(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_audio_pcm_release_buffer(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -212 +243 @@
 static remote_iface_func_ptr_t remote_audio_pcm_iface_ops[] = {
         [IPC_M_AUDIO_PCM_GET_INFO_STR] = remote_audio_pcm_get_info_str,
+        [IPC_M_AUDIO_PCM_TEST_FORMAT] = remote_audio_pcm_test_format,
         [IPC_M_AUDIO_PCM_GET_BUFFER] = remote_audio_pcm_get_buffer,
         [IPC_M_AUDIO_PCM_RELEASE_BUFFER] = remote_audio_pcm_release_buffer,
@@ -254 +286 @@
                 async_data_read_finalize(name_id, name, name_size);
         }
+}
+
+static void remote_audio_pcm_test_format(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
+{
+        const audio_pcm_iface_t *pcm_iface = iface;
+        unsigned channels = DEV_IPC_GET_ARG1(*call);
+        unsigned rate = DEV_IPC_GET_ARG2(*call);
+        pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call);
+        const int ret = pcm_iface->test_format ?
+            pcm_iface->test_format(fun, &channels, &rate, &format) : ENOTSUP;
+        async_answer_3(callid, ret, channels, rate, format);
 }
 

uspace/lib/drv/include/audio_pcm_iface.h

@@ -58 +58 @@
 
 int audio_pcm_get_info_str(audio_pcm_sess_t *, const char **);
+int audio_pcm_test_format(audio_pcm_sess_t *, unsigned *, unsigned *,
+    pcm_sample_format_t *);
+
 int audio_pcm_get_buffer(audio_pcm_sess_t *, void **, size_t *,
     async_client_conn_t, void *);
@@ -73 +76 @@
 typedef struct {
         int (*get_info_str)(ddf_fun_t *, const char **);
+        int (*test_format)(ddf_fun_t *, unsigned *, unsigned *,
+            pcm_sample_format_t *);
         int (*get_buffer)(ddf_fun_t *, void **, size_t *);
         int (*release_buffer)(ddf_fun_t *);