Changeset 132ab5d1 in mainline for uspace/srv/audio/hound/audio_device.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/audio/hound/audio_device.c (modified) (3 diffs)

uspace/srv/audio/hound/audio_device.c

@@ -62 +62 @@
         assert(dev);
         /* we release buffer on stop so this should be enough */
-        return (bool)dev->buffer.base;
+        return dev->buffer.base != NULL;
 }
 
@@ -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;