Changeset 03362fbd in mainline for uspace/drv/audio/sb16/pcm_iface.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/pcm_iface.c (modified) (1 diff)

uspace/drv/audio/sb16/pcm_iface.c

@@ -43 +43 @@
 {
         assert(fun);
-        assert(fun->driver_data);
-        return fun->driver_data;
+        sb_dsp_t *dsp = ddf_fun_data_get(fun);
+        assert(dsp);
+        return dsp;
 }