Changeset 9808edd in mainline

Timestamp:

2011-12-05T00:53:38Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

46117de0

Parents:

e44385d

Message:

sb16: Implement audio pcm buffer interface.

Remove startup sound.
Move dsp function initialization to sb16.c.

Location:

uspace/drv/audio/sb16

Files:

• Makefile (modified) (1 diff)
• beep.h (deleted)
• beep16.c (deleted)
• main.c (modified) (3 diffs)
• pcm_iface.c (added)
• sb16.c (modified) (7 diffs)

uspace/drv/audio/sb16/Makefile

@@ -38 +38 @@
 
 SOURCES = \
-        beep16.c \
         dsp.c \
         main.c \
         mixer.c \
         mixer_iface.c \
+        pcm_iface.c \
         sb16.c
 

uspace/drv/audio/sb16/main.c

@@ -123 +123 @@
             "Failed to register irq handler: %s.\n", str_error(ret));
 
-
-        ddf_fun_t *dsp_fun = NULL;
 #define CHECK_RET_UNREG_DEST_RETURN(ret, msg...) \
 if (ret != EOK) { \
         ddf_log_error(msg); \
-        if (dsp_fun) \
-                ddf_fun_destroy(dsp_fun); \
         unregister_interrupt_handler(device, irq); \
         return ret; \
@@ -137 +133 @@
         CHECK_RET_UNREG_DEST_RETURN(ret, "Failed to enable interrupts: %s.\n",
             str_error(ret));
-
-        dsp_fun = ddf_fun_create(device, fun_exposed, "dsp");
-        ret = dsp_fun ? EOK : ENOMEM;
-        CHECK_RET_UNREG_DEST_RETURN(ret, "Failed to create dsp function.");
 
         ret = sb16_init_sb16(
@@ -146 +138 @@
         CHECK_RET_UNREG_DEST_RETURN(ret,
             "Failed to init sb16 driver: %s.\n", str_error(ret));
-
-        ret = ddf_fun_bind(dsp_fun);
-        CHECK_RET_UNREG_DEST_RETURN(ret,
-            "Failed to bind dsp function: %s.\n", str_error(ret));
-
-        /* Everything's OK assign driver_data. */
-        dsp_fun->driver_data = soft_state;
 
         ret = sb16_init_mpu(soft_state, (void*)mpu_regs, mpu_regs_size);

uspace/drv/audio/sb16/sb16.c

@@ -30 +30 @@
 #include <str_error.h>
 #include <audio_mixer_iface.h>
+#include <audio_pcm_buffer_iface.h>
 
 #include "beep.h"
@@ -38 +39 @@
 
 extern audio_mixer_iface_t sb_mixer_iface;
+extern audio_pcm_buffer_iface_t sb_pcm_iface;
 
 static ddf_dev_ops_t sb_mixer_ops = {
         .interfaces[AUDIO_MIXER_IFACE] = &sb_mixer_iface,
+};
+
+static ddf_dev_ops_t sb_pcm_ops = {
+        .interfaces[AUDIO_PCM_BUFFER_IFACE] = &sb_pcm_iface,
 };
 
@@ -95 +101 @@
 
         /* Initialize DSP */
+        ddf_fun_t *dsp_fun = ddf_fun_create(dev, fun_exposed, "dsp");
+        if (!dsp_fun) {
+                ddf_log_error("Failed to create dsp function.\n");
+                return ENOMEM;
+        }
+
         ret = sb_dsp_init(&sb->dsp, sb->regs, dev, dma8, dma16);
         if (ret != EOK) {
@@ -101 +113 @@
                 return ret;
         }
+        dsp_fun->driver_data = &sb->dsp;
+        dsp_fun->ops = &sb_pcm_ops;
         ddf_log_note("Sound blaster DSP (%x.%x) initialized.\n",
             sb->dsp.version.major, sb->dsp.version.minor);
+
+        ret = ddf_fun_bind(dsp_fun);
+        if (ret != EOK) {
+                ddf_log_error(
+                    "Failed to bind DSP function: %s.\n", str_error(ret));
+                dsp_fun->driver_data = NULL;
+                ddf_fun_destroy(dsp_fun);
+                return ret;
+        }
 
         /* Initialize mixer */
@@ -111 +134 @@
         if (!mixer_fun) {
                 ddf_log_error("Failed to create mixer function.\n");
+                ddf_fun_unbind(dsp_fun);
+                dsp_fun->driver_data = NULL;
+                ddf_fun_destroy(dsp_fun);
                 return ENOMEM;
         }
@@ -117 +143 @@
                 ddf_log_error("Failed to initialize SB mixer: %s.\n",
                     str_error(ret));
+                ddf_fun_unbind(dsp_fun);
+                dsp_fun->driver_data = NULL;
+                ddf_fun_destroy(dsp_fun);
+                ddf_fun_destroy(mixer_fun);
                 return ret;
         }
@@ -131 +161 @@
                 mixer_fun->driver_data = NULL;
                 ddf_fun_destroy(mixer_fun);
+
+                ddf_fun_unbind(dsp_fun);
+                dsp_fun->driver_data = NULL;
+                ddf_fun_destroy(dsp_fun);
                 return ret;
         }
-
-        ddf_log_note("Playing startup sound.\n");
-        sb_dsp_play(&sb->dsp, beep, beep_size, 44100, channels, 16);
 
         return EOK;