Changeset c19a5a59 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:

c8211849

Parents:

f77c1c9

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 21:23:47)

git-committer:

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

Message:

Return value from hw_res_dma_channel_remain separately from error code.

Location:

uspace

Files:

• drv/audio/sb16/dsp.c (modified) (1 diff)
• lib/c/generic/device/hw_res.c (modified) (2 diffs)
• lib/c/include/device/hw_res.h (modified) (1 diff)

uspace/drv/audio/sb16/dsp.c

@@ -303 +303 @@
 
         // TODO: Assumes DMA 16
-        const int remain = hw_res_dma_channel_remain(sess, dsp->dma16_channel);
-        if (remain >= 0) {
+        size_t remain;
+        int rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain);
+        if (rc == EOK) {
                 *pos = dsp->buffer.size - remain;
-                return EOK;
-        }
-        return remain;
+        }
+        return rc;
 }
 

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

@@ -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;

uspace/lib/c/include/device/hw_res.h

@@ -123 +123 @@
 extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
     uint32_t, uint8_t);
-extern int hw_res_dma_channel_remain(async_sess_t *, unsigned);
+extern int hw_res_dma_channel_remain(async_sess_t *, unsigned, size_t *);
 
 #endif