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

uspace/srv/audio/hound/audio_data.c

@@ -35 +35 @@
 
 #include <macros.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "audio_data.h"
@@ -260 +260 @@
  * @param size Target buffer size.
  * @param format Target data format.
- * @return Size of the target buffer used, Error code on failure.
- */
-ssize_t audio_pipe_mix_data(audio_pipe_t *pipe, void *data,
+ * @return Size of the target buffer used.
+ */
+size_t audio_pipe_mix_data(audio_pipe_t *pipe, void *data,
     size_t size, const pcm_format_t *f)
 {