Changeset 132ab5d1 in mainline for uspace/lib/c/generic/device/hw_res.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/lib/c/generic/device/hw_res.c (modified) (3 diffs)

uspace/lib/c/generic/device/hw_res.c

@@ -36 +36 @@
 #include <errno.h>
 #include <async.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 int hw_res_get_resource_list(async_sess_t *sess,
@@ -140 +140 @@
  * @param channel DMA channel.
  *
- * @return Number of bytes remaining in the buffer if positive.
- * @return Error code if negative.
+ * @param[out] rem Number of bytes remaining in the buffer if positive.
+ *
+ * @return Error code.
  *
  */
-int hw_res_dma_channel_remain(async_sess_t *sess, unsigned channel)
+int hw_res_dma_channel_remain(async_sess_t *sess, unsigned channel, size_t *rem)
 {
         async_exch_t *exch = async_exchange_begin(sess);
@@ -155 +156 @@
         
         if (ret == EOK)
-                return remain;
+                *rem = remain;
         
         return ret;