Changeset 01282fc in mainline

Timestamp:

2011-09-25T12:10:59Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7a0a0f5

Parents:

cf083e8

Message:

sb16: Add mixer stubs. Add mixer initialization.

Location:

uspace/drv/audio/sb16

Files:

• Makefile (modified) (1 diff)
• mixer.c (added)
• mixer.h (added)
• registers.h (modified) (1 diff)
• sb16.c (modified) (3 diffs)
• sb16.h (modified) (2 diffs)

uspace/drv/audio/sb16/Makefile

@@ -39 +39 @@
 SOURCES = \
         main.c \
+        mixer.c \
         sb16.c
 

uspace/drv/audio/sb16/registers.h

@@ -35 +35 @@
 #ifndef DRV_AUDIO_SB16_REGISTERS_H
 #define DRV_AUDIO_SB16_REGISTERS_H
+
+#include <ddi.h>
 
 typedef struct sb16_regs {

uspace/drv/audio/sb16/sb16.c

@@ -28 +28 @@
 
 #include <errno.h>
+#include <str_error.h>
 #include <libarch/ddi.h>
 
@@ -41 +42 @@
     { .cmdcount = 1, .cmds = (irq_cmd_t*)irq_cmds };
 
+static mixer_type_t mixer_type_by_dsp_version(unsigned major, unsigned minor)
+{
+        return SB_MIXER_UNKNOWN;
+}
 /*----------------------------------------------------------------------------*/
 irq_code_t * sb16_irq_code(void)
@@ -79 +84 @@
             drv->dsp_version.major, drv->dsp_version.minor);
 
+        /* Initialize mixer */
+        drv->mixer = mixer_type_by_dsp_version(
+            drv->dsp_version.major, drv->dsp_version.minor);
 
-        // TODO Initialize mixer
+        ret = mixer_init(drv->regs, drv->mixer);
+        if (ret != EOK) {
+                ddf_log_error("Failed to initialize SB mixer: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
+        ddf_log_note("Initialized mixer: %s.\n", mixer_type_to_str(drv->mixer));
+
         return EOK;
 }

uspace/drv/audio/sb16/sb16.h

@@ -38 +38 @@
 #include <ddf/driver.h>
 #include <ddi.h>
+
+#include "mixer.h"
 #include "registers.h"
 
@@ -47 +49 @@
                 uint8_t minor;
         } dsp_version;
+        mixer_type_t mixer;
 } sb16_drv_t;