Changeset 15d0046 in mainline for uspace/drv/audio/sb16/sb16.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/drv/audio/sb16/sb16.c

@@ -27 +27 @@
  */
 
-#define _DDF_DATA_IMPLANT
-
 #include <errno.h>
 #include <str_error.h>
@@ -121 +119 @@
                 return ret;
         }
-        //TODO remove data implant
-        ddf_fun_data_implant(dsp_fun, &sb->dsp);
+
         ddf_fun_set_ops(dsp_fun, &sb_pcm_ops);
         ddf_log_note("Sound blaster DSP (%x.%x) initialized.",
@@ -131 +128 @@
                 ddf_log_error(
                     "Failed to bind PCM function: %s.", str_error(ret));
-                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 return ret;
@@ -141 +137 @@
                     str_error(ret));
                 ddf_fun_unbind(dsp_fun);
-                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 return ret;
@@ -154 +149 @@
                 ddf_log_error("Failed to create mixer function.");
                 ddf_fun_unbind(dsp_fun);
-                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 return ENOMEM;
@@ -163 +157 @@
                     str_error(ret));
                 ddf_fun_unbind(dsp_fun);
-                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 ddf_fun_destroy(mixer_fun);
@@ -171 +164 @@
         ddf_log_note("Initialized mixer: %s.",
             sb_mixer_type_str(sb->mixer.type));
-        ddf_fun_data_implant(mixer_fun, &sb->mixer);
         ddf_fun_set_ops(mixer_fun, &sb_mixer_ops);
 
@@ -178 +170 @@
                 ddf_log_error(
                     "Failed to bind mixer function: %s.", str_error(ret));
-                // TODO implanted data
                 ddf_fun_destroy(mixer_fun);
-
-                ddf_fun_unbind(dsp_fun);
-                // TODO implanted data
+                ddf_fun_unbind(dsp_fun);
                 ddf_fun_destroy(dsp_fun);
                 return ret;