Changeset 132ab5d1 in mainline for uspace/drv/audio/sb16/dsp.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/drv/audio/sb16/dsp.c (modified) (2 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -290 +290 @@
                 return 16535;
         default:
-                return ENOTSUP;
+                return -1;
         }
 }
@@ -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;
 }