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

Timestamp:

2014-07-21T22:10:18Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

1f1fa64

Parents:

96e368a (diff), 54a1ca7 (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:

• Merged mainline changes
• Refactored rtl8169 driver to work with recent driver framework changes
• Fixed speed selection in rtl8169 (disables autonegotiation first)
• Added support for restarting autonegotiation
• Added new switch to 'nic' utility which restarts autonegotiation

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;
 }