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

Timestamp:

2011-09-26T15:24:48Z (13 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/sb16.c (modified) (3 diffs)

uspace/drv/audio/sb16/sb16.c

@@ -41 +41 @@
     { .cmdcount = 1, .cmds = (irq_cmd_t*)irq_cmds };
 
-static mixer_type_t mixer_type_by_dsp_version(unsigned major, unsigned minor)
+static inline sb_mixer_type_t sb_mixer_type_by_dsp_version(
+    unsigned major, unsigned minor)
 {
         switch (major)
@@ -91 +92 @@
 
         /* Initialize mixer */
-        const mixer_type_t mixer_type = mixer_type_by_dsp_version(
+        const sb_mixer_type_t mixer_type = sb_mixer_type_by_dsp_version(
             drv->dsp_version.major, drv->dsp_version.minor);
 
-        ret = mixer_init(&drv->mixer, drv->regs, mixer_type);
+        ret = sb_mixer_init(&drv->mixer, drv->regs, mixer_type);
         if (ret != EOK) {
                 ddf_log_error("Failed to initialize SB mixer: %s.\n",
@@ -101 +102 @@
         }
         ddf_log_note("Initialized mixer: %s.\n",
-            mixer_type_str(drv->mixer.type));
+            sb_mixer_type_str(drv->mixer.type));
 
         return EOK;