Changeset 485a496 in mainline

Timestamp:

2011-11-25T23:25:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

80b9ab3

Parents:

deff6b4

Message:

sb16: Don't set master level to max on startup.

Now we have an app to control volume levels.

File:

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

uspace/drv/audio/sb16/mixer.c

@@ -138 +138 @@
             sizeof(volume_ct1745) / sizeof(volume_item_t), volume_ct1745 },
 };
-
-static void sb_mixer_max_master_levels(sb_mixer_t *mixer)
-{
-        assert(mixer);
-        /* Set Master to maximum */
-        if (!sb_mixer_get_control_item_count(mixer))
-                return;
-        const unsigned item = 0; /* 0 is Master. */
-        unsigned  channels = 0;
-        const char *name = NULL;
-
-        sb_mixer_get_control_item_info(mixer, item, &name, &channels);
-        for (unsigned channel = 0; channel < channels; ++channel) {
-                unsigned levels = 0;
-                const int ret = sb_mixer_get_channel_info(mixer, item, channel,
-                    NULL, &levels);
-                if (ret != EOK)
-                        continue;
-
-                unsigned level =
-                    sb_mixer_get_volume_level(mixer, item, channel);
-                ddf_log_note("Setting %s channel %d to %d (%d).\n",
-                    name, channel, levels - 1, level);
-
-                sb_mixer_set_volume_level(mixer, item, channel, levels - 1);
-
-                level = sb_mixer_get_volume_level(mixer, item, channel);
-                ddf_log_note("%s channel %d set to %d.\n",
-                    name, channel, level);
-        }
-}
 /*----------------------------------------------------------------------------*/
 const char * sb_mixer_type_str(sb_mixer_type_t type)
@@ -192 +161 @@
                 pio_write_8(&regs->mixer_address, MIXER_RESET_ADDRESS);
                 pio_write_8(&regs->mixer_data, 1);
-                sb_mixer_max_master_levels(mixer);
         }
         pio_write_8(&regs->mixer_address, MIXER_PNP_IRQ_ADDRESS);
@@ -268 +236 @@
         value |= level << chan->shift;
         pio_write_8(&mixer->regs->mixer_data, value);
+        ddf_log_note("Channel %s %s volume set to: %u.\n",
+            volume_table[mixer->type].table[index].description,
+            chan->name, level);
         return EOK;
 }