Changeset 2e01b3f in mainline

Timestamp:

2012-07-19T17:43:47Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f0241bda

Parents:

c5cbc1b7

Message:

libdrv: Add method to query audio capabilities.

Location:

uspace/lib/drv

Files:

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

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -45 +45 @@
 typedef enum {
         IPC_M_AUDIO_PCM_GET_INFO_STR,
+        IPC_M_AUDIO_PCM_QUERY_CAPS,
         IPC_M_AUDIO_PCM_TEST_FORMAT,
         IPC_M_AUDIO_PCM_GET_BUFFER,
@@ -104 +105 @@
         }
         async_exchange_end(exch);
+        return ret;
+}
+
+int audio_pcm_query_cap(audio_pcm_sess_t *sess, audio_cap_t cap, unsigned *val)
+{
+        if (!val)
+                return EINVAL;
+        async_exch_t *exch = async_exchange_begin(sess);
+        sysarg_t value = *val;
+        const int ret = async_req_2_1(exch,
+            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_QUERY_CAPS,
+            value, &value);
+        if (ret == EOK)
+                *val = value;
         return ret;
 }
@@ -232 +247 @@
  */
 static void remote_audio_pcm_get_info_str(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_audio_pcm_query_caps(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 *);
@@ -243 +259 @@
 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_QUERY_CAPS] = remote_audio_pcm_query_caps,
         [IPC_M_AUDIO_PCM_TEST_FORMAT] = remote_audio_pcm_test_format,
         [IPC_M_AUDIO_PCM_GET_BUFFER] = remote_audio_pcm_get_buffer,
@@ -288 +305 @@
 }
 
-static void remote_audio_pcm_test_format(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
+void remote_audio_pcm_query_caps(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
+{
+        const audio_pcm_iface_t *pcm_iface = iface;
+        const audio_cap_t cap = DEV_IPC_GET_ARG1(*call);
+        if (pcm_iface->query_cap) {
+                const unsigned value = pcm_iface->query_cap(fun, cap);
+                async_answer_1(callid, EOK, value);
+        } else {
+                async_answer_0(callid, ENOTSUP);
+        }
+}
+
+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;

uspace/lib/drv/include/audio_pcm_iface.h

@@ -44 +44 @@
 #include "ddf/driver.h"
 
+typedef enum {
+        AUDIO_CAP_RECORD,
+        AUDIO_CAP_PLAYBACK,
+        AUDIO_CAP_MAX_BUFFER,
+        AUDIO_CAP_BUFFER_POS,
+        AUDIO_CAP_INTERRUPT,
+        AUDIO_CAP_INTERRUPT_MIN_FRAMES,
+        AUDIO_CAP_INTERRUPT_MAX_FRAMES,
+} audio_cap_t;
+
 enum {
         PCM_EVENT_FRAMES_PLAYED = IPC_FIRST_USER_METHOD,
@@ -60 +70 @@
 int audio_pcm_test_format(audio_pcm_sess_t *, unsigned *, unsigned *,
     pcm_sample_format_t *);
+int audio_pcm_query_cap(audio_pcm_sess_t *, audio_cap_t, unsigned *);
 
 int audio_pcm_get_buffer(audio_pcm_sess_t *, void **, size_t *,
@@ -78 +89 @@
         int (*test_format)(ddf_fun_t *, unsigned *, unsigned *,
             pcm_sample_format_t *);
+        unsigned (*query_cap)(ddf_fun_t *, audio_cap_t);
         int (*get_buffer)(ddf_fun_t *, void **, size_t *);
         int (*release_buffer)(ddf_fun_t *);