Changeset 1912b45 in mainline for uspace/drv/audio/sb16/mixer_iface.c

Timestamp:

2013-04-10T20:52:26Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5b77efc

Parents:

8a7d78cc

Message:

Make pcm control iface generic

File:

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

uspace/drv/audio/sb16/mixer_iface.c

@@ -50 +50 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static int sb_get_item_info(ddf_fun_t *fun, unsigned item, const char** name,
-    unsigned *channels)
+    unsigned *max_level)
 {
         assert(fun);
@@ -58 +58 @@
         assert(mixer);
         return
-            sb_mixer_get_control_item_info(mixer, item, name, channels);
+            sb_mixer_get_control_item_info(mixer, item, name, max_level);
 }
-/*----------------------------------------------------------------------------*/
-static int sb_get_channel_info(ddf_fun_t *fun, unsigned item, unsigned channel,
-    const char** name, unsigned *levels)
+
+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);
-        return sb_mixer_get_channel_info(mixer, item, channel, name, levels);
+        return sb_mixer_set_control_item_value(mixer, item, value);
 }
-/*----------------------------------------------------------------------------*/
-static int sb_channel_mute_set(ddf_fun_t *fun, unsigned item, unsigned channel,
-    bool mute)
-{
-        return ENOTSUP;
-}
-/*----------------------------------------------------------------------------*/
-static int sb_channel_mute_get(ddf_fun_t *fun, unsigned item, unsigned channel,
-    bool *mute)
-{
-        *mute = false;
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static int sb_channel_volume_set(ddf_fun_t *fun, unsigned item, unsigned channel,
-    unsigned volume)
+
+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);
-        return sb_mixer_set_volume_level(mixer, item, channel, volume);
-}
-/*----------------------------------------------------------------------------*/
-static int sb_channel_volume_get(ddf_fun_t *fun, unsigned item, unsigned channel,
-    unsigned *level, unsigned *max)
-{
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
-        unsigned levels;
-        const int ret =
-            sb_mixer_get_channel_info(mixer, item, channel, NULL, &levels);
-        if (ret == EOK && max)
-                *max = --levels;
-        if (ret == EOK && level)
-                *level = sb_mixer_get_volume_level(mixer, item, channel);
-
-        return ret;
+        return sb_mixer_get_control_item_value(mixer, item, value);
 }
 
@@ -112 +80 @@
         .get_info = sb_get_info,
         .get_item_info = sb_get_item_info,
-        .get_channel_info = sb_get_channel_info,
 
-        .channel_mute_set = sb_channel_mute_set,
-        .channel_mute_get = sb_channel_mute_get,
-
-        .channel_volume_set = sb_channel_volume_set,
-        .channel_volume_get = sb_channel_volume_get,
-
+        .get_item_level = sb_get_item_level,
+        .set_item_level = sb_set_item_level,
 };
 /**