Changeset 9bd4615 in mainline

Timestamp:

2014-07-20T13:31:50Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54a1ca7

Parents:

350274a

Message:

Convert sb16 driver away from DDF_DATA_IMPLANT.

Location:

uspace/drv/audio/sb16

Files:

• mixer_iface.c (modified) (3 diffs)
• pcm_iface.c (modified) (1 diff)
• sb16.c (modified) (8 diffs)

uspace/drv/audio/sb16/mixer_iface.c

@@ -33 +33 @@
  */
 
+#include <ddf/driver.h>
 #include <errno.h>
 #include <audio_mixer_iface.h>
 
 #include "mixer.h"
+#include "sb16.h"
+
+static sb_mixer_t *fun_to_mixer(ddf_fun_t *fun)
+{
+        sb16_t *sb = (sb16_t *)ddf_dev_data_get(ddf_fun_get_dev(fun));
+        return &sb->mixer;
+}
 
 static int sb_get_info(ddf_fun_t *fun, const char** name, unsigned *items)
 {
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
+
         if (name)
                 *name = sb_mixer_type_str(mixer->type);
@@ -54 +61 @@
     unsigned *max_level)
 {
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
-        return
-            sb_mixer_get_control_item_info(mixer, item, name, max_level);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
+        return sb_mixer_get_control_item_info(mixer, item, name, max_level);
 }
 
 static int sb_set_item_level(ddf_fun_t *fun, unsigned item, unsigned value)
 {
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
         return sb_mixer_set_control_item_value(mixer, item, value);
 }
@@ -71 +73 @@
 static int sb_get_item_level(ddf_fun_t *fun, unsigned item, unsigned *value)
 {
-        assert(fun);
-        const sb_mixer_t *mixer = ddf_fun_data_get(fun);
-        assert(mixer);
+        sb_mixer_t *mixer = fun_to_mixer(fun);
         return sb_mixer_get_control_item_value(mixer, item, value);
 }

uspace/drv/audio/sb16/pcm_iface.c

@@ -39 +39 @@
 
 #include "dsp.h"
+#include "sb16.h"
 
-static inline sb_dsp_t * fun_to_dsp(ddf_fun_t *fun)
+static inline sb_dsp_t *fun_to_dsp(ddf_fun_t *fun)
 {
-        assert(fun);
-        sb_dsp_t *dsp = ddf_fun_data_get(fun);
-        assert(dsp);
-        return dsp;
+        sb16_t *sb = (sb16_t *)ddf_dev_data_get(ddf_fun_get_dev(fun));
+        return &sb->dsp;
 }
 

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;