Changeset 15d0046 in mainline for uspace/drv/audio/sb16/mixer_iface.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

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)
 {
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
+
         if (name)
                 *name = sb_mixer_type_str(mixer->type);
@@ -54 +61 @@
     unsigned *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);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
+        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)
 {
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
         return sb_mixer_set_control_item_value(mixer, item, value);
 }
@@ -71 +73 @@
 static int sb_get_item_level(ddf_fun_t *fun, unsigned item, unsigned *value)
 {
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
         return sb_mixer_get_control_item_value(mixer, item, value);
 }