Changeset 25c98a8e in mainline

Timestamp:

2011-11-25T22:11:00Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b67968c

Parents:

53a7fda

Message:

sb16: Implement audio mixer interface.

Move mixer fun creation and initialization to sb_init.

Location:

uspace/drv/audio/sb16

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (4 diffs)
• mixer_iface.c (added)
• sb16.c (modified) (4 diffs)

uspace/drv/audio/sb16/Makefile

@@ -42 +42 @@
         main.c \
         mixer.c \
+        mixer_iface.c \
         sb16.c
 

uspace/drv/audio/sb16/main.c

@@ -120 +120 @@
 
 
-        ddf_fun_t *dsp_fun = NULL, *mixer_fun = NULL;
+        ddf_fun_t *dsp_fun = NULL;
 #define CHECK_RET_UNREG_DEST_RETURN(ret, msg...) \
 if (ret != EOK) { \
@@ -126 +126 @@
         if (dsp_fun) \
                 ddf_fun_destroy(dsp_fun); \
-        if (mixer_fun) \
-                ddf_fun_destroy(mixer_fun); \
         unregister_interrupt_handler(device, irq); \
         return ret; \
@@ -139 +137 @@
         ret = dsp_fun ? EOK : ENOMEM;
         CHECK_RET_UNREG_DEST_RETURN(ret, "Failed to create dsp function.");
-
-
-        mixer_fun = ddf_fun_create(device, fun_exposed, "mixer");
-        ret = dsp_fun ? EOK : ENOMEM;
-        CHECK_RET_UNREG_DEST_RETURN(ret, "Failed to create mixer function.");
 
         ret = sb16_init_sb16(
@@ -154 +147 @@
             "Failed to bind dsp function: %s.\n", str_error(ret));
 
-        ret = ddf_fun_bind(mixer_fun);
-        CHECK_RET_UNREG_DEST_RETURN(ret,
-            "Failed to bind mixer function: %s.\n", str_error(ret));
-
         /* Everything's OK assign driver_data. */
-        mixer_fun->driver_data = soft_state;
         dsp_fun->driver_data = soft_state;
 

uspace/drv/audio/sb16/sb16.c

@@ -29 +29 @@
 #include <errno.h>
 #include <str_error.h>
+#include <audio_mixer_iface.h>
 
 #include "beep.h"
@@ -35 +36 @@
 #include "dsp.h"
 #include "sb16.h"
+
+extern audio_mixer_iface_t sb_mixer_iface;
+
+static ddf_dev_ops_t sb_mixer_ops = {
+        .interfaces[AUDIO_MIXER_IFACE] = &sb_mixer_iface,
+};
 
 /* ISA interrupts should be edge-triggered so there should be no need for
@@ -85 +92 @@
             sb->dsp.version.major, sb->dsp.version.minor);
 
+        ddf_fun_t *mixer_fun = ddf_fun_create(dev, fun_exposed, "mixer");
+        if (!mixer_fun) {
+                ddf_log_error("Failed to create mixer function.\n");
+                return ENOMEM;
+        }
         ret = sb_mixer_init(&sb->mixer, sb->regs, mixer_type);
         if (ret != EOK) {
@@ -91 +103 @@
                 return ret;
         }
+
         ddf_log_note("Initialized mixer: %s.\n",
             sb_mixer_type_str(sb->mixer.type));
+        mixer_fun->driver_data = &sb->mixer;
+        mixer_fun->ops = &sb_mixer_ops;
+
+        ret = ddf_fun_bind(mixer_fun);
+        if (ret != EOK) {
+                ddf_log_error(
+                    "Failed to bind mixer function: %s.\n", str_error(ret));
+                mixer_fun->driver_data = NULL;
+                ddf_fun_destroy(mixer_fun);
+                return ret;
+        }
 
         ddf_log_note("Playing startup sound.\n");