Changeset 132ab5d1 in mainline for uspace/srv/audio/hound/hound_ctx.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/hound_ctx.c (modified) (4 diffs)

uspace/srv/audio/hound/hound_ctx.c

@@ -35 +35 @@
  */
 
-#include <malloc.h>
 #include <macros.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <str_error.h>
 
@@ -340 +340 @@
 
         pcm_format_silence(data, size, &stream->format);
-        const int ret =
+        const size_t ret =
             audio_pipe_mix_data(&stream->fifo, data, size, &stream->format);
         fibril_mutex_unlock(&stream->guard);
-        if (ret == EOK)
+        if (ret > 0) {
                 fibril_condvar_signal(&stream->change);
-        return ret;
+                return EOK;
+        }
+        return EEMPTY;
 }
 
@@ -354 +356 @@
  * @param size Size of the @p data buffer.
  * @param format Destination data format.
- * @return Size of the destination buffer touch with stream's data,
- *         error code on failure.
- */
-ssize_t hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
+ * @return Size of the destination buffer touch with stream's data.
+ */
+size_t hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
     size_t size, const pcm_format_t *f)
 {
         assert(stream);
         fibril_mutex_lock(&stream->guard);
-        const int ret = audio_pipe_mix_data(&stream->fifo, data, size, f);
+        const size_t ret = audio_pipe_mix_data(&stream->fifo, data, size, f);
         fibril_condvar_signal(&stream->change);
         fibril_mutex_unlock(&stream->guard);
@@ -457 +458 @@
         list_foreach(sink->connections, source_link, connection_t, conn) {
                 /* This should not trigger data update on the source */
-                const size_t copied = connection_add_source_data(
+                connection_add_source_data(
                     conn, buffer, bsize, sink->format);
-                if (copied != bsize)
-                        log_error("Copied less than advertised data, "
-                            "something is wrong");
         }
         /* push to all streams */