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

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -35 +35 @@
 #include <as.h>
 #include <stdbool.h>
-#include <ddf/driver.h>
 #include <ddi.h>
+#include <devman.h>
 #include <device/hw_res.h>
 #include <libarch/ddi.h>
@@ -75 +75 @@
                 [DSP_NO_BUFFER] = "NO BUFFER",
         };
-        if ((size_t)state < ARRAY_SIZE(state_names))
+        if (state < ARRAY_SIZE(state_names))
                 return state_names[state];
         return "UNKNOWN";
@@ -144 +144 @@
 {
         dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
-        uint8_t rate_lo = rate & 0xff;
-        uint8_t rate_hi = rate >> 8;
-        dsp_write(dsp, rate_hi);
-        dsp_write(dsp, rate_lo);
-        ddf_log_verbose("Sampling rate: %hhx:%hhx.", rate_hi, rate_lo);
+        dsp_write(dsp, rate >> 8);
+        dsp_write(dsp, rate & 0xff);
+        ddf_log_verbose("Sampling rate: %hhx:%hhx.", rate >> 8, rate & 0xff);
 }
 
@@ -161 +159 @@
 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);
-
-        return hw_res_dma_channel_setup(sess,
+        async_sess_t *sess = devman_parent_device_connect(
+            ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
+
+        const int ret = hw_res_dma_channel_setup(sess,
             dsp->dma16_channel, pa, size,
             DMA_MODE_READ | DMA_MODE_AUTO | DMA_MODE_ON_DEMAND);
+
+        async_hangup(sess);
+        return ret;
 }
 
@@ -200 +202 @@
         
         return ret;
+}
+
+static inline size_t sample_count(pcm_sample_format_t format, size_t byte_count)
+{
+        return byte_count / pcm_sample_format_size(format);
 }
 
@@ -300 +307 @@
 
         assert(dsp->buffer.data);
-        async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
+        async_sess_t *sess = devman_parent_device_connect(
+            ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
 
         // TODO: Assumes DMA 16
         const int remain = hw_res_dma_channel_remain(sess, dsp->dma16_channel);
+        async_hangup(sess);
         if (remain >= 0) {
                 *pos = dsp->buffer.size - remain;