Changeset 34 for GPL/trunk/alsa-kernel/synth/emux/emux.c

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

File:

• GPL/trunk/alsa-kernel/synth/emux/emux.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/synth/emux/emux.c

@@ -23 +23 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/string.h>
 #include <sound/core.h>
 #include <sound/emux_synth.h>
@@ -35 +36 @@
  * create a new hardware dependent device for Emu8000/Emu10k1
  */
-int snd_emux_new(snd_emux_t **remu)
-{
-    snd_emux_t *emu;
-
-    *remu = NULL;
-    emu = kcalloc(1, sizeof(*emu), GFP_KERNEL);
-    if (emu == NULL)
-        return -ENOMEM;
-
-    spin_lock_init(&emu->voice_lock);
-    init_MUTEX(&emu->register_mutex);
-
-    emu->client = -1;
-#ifdef CONFIG_SND_OSSEMUL
-    emu->oss_synth = NULL;
-#endif
-    emu->max_voices = 0;
-    emu->use_time = 0;
-
-    emu->tlist.function = snd_emux_timer_callback;
-    emu->tlist.data = (unsigned long)emu;
-    emu->timer_active = 0;
-
-    *remu = emu;
-    return 0;
-}
-
-
-/*
- */
-int snd_emux_register(snd_emux_t *emu, snd_card_t *card, int index, char *name)
-{
-    snd_sf_callback_t sf_cb;
-
-    snd_assert(emu->hw != NULL, return -EINVAL);
-    snd_assert(emu->max_voices > 0, return -EINVAL);
-    snd_assert(card != NULL, return -EINVAL);
-    snd_assert(name != NULL, return -EINVAL);
-
-    emu->card = card;
-    emu->name = snd_kmalloc_strdup(name, GFP_KERNEL);
-    emu->voices = kcalloc(emu->max_voices, sizeof(snd_emux_voice_t), GFP_KERNEL);
-    if (emu->voices == NULL)
-        return -ENOMEM;
-
-    /* create soundfont list */
-    memset(&sf_cb, 0, sizeof(sf_cb));
-    sf_cb.private_data = emu;
-    sf_cb.sample_new = (snd_sf_sample_new_t)emu->ops.sample_new;
-    sf_cb.sample_free = (snd_sf_sample_free_t)emu->ops.sample_free;
-    sf_cb.sample_reset = (snd_sf_sample_reset_t)emu->ops.sample_reset;
-    emu->sflist = snd_sf_new(&sf_cb, emu->memhdr);
-    if (emu->sflist == NULL)
-        return -ENOMEM;
-
-    snd_emux_init_voices(emu);
-
-    snd_emux_init_seq(emu, card, index);
-#ifdef CONFIG_SND_OSSEMUL
-    snd_emux_init_seq_oss(emu);
-#endif
-    snd_emux_init_virmidi(emu, card);
+int snd_emux_new(struct snd_emux **remu)
+{
+        struct snd_emux *emu;
+
+        *remu = NULL;
+        emu = kzalloc(sizeof(*emu), GFP_KERNEL);
+        if (emu == NULL)
+                return -ENOMEM;
+
+        spin_lock_init(&emu->voice_lock);
+        init_MUTEX(&emu->register_mutex);
+
+        emu->client = -1;
+#ifdef CONFIG_SND_SEQUENCER_OSS
+        emu->oss_synth = NULL;
+#endif
+        emu->max_voices = 0;
+        emu->use_time = 0;
+
+        init_timer(&emu->tlist);
+        emu->tlist.function = snd_emux_timer_callback;
+        emu->tlist.data = (unsigned long)emu;
+        emu->timer_active = 0;
+
+        *remu = emu;
+        return 0;
+}
+
+
+/*
+ */
+static int sf_sample_new(void *private_data, struct snd_sf_sample *sp,
+                                  struct snd_util_memhdr *hdr,
+                                  const void __user *buf, long count)
+{
+        struct snd_emux *emu = private_data;
+        return emu->ops.sample_new(emu, sp, hdr, buf, count);
+        
+}
+
+static int sf_sample_free(void *private_data, struct snd_sf_sample *sp,
+                                   struct snd_util_memhdr *hdr)
+{
+        struct snd_emux *emu = private_data;
+        return emu->ops.sample_free(emu, sp, hdr);
+        
+}
+
+static void sf_sample_reset(void *private_data)
+{
+        struct snd_emux *emu = private_data;
+        emu->ops.sample_reset(emu);
+}
+
+int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, char *name)
+{
+        int err;
+        struct snd_sf_callback sf_cb;
+
+        snd_assert(emu->hw != NULL, return -EINVAL);
+        snd_assert(emu->max_voices > 0, return -EINVAL);
+        snd_assert(card != NULL, return -EINVAL);
+        snd_assert(name != NULL, return -EINVAL);
+
+        emu->card = card;
+        emu->name = kstrdup(name, GFP_KERNEL);
+        emu->voices = kcalloc(emu->max_voices, sizeof(struct snd_emux_voice),
+                              GFP_KERNEL);
+        if (emu->voices == NULL)
+                return -ENOMEM;
+
+        /* create soundfont list */
+        memset(&sf_cb, 0, sizeof(sf_cb));
+        sf_cb.private_data = emu;
+        if (emu->ops.sample_new)
+                sf_cb.sample_new = sf_sample_new;
+        if (emu->ops.sample_free)
+                sf_cb.sample_free = sf_sample_free;
+        if (emu->ops.sample_reset)
+                sf_cb.sample_reset = sf_sample_reset;
+        emu->sflist = snd_sf_new(&sf_cb, emu->memhdr);
+        if (emu->sflist == NULL)
+                return -ENOMEM;
+
+        if ((err = snd_emux_init_hwdep(emu)) < 0)
+                return err;
+
+        snd_emux_init_voices(emu);
+
+        snd_emux_init_seq(emu, card, index);
+#ifdef CONFIG_SND_SEQUENCER_OSS
+        snd_emux_init_seq_oss(emu);
+#endif
+        snd_emux_init_virmidi(emu, card);
 
 #ifdef CONFIG_PROC_FS
-    snd_emux_proc_init(emu, card, index);
-#endif
-    return 0;
-}
-
-
-/*
- */
-int snd_emux_free(snd_emux_t *emu)
-{
-    unsigned long flags;
-
-    if (! emu)
-        return -EINVAL;
-
-    spin_lock_irqsave(&emu->voice_lock, flags);
-    if (emu->timer_active)
-        del_timer(&emu->tlist);
-    spin_unlock_irqrestore(&emu->voice_lock, flags);
+        snd_emux_proc_init(emu, card, index);
+#endif
+        return 0;
+}
+
+
+/*
+ */
+int snd_emux_free(struct snd_emux *emu)
+{
+        unsigned long flags;
+
+        if (! emu)
+                return -EINVAL;
+
+        spin_lock_irqsave(&emu->voice_lock, flags);
+        if (emu->timer_active)
+                del_timer(&emu->tlist);
+        spin_unlock_irqrestore(&emu->voice_lock, flags);
 
 #ifdef CONFIG_PROC_FS
-    snd_emux_proc_free(emu);
-#endif
-    snd_emux_delete_virmidi(emu);
-#ifdef CONFIG_SND_OSSEMUL
-    snd_emux_detach_seq_oss(emu);
-#endif
-    snd_emux_detach_seq(emu);
-
-    if (emu->sflist)
-        snd_sf_free(emu->sflist);
-
-    if (emu->voices)
-        kfree(emu->voices);
-
-    if (emu->name)
-        kfree(emu->name);
-
-    kfree(emu);
-    return 0;
+        snd_emux_proc_free(emu);
+#endif
+        snd_emux_delete_virmidi(emu);
+#ifdef CONFIG_SND_SEQUENCER_OSS
+        snd_emux_detach_seq_oss(emu);
+#endif
+        snd_emux_detach_seq(emu);
+
+        snd_emux_delete_hwdep(emu);
+
+        if (emu->sflist)
+                snd_sf_free(emu->sflist);
+
+        kfree(emu->voices);
+        kfree(emu->name);
+        kfree(emu);
+        return 0;
 }
 
@@ -150 +181 @@
 EXPORT_SYMBOL(snd_emux_unlock_voice);
 
+/* soundfont.c */
+EXPORT_SYMBOL(snd_sf_linear_to_log);
+
 
 /*
@@ -157 +191 @@
 static int __init alsa_emux_init(void)
 {
-    return 0;
+        return 0;
 }