Changeset 25c98a8e in mainline for uspace/drv/audio/sb16/main.c

Timestamp:

2011-11-25T22:11:00Z (13 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.

File:

• uspace/drv/audio/sb16/main.c (modified) (4 diffs)

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;