Changeset 03362fbd in mainline for uspace/drv/audio/sb16/sb16.c

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

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>
@@ -115 +117 @@
                 return ret;
         }
-        dsp_fun->driver_data = &sb->dsp;
-        dsp_fun->ops = &sb_pcm_ops;
+        //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.",
             sb->dsp.version.major, sb->dsp.version.minor);
@@ -124 +127 @@
                 ddf_log_error(
                     "Failed to bind PCM function: %s.", str_error(ret));
-                dsp_fun->driver_data = NULL;
+                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 return ret;
@@ -133 +136 @@
                 ddf_log_error("Failed register PCM function in category: %s.",
                     str_error(ret));
-                dsp_fun->driver_data = NULL;
-                ddf_fun_unbind(dsp_fun);
+                ddf_fun_unbind(dsp_fun);
+                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 return ret;
@@ -147 +150 @@
                 ddf_log_error("Failed to create mixer function.");
                 ddf_fun_unbind(dsp_fun);
-                dsp_fun->driver_data = NULL;
+                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 return ENOMEM;
@@ -156 +159 @@
                     str_error(ret));
                 ddf_fun_unbind(dsp_fun);
-                dsp_fun->driver_data = NULL;
+                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 ddf_fun_destroy(mixer_fun);
@@ -164 +167 @@
         ddf_log_note("Initialized mixer: %s.",
             sb_mixer_type_str(sb->mixer.type));
-        mixer_fun->driver_data = &sb->mixer;
-        mixer_fun->ops = &sb_mixer_ops;
+        ddf_fun_data_implant(mixer_fun, &sb->mixer);
+        ddf_fun_set_ops(mixer_fun, &sb_mixer_ops);
 
         ret = ddf_fun_bind(mixer_fun);
@@ -171 +174 @@
                 ddf_log_error(
                     "Failed to bind mixer function: %s.", str_error(ret));
-                mixer_fun->driver_data = NULL;
+                // TODO implanted data
                 ddf_fun_destroy(mixer_fun);
 
                 ddf_fun_unbind(dsp_fun);
-                dsp_fun->driver_data = NULL;
+                // TODO implanted data
                 ddf_fun_destroy(dsp_fun);
                 return ret;