Changes in uspace/drv/audio/sb16/mixer_iface.c [9bd4615:1912b45] in mainline

File:

• uspace/drv/audio/sb16/mixer_iface.c (modified) (3 diffs)

uspace/drv/audio/sb16/mixer_iface.c

@@ -33 +33 @@
  */
 
-#include <ddf/driver.h>
 #include <errno.h>
 #include <audio_mixer_iface.h>
 
 #include "mixer.h"
-#include "sb16.h"
-
-static sb_mixer_t *fun_to_mixer(ddf_fun_t *fun)
-{
-        sb16_t *sb = (sb16_t *)ddf_dev_data_get(ddf_fun_get_dev(fun));
-        return &sb->mixer;
-}
 
 static int sb_get_info(ddf_fun_t *fun, const char** name, unsigned *items)
 {
-        sb_mixer_t *mixer = fun_to_mixer(fun);
-
+        assert(fun);
+        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
+        assert(mixer);
         if (name)
                 *name = sb_mixer_type_str(mixer->type);
@@ -61 +54 @@
     unsigned *max_level)
 {
-        sb_mixer_t *mixer = fun_to_mixer(fun);
-        return sb_mixer_get_control_item_info(mixer, item, name, max_level);
+        assert(fun);
+        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
+        assert(mixer);
+        return
+            sb_mixer_get_control_item_info(mixer, item, name, max_level);
 }
 
 static int sb_set_item_level(ddf_fun_t *fun, unsigned item, unsigned value)
 {
-        sb_mixer_t *mixer = fun_to_mixer(fun);
+        assert(fun);
+        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
+        assert(mixer);
         return sb_mixer_set_control_item_value(mixer, item, value);
 }
@@ -73 +71 @@
 static int sb_get_item_level(ddf_fun_t *fun, unsigned item, unsigned *value)
 {
-        sb_mixer_t *mixer = fun_to_mixer(fun);
+        assert(fun);
+        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
+        assert(mixer);
         return sb_mixer_get_control_item_value(mixer, item, value);
 }