Changeset c7325dd6 in mainline

Timestamp:

2011-09-26T09:57:01Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

050d4fa

Parents:

b3f36d2

Message:

sb16: set Master channel to max on init.

Location:

uspace/drv/audio/sb16

Files:

• mixer.c (modified) (1 diff)
• sb16.c (modified) (1 diff)

uspace/drv/audio/sb16/mixer.c

@@ -114 +114 @@
 void mixer_load_volume_levels(sb16_regs_t *regs, mixer_type_t type)
 {
-        /* Default values are ok for now */
+        /* Set Master to maximum */
+        if (!mixer_get_control_item_count(type))
+                return;
+        unsigned levels = 0, channels = 0, current_level;
+        const char *name = NULL;
+        mixer_get_control_item_info(type, 0, &name, &channels, &levels);
+        unsigned channel = 0;
+        for (;channel < channels; ++channel) {
+                current_level =
+                    mixer_get_volume_level(regs, type, 0, channel);
+                ddf_log_note("Setting %s channel %d to %d (%d).\n",
+                    name, channel, levels - 1, current_level);
+
+                mixer_set_volume_level(regs, type, 0, channel, levels - 1);
+
+                current_level =
+                    mixer_get_volume_level(regs, type, 0, channel);
+                ddf_log_note("%s channel %d set to %d.\n",
+                    name, channel, current_level);
+        }
+
 }
 /*----------------------------------------------------------------------------*/
 void mixer_store_volume_levels(sb16_regs_t *regs, mixer_type_t type)
 {
-        /* Default values are ok for now */
+        /* No place to store the values. */
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/audio/sb16/sb16.c

@@ -100 +100 @@
                 return ret;
         }
+        mixer_load_volume_levels(drv->regs, drv->mixer);
         ddf_log_note("Initialized mixer: %s.\n", mixer_type_to_str(drv->mixer));