Changeset 426 for GPL/trunk/alsa-kernel/synth

Timestamp:

May 9, 2009, 11:45:26 AM (17 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

Location:

GPL/trunk/alsa-kernel/synth/emux

Files:

• emux_hwdep.c (modified) (2 diffs)
• emux_oss.c (modified) (1 diff)
• emux_seq.c (modified) (4 diffs)
• emux_synth.c (modified) (2 diffs)
• soundfont.c (modified) (8 diffs)

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

@@ -24 +24 @@
 #include <asm/uaccess.h>
 #include "emux_voice.h"
-
-/*
- * open the hwdep device
- */
-static int
-snd_emux_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
-
-/*
- * close the device
- */
-static int
-snd_emux_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
 
 
@@ -147 +128 @@
         strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME);
         hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE;
-        hw->ops.open = snd_emux_hwdep_open;
-        hw->ops.release = snd_emux_hwdep_release;
         hw->ops.ioctl = snd_emux_hwdep_ioctl;
         hw->exclusive = 1;

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

@@ -133 +133 @@
                                  1, &callback);
         if (p == NULL) {
-                snd_printk("can't create port\n");
+                snd_printk(KERN_ERR "can't create port\n");
                 snd_emux_dec_count(emu);
                 mutex_unlock(&emu->register_mutex);

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

@@ -75 +75 @@
                                                    "%s WaveTable", emu->name);
         if (emu->client < 0) {
-                snd_printk("can't create client\n");
+                snd_printk(KERN_ERR "can't create client\n");
                 return -ENODEV;
         }
 
         if (emu->num_ports < 0) {
-                snd_printk("seqports must be greater than zero\n");
+                snd_printk(KERN_WARNING "seqports must be greater than zero\n");
                 emu->num_ports = 1;
         } else if (emu->num_ports >= SNDRV_EMUX_MAX_PORTS) {
-                snd_printk("too many ports."
+                snd_printk(KERN_WARNING "too many ports."
                            "limited max. ports %d\n", SNDRV_EMUX_MAX_PORTS);
                 emu->num_ports = SNDRV_EMUX_MAX_PORTS;
@@ -101 +101 @@
                                          0, &pinfo);
                 if (p == NULL) {
-                        snd_printk("can't create port\n");
+                        snd_printk(KERN_ERR "can't create port\n");
                         return -ENOMEM;
                 }
@@ -148 +148 @@
         /* Allocate structures for this channel */
         if ((p = kzalloc(sizeof(*p), GFP_KERNEL)) == NULL) {
-                snd_printk("no memory\n");
+                snd_printk(KERN_ERR "no memory\n");
                 return NULL;
         }
         p->chset.channels = kcalloc(max_channels, sizeof(struct snd_midi_channel), GFP_KERNEL);
         if (p->chset.channels == NULL) {
-                snd_printk("no memory\n");
+                snd_printk(KERN_ERR "no memory\n");
                 kfree(p);
                 return NULL;
@@ -377 +377 @@
                 }
                 emu->vmidi[i] = rmidi;
-                //snd_printk("virmidi %d ok\n", i);
+                /* snd_printk(KERN_DEBUG "virmidi %d ok\n", i); */
         }
         return 0;
 
 __error:
-        //snd_printk("error init..\n");
+        /* snd_printk(KERN_DEBUG "error init..\n"); */
         snd_emux_delete_virmidi(emu);
         return -ENOMEM;

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

@@ -957 +957 @@
                 emu->voices[voice].state = SNDRV_EMUX_ST_LOCKED;
         else
-                snd_printk("invalid voice for lock %d (state = %x)\n",
+                snd_printk(KERN_WARNING
+                           "invalid voice for lock %d (state = %x)\n",
                            voice, emu->voices[voice].state);
         spin_unlock_irqrestore(&emu->voice_lock, flags);
@@ -974 +975 @@
                 emu->voices[voice].state = SNDRV_EMUX_ST_OFF;
         else
-                snd_printk("invalid voice for unlock %d (state = %x)\n",
+                snd_printk(KERN_WARNING
+                           "invalid voice for unlock %d (state = %x)\n",
                            voice, emu->voices[voice].state);
         spin_unlock_irqrestore(&emu->voice_lock, flags);

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

@@ -134 +134 @@
 
         if (count < (long)sizeof(patch)) {
-                snd_printk("patch record too small %ld\n", count);
+                snd_printk(KERN_ERR "patch record too small %ld\n", count);
                 return -EINVAL;
         }
@@ -144 +144 @@
 
         if (patch.key != SNDRV_OSS_SOUNDFONT_PATCH) {
-                snd_printk("'The wrong kind of patch' %x\n", patch.key);
+                snd_printk(KERN_ERR "The wrong kind of patch %x\n", patch.key);
                 return -EINVAL;
         }
         if (count < patch.len) {
-                snd_printk("Patch too short %ld, need %d\n", count, patch.len);
+                snd_printk(KERN_ERR "Patch too short %ld, need %d\n",
+                           count, patch.len);
                 return -EINVAL;
         }
         if (patch.len < 0) {
-                snd_printk("poor length %d\n", patch.len);
+                snd_printk(KERN_ERR "poor length %d\n", patch.len);
                 return -EINVAL;
         }
@@ -196 +197 @@
                 /* patch must be opened */
                 if (!sflist->currsf) {
-                        snd_printk("soundfont: remove_info: patch not opened\n");
+                        snd_printk(KERN_ERR "soundfont: remove_info: "
+                                   "patch not opened\n");
                         rc = -EINVAL;
                 } else {
@@ -532 +534 @@
 
         if (count < (long)sizeof(hdr)) {
-                printk("Soundfont error: invalid patch zone length\n");
+                printk(KERN_ERR "Soundfont error: invalid patch zone length\n");
                 return -EINVAL;
         }
@@ -542 +544 @@
 
         if (hdr.nvoices <= 0 || hdr.nvoices >= 100) {
-                printk("Soundfont error: Illegal voice number %d\n", hdr.nvoices);
+                printk(KERN_ERR "Soundfont error: Illegal voice number %d\n",
+                       hdr.nvoices);
                 return -EINVAL;
         }
 
         if (count < (long)sizeof(struct soundfont_voice_info) * hdr.nvoices) {
-                printk("Soundfont Error: patch length(%ld) is smaller than nvoices(%d)\n",
+                printk(KERN_ERR "Soundfont Error: "
+                       "patch length(%ld) is smaller than nvoices(%d)\n",
                        count, hdr.nvoices);
                 return -EINVAL;
@@ -953 +957 @@
 
         if (count < (long)sizeof(patch)) {
-                snd_printk("patch record too small %ld\n", count);
+                snd_printk(KERN_ERR "patch record too small %ld\n", count);
                 return -EINVAL;
         }
@@ -1035 +1039 @@
         zone->v.pan = (patch.panning + 128) / 2;
 #if 0
-        snd_printk("gus: basefrq=%d (ofs=%d) root=%d,tune=%d, range:%d-%d\n",
+        snd_printk(KERN_DEBUG
+                   "gus: basefrq=%d (ofs=%d) root=%d,tune=%d, range:%d-%d\n",
                    (int)patch.base_freq, zone->v.rate_offset,
                    zone->v.root, zone->v.tune, zone->v.low, zone->v.high);
@@ -1069 +1074 @@
                 zone->v.attenuation = calc_gus_attenuation(patch.env_offset[0]);
 #if 0
-                snd_printk("gus: atkhld=%x, dcysus=%x, volrel=%x, att=%d\n",
+                snd_printk(KERN_DEBUG
+                           "gus: atkhld=%x, dcysus=%x, volrel=%x, att=%d\n",
                            zone->v.parm.volatkhld,
                            zone->v.parm.voldcysus,