Changeset e172429 in mainline

Timestamp:

2017-12-08T21:03:35Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

86bbca4

Parents:

a99cbc1e

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 02:50:42)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Let audio_pcm_query_cap() return value separately from error code.

Location:

uspace

Files:

• app/wavplay/dplay.c (modified) (2 diffs)
• app/wavplay/drec.c (modified) (3 diffs)
• lib/drv/generic/remote_audio_pcm.c (modified) (1 diff)
• lib/drv/include/audio_pcm_iface.h (modified) (1 diff)
• srv/audio/hound/audio_device.c (modified) (2 diffs)

uspace/app/wavplay/dplay.c

@@ -345 +345 @@
         }
         printf("Playing on device: %s.\n", device);
-        if (audio_pcm_query_cap(session, AUDIO_CAP_PLAYBACK) <= 0) {
+        sysarg_t val;
+        ret = audio_pcm_query_cap(session, AUDIO_CAP_PLAYBACK, &val);
+        if (ret != EOK || !val) {
                 printf("Device %s does not support playback\n", device);
                 ret = ENOTSUP;
@@ -386 +388 @@
                 goto cleanup;
         }
-        if (audio_pcm_query_cap(pb.device, AUDIO_CAP_BUFFER_POS) > 0) {
+        ret = audio_pcm_query_cap(pb.device, AUDIO_CAP_BUFFER_POS, &val);
+        if (ret == EOK && val) {
                 play(&pb);
         } else {
-                if (audio_pcm_query_cap(pb.device, AUDIO_CAP_INTERRUPT) > 0)
+                ret = audio_pcm_query_cap(pb.device, AUDIO_CAP_INTERRUPT, &val);
+                if (ret == EOK && val)
                         play_fragment(&pb);
                 else

uspace/app/wavplay/drec.c

@@ -176 +176 @@
         int ret = EOK;
         audio_pcm_sess_t *session = NULL;
+        sysarg_t val;
         if (str_cmp(device, "default") == 0) {
                 session = audio_pcm_open_default();
@@ -186 +187 @@
         }
         printf("Recording on device: %s.\n", device);
-        if (audio_pcm_query_cap(session, AUDIO_CAP_CAPTURE) <= 0) {
+        ret = audio_pcm_query_cap(session, AUDIO_CAP_CAPTURE, &val);
+        if (ret != EOK || !val) {
                 printf("Device %s does not support recording\n", device);
                 ret = ENOTSUP;
@@ -225 +227 @@
                 goto cleanup;
         }
-        if (audio_pcm_query_cap(rec.device, AUDIO_CAP_INTERRUPT) > 0)
+        ret = audio_pcm_query_cap(rec.device, AUDIO_CAP_INTERRUPT, &val);
+        if (ret == EOK && val)
                 record_fragment(&rec, format);
         else

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -221 +221 @@
  * @param sess Audio device session.
  * @param cap  Audio device capability.
- * @param val  Place to store queried value.
- *
- * @return Error code.
- */
-int audio_pcm_query_cap(audio_pcm_sess_t *sess, audio_cap_t cap)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        sysarg_t value = 0;
+ * @param[out] val  Place to store queried value.
+ *
+ * @return Error code.
+ */
+int audio_pcm_query_cap(audio_pcm_sess_t *sess, audio_cap_t cap, sysarg_t *value)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
         const int ret = async_req_2_1(exch,
             DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_QUERY_CAPS,
-            cap, &value);
-        async_exchange_end(exch);
-        if (ret == EOK)
-                return value;
+            cap, value);
+        async_exchange_end(exch);
         return ret;
 }

uspace/lib/drv/include/audio_pcm_iface.h

@@ -83 +83 @@
 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);
+int audio_pcm_query_cap(audio_pcm_sess_t *, audio_cap_t, sysarg_t *);
 int audio_pcm_register_event_callback(audio_pcm_sess_t *,
     async_port_handler_t, void *);

uspace/srv/audio/hound/audio_device.c

@@ -121 +121 @@
 {
         assert(dev);
-        if (audio_pcm_query_cap(dev->sess, AUDIO_CAP_CAPTURE))
+        sysarg_t val;
+        int rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_CAPTURE, &val);
+        if (rc == EOK && val)
                 return &dev->source;
         return NULL;
@@ -135 +137 @@
 {
         assert(dev);
-        if (audio_pcm_query_cap(dev->sess, AUDIO_CAP_PLAYBACK))
+        sysarg_t val;
+        int rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_PLAYBACK, &val);
+        if (rc == EOK && val)
                 return &dev->sink;
         return NULL;