Changeset bde691c in mainline for uspace/drv/audio/sb16/mixer.c

Timestamp:

2011-09-26T15:24:48Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bf38143

Parents:

050d4fa

Message:

sb16: Add sb_ prefix to mixer functions and types.

File:

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

uspace/drv/audio/sb16/mixer.c

@@ -89 +89 @@
 };
 
-static void mixer_max_master_levels(sb_mixer_t *mixer)
+static void sb_mixer_max_master_levels(sb_mixer_t *mixer)
 {
         assert(mixer);
         /* Set Master to maximum */
-        if (!mixer_get_control_item_count(mixer))
+        if (!sb_mixer_get_control_item_count(mixer))
                 return;
         unsigned levels = 0, channels = 0, current_level;
         const char *name = NULL;
-        mixer_get_control_item_info(mixer, 0, &name, &channels, &levels);
+        sb_mixer_get_control_item_info(mixer, 0, &name, &channels, &levels);
         unsigned channel = 0;
         for (;channel < channels; ++channel) {
                 current_level =
-                    mixer_get_volume_level(mixer, 0, channel);
+                    sb_mixer_get_volume_level(mixer, 0, channel);
                 ddf_log_note("Setting %s channel %d to %d (%d).\n",
                     name, channel, levels - 1, current_level);
 
-                mixer_set_volume_level(mixer, 0, channel, levels - 1);
+                sb_mixer_set_volume_level(mixer, 0, channel, levels - 1);
 
                 current_level =
-                    mixer_get_volume_level(mixer, 0, channel);
+                    sb_mixer_get_volume_level(mixer, 0, channel);
                 ddf_log_note("%s channel %d set to %d.\n",
                     name, channel, current_level);
@@ -115 +115 @@
 }
 /*----------------------------------------------------------------------------*/
-const char * mixer_type_str(mixer_type_t type)
+const char * sb_mixer_type_str(sb_mixer_type_t type)
 {
         static const char * names[] = {
@@ -126 +126 @@
 }
 /*----------------------------------------------------------------------------*/
-int mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, mixer_type_t type)
+int sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type)
 {
         assert(mixer);
@@ -137 +137 @@
                 pio_write_8(&regs->mixer_address, CT_MIXER_RESET_ADDRESS);
                 pio_write_8(&regs->mixer_data, 1);
-                mixer_max_master_levels(mixer);
+                sb_mixer_max_master_levels(mixer);
         }
         return EOK;
 }
 /*----------------------------------------------------------------------------*/
-int mixer_get_control_item_count(const sb_mixer_t *mixer)
+int sb_mixer_get_control_item_count(const sb_mixer_t *mixer)
 {
         assert(mixer);
@@ -148 +148 @@
 }
 /*----------------------------------------------------------------------------*/
-int mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned index,
+int sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned index,
     const char** name, unsigned *channels, unsigned *levels)
 {
@@ -164 +164 @@
 }
 /*----------------------------------------------------------------------------*/
-int mixer_set_volume_level(const sb_mixer_t *mixer,
+int sb_mixer_set_volume_level(const sb_mixer_t *mixer,
     unsigned index, unsigned channel, unsigned level)
 {
@@ -194 +194 @@
 }
 /*----------------------------------------------------------------------------*/
-unsigned mixer_get_volume_level(const sb_mixer_t *mixer, unsigned index,
+unsigned sb_mixer_get_volume_level(const sb_mixer_t *mixer, unsigned index,
     unsigned channel)
 {