Changeset 03362fbd in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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 mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -34 +34 @@
 
 #include <as.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <ddi.h>
 #include <devman.h>
@@ -159 +159 @@
 {
         async_sess_t *sess = devman_parent_device_connect(EXCHANGE_ATOMIC,
-            dsp->sb_dev->handle, IPC_FLAG_BLOCKING);
+            ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
 
         const int ret = hw_res_dma_channel_setup(sess,
@@ -182 +182 @@
         }
 
-        ddf_log_verbose("Setup dma buffer at %p(%p).", buffer, pa, size);
+        ddf_log_verbose("Setup dma buffer at %p(%p) %zu.", buffer, pa, size);
         assert((uintptr_t)pa < (1 << 25));
 
@@ -301 +301 @@
         assert(dsp->buffer.data);
         async_sess_t *sess = devman_parent_device_connect(EXCHANGE_ATOMIC,
-            dsp->sb_dev->handle, IPC_FLAG_BLOCKING);
+            ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
 
         // TODO: Assumes DMA 16