Changeset 8e7c9fe in mainline for uspace/drv/audio/sb16/pcm_iface.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/drv/audio/sb16/pcm_iface.c (modified) (1 diff)

uspace/drv/audio/sb16/pcm_iface.c

@@ -39 +39 @@
 
 #include "dsp.h"
+#include "sb16.h"
 
-static inline sb_dsp_t * fun_to_dsp(ddf_fun_t *fun)
+static inline sb_dsp_t *fun_to_dsp(ddf_fun_t *fun)
 {
-        assert(fun);
-        sb_dsp_t *dsp = ddf_fun_data_get(fun);
-        assert(dsp);
-        return dsp;
+        sb16_t *sb = (sb16_t *)ddf_dev_data_get(ddf_fun_get_dev(fun));
+        return &sb->dsp;
 }