Changes in uspace/drv/audio/sb16/dsp.c [b7fd2a0:53a309e] in mainline

File:

• uspace/drv/audio/sb16/dsp.c (modified) (17 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -89 +89 @@
 }
 
-static inline errno_t dsp_read(sb_dsp_t *dsp, uint8_t *data)
+static inline int dsp_read(sb_dsp_t *dsp, uint8_t *data)
 {
         assert(data);
@@ -106 +106 @@
 }
 
-static inline errno_t dsp_write(sb_dsp_t *dsp, uint8_t data)
+static inline int dsp_write(sb_dsp_t *dsp, uint8_t data)
 {
         assert(dsp);
@@ -159 +159 @@
 }
 
-static inline errno_t setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
+static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
 {
         async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
@@ -168 +168 @@
 }
 
-static inline errno_t setup_buffer(sb_dsp_t *dsp, size_t size)
+static inline int setup_buffer(sb_dsp_t *dsp, size_t size)
 {
         assert(dsp);
@@ -178 +178 @@
         void *buffer = AS_AREA_ANY;
         
-        errno_t ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff,
+        int ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff,
             AS_AREA_WRITE | AS_AREA_READ, 0, &pa, &buffer);
         if (ret != EOK) {
@@ -202 +202 @@
 }
 
-errno_t sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
+int sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
     int dma8, int dma16)
 {
@@ -215 +215 @@
         dsp_reset(dsp);
         uint8_t response;
-        const errno_t ret = dsp_read(dsp, &response);
+        const int ret = dsp_read(dsp, &response);
         if (ret != EOK) {
                 ddf_log_error("Failed to read DSP reset response value.");
@@ -290 +290 @@
                 return 16535;
         default:
-                return -1;
-        }
-}
-
-errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos)
+                return ENOTSUP;
+        }
+}
+
+int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos)
 {
         if (dsp->state == DSP_NO_BUFFER)
@@ -303 +303 @@
 
         // TODO: Assumes DMA 16
-        size_t remain;
-        errno_t rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain);
-        if (rc == EOK) {
+        const int remain = hw_res_dma_channel_remain(sess, dsp->dma16_channel);
+        if (remain >= 0) {
                 *pos = dsp->buffer.size - remain;
-        }
-        return rc;
-}
-
-errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
+                return EOK;
+        }
+        return remain;
+}
+
+int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
   pcm_sample_format_t *format)
 {
-        errno_t ret = EOK;
+        int ret = EOK;
         if (*channels == 0 || *channels > 2) {
                 *channels = 2;
@@ -336 +336 @@
 }
 
-errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session)
+int sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session)
 {
         assert(dsp);
@@ -353 +353 @@
 }
 
-errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size)
+int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size)
 {
         assert(dsp);
@@ -364 +364 @@
         assert(dsp->buffer.data == NULL);
 
-        const errno_t ret = setup_buffer(dsp, *size);
+        const int ret = setup_buffer(dsp, *size);
         if (ret == EOK) {
                 ddf_log_debug("Providing buffer: %p, %zu B.",
@@ -378 +378 @@
 }
 
-errno_t sb_dsp_release_buffer(sb_dsp_t *dsp)
+int sb_dsp_release_buffer(sb_dsp_t *dsp)
 {
         assert(dsp);
@@ -392 +392 @@
 }
 
-errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
+int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
@@ -441 +441 @@
 }
 
-errno_t sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate)
+int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate)
 {
         assert(dsp);
@@ -471 +471 @@
 }
 
-errno_t sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
+int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
@@ -517 +517 @@
 }
 
-errno_t sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate)
+int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate)
 {
         assert(dsp);