Changeset 92

Timestamp:

May 2, 2007, 9:13:43 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged 0.9.0beta6 to 0.9.0beta12. Fixed a few compilation errors.
Left include/sound/driver.h at beta9 until I figure out why it contains
so many modifications to sections that were removed in beta10.
Does not yet build. Needs more fixing.
Added a few new files that were in the copy Paul gave me to work from.

Location:

GPL/branches/alsa-resync1/alsa-kernel

Files:

• core/control.c (modified) (6 diffs)
• core/device.c (modified) (2 diffs)
• core/info.c (modified) (17 diffs)
• core/init.c (modified) (2 diffs)
• core/memory.c (modified) (4 diffs)
• core/misc.c (modified) (4 diffs)
• core/pcm.c (modified) (3 diffs)
• core/rawmidi.c (modified) (13 diffs)
• core/rtctimer.c (modified) (7 diffs)
• core/timer.c (modified) (1 diff)
• drivers/dummy.c (modified) (5 diffs)
• drivers/mpu401/mpu401.c (modified) (3 diffs)
• drivers/mtpav.c (modified) (8 diffs)
• drivers/serial-u16550.c (modified) (9 diffs)
• drivers/virmidi.c (modified) (8 diffs)
• include/sound/driver.h (modified) (5 diffs)
• include/sound/initval.h (modified) (5 diffs)
• include/sound/pcm_params.h (modified) (3 diffs)
• include/sound/version.h (modified) (1 diff)
• isa/ad1816a/ad1816a.c (modified) (12 diffs)
• isa/ad1816a/ad1816a_lib.c (modified) (8 diffs)
• isa/ad1848/ad1848.c (modified) (5 diffs)
• isa/ad1848/ad1848_lib.c (modified) (16 diffs)
• isa/als100.c (modified) (12 diffs)
• isa/azt2320.c (modified) (10 diffs)
• isa/cmi8330.c (modified) (8 diffs)
• isa/cs423x/cs4231.c (modified) (6 diffs)
• isa/cs423x/cs4231_lib.c (modified) (7 diffs)
• isa/cs423x/cs4236.c (modified) (19 diffs)
• isa/dt0197h.c (modified) (11 diffs)
• isa/es1688/es1688.c (modified) (5 diffs)
• isa/es1688/es1688_lib.c (modified) (5 diffs)
• isa/es18xx.c (modified) (26 diffs)
• isa/gus/gus_pcm.c (modified) (5 diffs)
• isa/gus/gusclassic.c (modified) (5 diffs)
• isa/gus/gusextreme.c (modified) (6 diffs)
• isa/gus/gusmax.c (modified) (7 diffs)
• isa/gus/interwave.c (modified) (14 diffs)
• isa/opl3sa2.c (modified) (30 diffs)
• isa/opti9xx/opti92x-ad1848.c (modified) (11 diffs)
• isa/sb/es968.c (modified) (5 diffs)
• isa/sb/sb16.c (modified) (25 diffs)
• isa/sb/sb16_csp.c (modified) (12 diffs)
• isa/sb/sb16_main.c (modified) (5 diffs)
• isa/sb/sb8.c (modified) (8 diffs)
• isa/sb/sb8_main.c (modified) (6 diffs)
• isa/sb/sb_common.c (modified) (6 diffs)
• isa/sgalaxy.c (modified) (6 diffs)
• isa/wavefront/wavefront.c (modified) (19 diffs)
• pci/ali5451/ali5451.c (modified) (2 diffs)
• pci/als4000.c (modified) (3 diffs)
• pci/emu10k1/emu10k1_main.c (modified) (3 diffs)
• pci/emu10k1/tina2.h (added)
• pci/es1968.c (modified) (5 diffs)
• pci/hda/Makefile (added)
• pci/hda/patch_analog.c (modified) (2 diffs)
• pci/hda/patch_conexant.c (added)
• pci/hda/patch_via.c (added)
• pci/ice1712.c (modified) (115 diffs)
• pci/maestro3.c (modified) (1 diff)
• pci/rme96.c (modified) (23 diffs)
• pci/rme9652/rme9652.c (modified) (23 diffs)
• pci/trident/trident.c (modified) (3 diffs)
• pci/ymfpci/ymfpci.c (modified) (4 diffs)

GPL/branches/alsa-resync1/alsa-kernel/core/control.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/info.h>
@@ -43 +49 @@
 static int snd_ctl_open(struct inode *inode, struct file *file)
 {
-    int cardnum = SNDRV_MINOR_CARD(MINOR(inode->i_rdev));
-    unsigned long flags;
-    struct snd_card *card;
-    struct snd_ctl_file *ctl;
-    int err;
-
-    card = snd_cards[cardnum];
-    if (!card) {
-        err = -ENODEV;
-        goto __error1;
-    }
-    err = snd_card_file_add(card, file);
-    if (err < 0) {
-        err = -ENODEV;
-        goto __error1;
-    }
-    if (!try_module_get(card->module)) {
-        err = -EFAULT;
-        goto __error2;
-    }
-    ctl = kcalloc(1, sizeof(*ctl), GFP_KERNEL);
-    if (ctl == NULL) {
-        err = -ENOMEM;
-        goto __error;
-    }
-    INIT_LIST_HEAD(&ctl->events);
-    init_waitqueue_head(&ctl->change_sleep);
-    spin_lock_init(&ctl->read_lock);
-    ctl->card = card;
-    ctl->pid = current->pid;
-    file->private_data = ctl;
-    write_lock_irqsave(&card->ctl_files_rwlock, flags);
-    list_add_tail(&ctl->list, &card->ctl_files);
-    write_unlock_irqrestore(&card->ctl_files_rwlock, flags);
-    return 0;
+        int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
+        unsigned long flags;
+        struct snd_card *card;
+        struct snd_ctl_file *ctl;
+        int err;
+
+        card = snd_cards[cardnum];
+        if (!card) {
+                err = -ENODEV;
+                goto __error1;
+        }
+        err = snd_card_file_add(card, file);
+        if (err < 0) {
+                err = -ENODEV;
+                goto __error1;
+        }
+        if (!try_module_get(card->module)) {
+                err = -EFAULT;
+                goto __error2;
+        }
+        ctl = kcalloc(1, sizeof(*ctl), GFP_KERNEL);
+        if (ctl == NULL) {
+                err = -ENOMEM;
+                goto __error;
+        }
+        INIT_LIST_HEAD(&ctl->events);
+        init_waitqueue_head(&ctl->change_sleep);
+        spin_lock_init(&ctl->read_lock);
+        ctl->card = card;
+        ctl->pid = current->pid;
+        file->private_data = ctl;
+        write_lock_irqsave(&card->ctl_files_rwlock, flags);
+        list_add_tail(&ctl->list, &card->ctl_files);
+        write_unlock_irqrestore(&card->ctl_files_rwlock, flags);
+        return 0;
 
 __error:
@@ -84 +90 @@
     snd_card_file_remove(card, file);
 __error1:
-    return err;
+        return err;
 }
 
@@ -90 +96 @@
 {
     struct snd_kctl_event *cread;
-
-    spin_lock(&ctl->read_lock);
-    while (!list_empty(&ctl->events)) {
-        cread = snd_kctl_event(ctl->events.next);
-        list_del(&cread->list);
-        kfree(cread);
-    }
-    spin_unlock(&ctl->read_lock);
+        
+        spin_lock(&ctl->read_lock);
+        while (!list_empty(&ctl->events)) {
+                cread = snd_kctl_event(ctl->events.next);
+                list_del(&cread->list);
+                kfree(cread);
+        }
+        spin_unlock(&ctl->read_lock);
 }
 
 static int snd_ctl_release(struct inode *inode, struct file *file)
 {
-    unsigned long flags;
-    struct list_head *list;
-    struct snd_card *card;
-    struct snd_ctl_file *ctl;
-    struct snd_kcontrol *control;
-    unsigned int idx;
-
-    ctl = file->private_data;
-    fasync_helper(-1, file, 0, &ctl->fasync);
-    file->private_data = NULL;
-    card = ctl->card;
-    write_lock_irqsave(&card->ctl_files_rwlock, flags);
-    list_del(&ctl->list);
-    write_unlock_irqrestore(&card->ctl_files_rwlock, flags);
-    down_write(&card->controls_rwsem);
-    list_for_each(list, &card->controls) {
-        control = snd_kcontrol(list);
-        for (idx = 0; idx < control->count; idx++)
-            if (control->vd[idx].owner == ctl)
-                control->vd[idx].owner = NULL;
-    }
-    up_write(&card->controls_rwsem);
-    snd_ctl_empty_read_queue(ctl);
-    kfree(ctl);
-    module_put(card->module);
-    snd_card_file_remove(card, file);
-    return 0;
+        unsigned long flags;
+        struct list_head *list;
+        struct snd_card *card;
+        struct snd_ctl_file *ctl;
+        struct snd_kcontrol *control;
+        unsigned int idx;
+
+        ctl = file->private_data;
+        fasync_helper(-1, file, 0, &ctl->fasync);
+        file->private_data = NULL;
+        card = ctl->card;
+        write_lock_irqsave(&card->ctl_files_rwlock, flags);
+        list_del(&ctl->list);
+        write_unlock_irqrestore(&card->ctl_files_rwlock, flags);
+        down_write(&card->controls_rwsem);
+        list_for_each(list, &card->controls) {
+                control = snd_kcontrol(list);
+                for (idx = 0; idx < control->count; idx++)
+                        if (control->vd[idx].owner == ctl)
+                                control->vd[idx].owner = NULL;
+        }
+        up_write(&card->controls_rwsem);
+        snd_ctl_empty_read_queue(ctl);
+        kfree(ctl);
+        module_put(card->module);
+        snd_card_file_remove(card, file);
+        return 0;
 }
 
 void snd_ctl_notify(struct snd_card *card, unsigned int mask, struct snd_ctl_elem_id *id)
 {
-    unsigned long flags;
-    struct list_head *flist;
-    struct snd_ctl_file *ctl;
-    struct snd_kctl_event *ev;
-
-    snd_runtime_check(card != NULL && id != NULL, return);
-
-    control_id_changed = id->numid;
-    card_id_changed = card->number;
-    //        printk("ctl id %i changed\n", id->numid);
-    read_lock(&card->ctl_files_rwlock);
+        unsigned long flags;
+        struct list_head *flist;
+        struct snd_ctl_file *ctl;
+        struct snd_kctl_event *ev;
+        
+        snd_runtime_check(card != NULL && id != NULL, return);
+
+        control_id_changed = id->numid;
+        card_id_changed = card->number;
+        //        printk("ctl id %i changed\n", id->numid);
+        read_lock(&card->ctl_files_rwlock);
 #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
-    card->mixer_oss_change_count++;
+        card->mixer_oss_change_count++;
 #endif
-    list_for_each(flist, &card->ctl_files) {
+        list_for_each(flist, &card->ctl_files) {
         struct list_head *elist;
         ctl = snd_ctl_file(flist);
@@ -166 +172 @@
             list_add_tail(&ev->list, &ctl->events);
         } else {
-            snd_printk("No memory available to allocate event\n");
-        }
+                        snd_printk(KERN_ERR "No memory available to allocate event\n");
+                }
         _found:
         wake_up(&ctl->change_sleep);
@@ -338 +344 @@
     }
 #endif
-    list_add_tail(&kcontrol->list, &card->controls);
+        list_add_tail(&kcontrol->list, &card->controls);
     card->controls_count += kcontrol->count;
-    kcontrol->id.numid = card->last_numid + 1;
-    card->last_numid += kcontrol->count;
-    up_write(&card->controls_rwsem);
-    for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
-        snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
-    return 0;
+        kcontrol->id.numid = card->last_numid + 1;
+        card->last_numid += kcontrol->count;
+        up_write(&card->controls_rwsem);
+        for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
+        snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
+        return 0;
 
 error:
     snd_ctl_free_one(kcontrol);
-    return err;
+        return err;
 }
 

GPL/branches/alsa-resync1/alsa-kernel/core/device.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <sound/core.h>
 
 /**
@@ -84 +88 @@
                     dev->ops->dev_unregister) {
                         if (dev->ops->dev_unregister(dev))
-                                snd_printk("device unregister failure\n");
+                                snd_printk(KERN_ERR "device unregister failure\n");
                 } else {
                         if (dev->ops->dev_free) {
                                 if (dev->ops->dev_free(dev))
-                                        snd_printk("device free failure\n");
+                                        snd_printk(KERN_ERR "device free failure\n");
                         }
                 }

GPL/branches/alsa-resync1/alsa-kernel/core/info.c

@@ -20 +20 @@
  */
 
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/vmalloc.h>
+#include <linux/time.h>
+#ifndef TARGET_OS2 /* Introduced in version 0.9.0beta12, not present */
+#include <linux/smp_lock.h>
+#endif /* TARGET_OS2 */
+#include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/info.h>
 #include <sound/version.h>
-#include <stdarg.h>
+#include <linux/proc_fs.h>
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>
 #endif
+#include <stdarg.h>
 
 #define min(x,y) (x < y ? x : y )
@@ -39 +48 @@
     static char *reserved[] =
     {
+                "dev",
         "version",
         "meminfo",
@@ -44 +54 @@
         "detect",
         "devices",
-        "oss",
+                "oss-devices",
         "cards",
         "timers",
@@ -166 +176 @@
                                        data->file_private_data,
                                        file, offset, orig);
-            goto out;
-        }
-        break;
-    }
-    ret = -ENXIO;
+                        goto out;
+                }
+                break;
+        }
+        ret = -ENXIO;
 out:
 #ifndef TARGET_OS2
-    unlock_kernel();
-#endif
-    return ret;
+        unlock_kernel();
+#endif
+        return ret;
 }
 
@@ -272 +282 @@
 
     down(&info_mutex);
-    p = (struct proc_dir_entry *) inode->u.generic_ip;
+        p = PDE(inode);
     entry = p == NULL ? NULL : (snd_info_entry_t *)p->data;
     if (entry == NULL) {
@@ -278 +288 @@
         return -ENODEV;
     }
-#ifndef LINUX_2_3
+#ifdef LINUX_2_2
     MOD_INC_USE_COUNT;
 #endif
@@ -415 +425 @@
                 entry->c.text.write(entry, data->wbuffer);
                 if (data->wbuffer->error) {
-                    snd_printk("data write error to %s (%i)\n",
+                                        snd_printk(KERN_WARNING "data write error to %s (%i)\n",
                                entry->name,
                                data->wbuffer->error);
@@ -525 +535 @@
 static struct file_operations snd_info_entry_operations =
 {
-#ifdef LINUX_2_3
+#ifndef LINUX_2_2
 owner:          THIS_MODULE,
 #endif
@@ -538 +548 @@
 };
 
-#ifndef LINUX_2_3
+#ifdef LINUX_2_2
 static struct inode_operations snd_info_entry_inode_operations =
 {
@@ -548 +558 @@
     &snd_fops,          /* default sound info directory file-ops */
 };
-#endif  /* LINUX_2_3 */
+#endif  /* LINUX_2_2 */
 
 static int snd_info_card_readlink(struct dentry *dentry,
                                   char *buffer, int buflen)
 {
-    char *s = ((struct proc_dir_entry *) dentry->d_inode->u.generic_ip)->data;
-#ifdef LINUX_2_3
+        char *s = PDE(dentry->d_inode)->data;
+#ifndef LINUX_2_2
     return vfs_readlink(dentry, buffer, buflen, s);
 #else
@@ -570 +580 @@
 }
 
-#ifdef LINUX_2_3
+#ifndef LINUX_2_2
 static int snd_info_card_followlink(struct dentry *dentry,
                                     struct nameidata *nd)
 {
-    char *s = ((struct proc_dir_entry *) dentry->d_inode->u.generic_ip)->data;
+        char *s = PDE(dentry->d_inode)->data;
     return vfs_follow_link(nd, s);
 }
@@ -582 +592 @@
                                                unsigned int follow)
 {
-    char *s = ((struct proc_dir_entry *) dentry->d_inode->u.generic_ip)->data;
+        char *s = PDE(dentry->d_inode)->data;
     return lookup_dentry(s, base, follow);
 }
 #endif
 
-#ifndef LINUX_2_3
+#ifdef LINUX_2_2
 static struct file_operations snd_info_card_link_operations =
 {
@@ -596 +606 @@
 struct inode_operations snd_info_card_link_inode_operations =
 {
-#ifndef LINUX_2_3
+#ifdef LINUX_2_2
 default_file_ops:       &snd_info_card_link_operations,
 #endif
@@ -683 +693 @@
     snd_info_version_done();
     if (snd_proc_root) {
-#ifdef CONFIG_SND_SEQUENCER
+#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
         if (snd_seq_root)
             snd_info_unregister(snd_seq_root);
@@ -1019 +1029 @@
         return -ENOMEM;
     }
-#ifdef LINUX_2_3
+#ifndef LINUX_2_2
     p->owner = entry->module;
 #endif
@@ -1025 +1035 @@
 #ifndef TARGET_OS2
     if (!S_ISDIR(entry->mode)) {
-#ifdef LINUX_2_3
+#ifndef LINUX_2_2
         p->proc_fops = &snd_info_entry_operations;
 #else
@@ -1072 +1082 @@
 
     snd_iprintf(buffer,
-                "Advanced Linux Sound Architecture Driver Version " CONFIG_SND_VERSION ".\n"
+                    "Advanced Linux Sound Architecture Driver Version " CONFIG_SND_VERSION CONFIG_SND_DATE ".\n"
                 "Compiled on " __DATE__ " for kernel %s"
 #ifdef __SMP__

GPL/branches/alsa-resync1/alsa-kernel/core/init.c

@@ -102 +102 @@
                 write_unlock(&snd_card_rwlock);
                 if (idx >= snd_ecards_limit)
-                        snd_printk("card %i is out of range (0-%i)\n", idx, snd_ecards_limit-1);
+                        snd_printk(KERN_ERR "card %i is out of range (0-%i)\n", idx, snd_ecards_limit-1);
                 goto __error;
         }
@@ -277 +277 @@
 #endif
         if (snd_device_free_all(card, SNDRV_DEV_CMD_PRE) < 0) {
-                snd_printk("unable to free all devices (pre)\n");
+                snd_printk(KERN_ERR "unable to free all devices (pre)\n");
                 /* Fatal, but this situation should never occur */
         }
         if (snd_device_free_all(card, SNDRV_DEV_CMD_NORMAL) < 0) {
-                snd_printk("unable to free all devices (normal)\n");
+                snd_printk(KERN_ERR "unable to free all devices (normal)\n");
                 /* Fatal, but this situation should never occur */
         }
         if (snd_ctl_unregister(card) < 0) {
-                snd_printk("unable to unregister control minors\n");
+                snd_printk(KERN_ERR "unable to unregister control minors\n");
                 /* Not fatal error */
         }
         if (snd_device_free_all(card, SNDRV_DEV_CMD_POST) < 0) {
-                snd_printk("unable to free all devices (post)\n");
+                snd_printk(KERN_ERR "unable to free all devices (post)\n");
                 /* Fatal, but this situation should never occur */
         }

GPL/branches/alsa-resync1/alsa-kernel/core/memory.c

@@ -21 +21 @@
  */
 
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/info.h>
 #include <sound/memalloc.h>
@@ -61 +68 @@
 void snd_memory_done(void)
 {
-    struct list_head *head;
-    struct snd_alloc_track *t;
-    if (snd_alloc_pages > 0)
-        snd_printk("Not freed snd_alloc_pages = %li\n", snd_alloc_pages);
-    if (snd_alloc_kmalloc > 0)
-        snd_printk("Not freed snd_alloc_kmalloc = %li\n", snd_alloc_kmalloc);
-    if (snd_alloc_vmalloc > 0)
-        snd_printk("Not freed snd_alloc_vmalloc = %li\n", snd_alloc_vmalloc);
-    list_for_each_prev(head, &snd_alloc_kmalloc_list) {
-        t = list_entry(head, struct snd_alloc_track, list);
-        if (t->magic != KMALLOC_MAGIC) {
-            snd_printk("Corrupted kmalloc\n");
-            break;
-        }
-        snd_printk("kmalloc(%ld) from %p not freed\n", (long) t->size, t->caller);
-    }
-    list_for_each_prev(head, &snd_alloc_vmalloc_list) {
-        t = list_entry(head, struct snd_alloc_track, list);
-        if (t->magic != VMALLOC_MAGIC) {
-            snd_printk("Corrupted vmalloc\n");
-            break;
-        }
-        snd_printk("vmalloc(%ld) from %p not freed\n", (long) t->size, t->caller);
-    }
+        struct list_head *head;
+        struct snd_alloc_track *t;
+        if (snd_alloc_pages > 0)
+                snd_printk(KERN_ERR "Not freed snd_alloc_pages = %li\n", snd_alloc_pages);
+        if (snd_alloc_kmalloc > 0)
+                snd_printk(KERN_ERR "Not freed snd_alloc_kmalloc = %li\n", snd_alloc_kmalloc);
+        if (snd_alloc_vmalloc > 0)
+                snd_printk(KERN_ERR "Not freed snd_alloc_vmalloc = %li\n", snd_alloc_vmalloc);
+        list_for_each_prev(head, &snd_alloc_kmalloc_list) {
+                t = list_entry(head, struct snd_alloc_track, list);
+                if (t->magic != KMALLOC_MAGIC) {
+                        snd_printk(KERN_ERR "Corrupted kmalloc\n");
+                        break;
+                }
+                snd_printk(KERN_ERR "kmalloc(%ld) from %p not freed\n", (long) t->size, t->caller);
+        }
+        list_for_each_prev(head, &snd_alloc_vmalloc_list) {
+                t = list_entry(head, struct snd_alloc_track, list);
+                if (t->magic != VMALLOC_MAGIC) {
+                        snd_printk(KERN_ERR "Corrupted vmalloc\n");
+                        break;
+                }
+                snd_printk(KERN_ERR "vmalloc(%ld) from %p not freed\n", (long) t->size, t->caller);
+        }
 }
 
 void *__snd_kmalloc(size_t size, int flags, void *caller)
 {
-    unsigned long cpu_flags;
-    struct snd_alloc_track *t;
-    void *ptr;
-
-    ptr = snd_wrapper_kmalloc(size + sizeof(struct snd_alloc_track), flags);
-    if (ptr != NULL) {
-        t = (struct snd_alloc_track *)ptr;
-        t->magic = KMALLOC_MAGIC;
-        t->caller = caller;
-        spin_lock_irqsave(&snd_alloc_kmalloc_lock, cpu_flags);
-        list_add_tail(&t->list, &snd_alloc_kmalloc_list);
-        spin_unlock_irqrestore(&snd_alloc_kmalloc_lock, cpu_flags);
-        t->size = size;
-        snd_alloc_kmalloc += size;
-        ptr = t->data;
-    }
-    return ptr;
+        unsigned long cpu_flags;
+        struct snd_alloc_track *t;
+        void *ptr;
+        
+        ptr = snd_wrapper_kmalloc(size + sizeof(struct snd_alloc_track), flags);
+        if (ptr != NULL) {
+                t = (struct snd_alloc_track *)ptr;
+                t->magic = KMALLOC_MAGIC;
+                t->caller = caller;
+                spin_lock_irqsave(&snd_alloc_kmalloc_lock, cpu_flags);
+                list_add_tail(&t->list, &snd_alloc_kmalloc_list);
+                spin_unlock_irqrestore(&snd_alloc_kmalloc_lock, cpu_flags);
+                t->size = size;
+                snd_alloc_kmalloc += size;
+                ptr = t->data;
+        }
+        return ptr;
 }
 
@@ -111 +118 @@
 void *snd_hidden_kmalloc(size_t size, int flags)
 {
-    return _snd_kmalloc(size, flags);
+        return _snd_kmalloc(size, flags);
 }
 
@@ -127 +134 @@
 void snd_hidden_kfree(const void *obj)
 {
-    unsigned long flags;
-    struct snd_alloc_track *t;
-    if (obj == NULL) {
-        snd_printk("null kfree (called from %p)\n", __builtin_return_address(0));
-        return;
-    }
-    t = snd_alloc_track_entry(obj);
-    if (t->magic != KMALLOC_MAGIC) {
-        snd_printk("bad kfree (called from %p)\n", __builtin_return_address(0));
-        return;
-    }
-    spin_lock_irqsave(&snd_alloc_kmalloc_lock, flags);
-    list_del(&t->list);
-    spin_unlock_irqrestore(&snd_alloc_kmalloc_lock, flags);
-    t->magic = 0;
-    snd_alloc_kmalloc -= t->size;
-    obj = t;
-    snd_wrapper_kfree(obj);
+        unsigned long flags;
+        struct snd_alloc_track *t;
+        if (obj == NULL) {
+                snd_printk(KERN_WARNING "null kfree (called from %p)\n", __builtin_return_address(0));
+                return;
+        }
+        t = snd_alloc_track_entry(obj);
+        if (t->magic != KMALLOC_MAGIC) {
+                snd_printk(KERN_WARNING "bad kfree (called from %p)\n", __builtin_return_address(0));
+                return;
+        }
+        spin_lock_irqsave(&snd_alloc_kmalloc_lock, flags);
+        list_del(&t->list);
+        spin_unlock_irqrestore(&snd_alloc_kmalloc_lock, flags);
+        t->magic = 0;
+        snd_alloc_kmalloc -= t->size;
+        obj = t;
+        snd_wrapper_kfree(obj);
 }
 
 void *snd_hidden_vmalloc(unsigned long size)
 {
-    void *ptr;
-    ptr = snd_wrapper_vmalloc(size + sizeof(struct snd_alloc_track));
-    if (ptr) {
-        struct snd_alloc_track *t = (struct snd_alloc_track *)ptr;
-        t->magic = VMALLOC_MAGIC;
-        t->caller = __builtin_return_address(0);
-        spin_lock(&snd_alloc_vmalloc_lock);
-        list_add_tail(&t->list, &snd_alloc_vmalloc_list);
-        spin_unlock(&snd_alloc_vmalloc_lock);
-        t->size = size;
-        snd_alloc_vmalloc += size;
-        ptr = t->data;
-    }
-    return ptr;
+        void *ptr;
+        ptr = snd_wrapper_vmalloc(size + sizeof(struct snd_alloc_track));
+        if (ptr) {
+                struct snd_alloc_track *t = (struct snd_alloc_track *)ptr;
+                t->magic = VMALLOC_MAGIC;
+                t->caller = __builtin_return_address(0);
+                spin_lock(&snd_alloc_vmalloc_lock);
+                list_add_tail(&t->list, &snd_alloc_vmalloc_list);
+                spin_unlock(&snd_alloc_vmalloc_lock);
+                t->size = size;
+                snd_alloc_vmalloc += size;
+                ptr = t->data;
+        }
+        return ptr;
 }
 
 void snd_hidden_vfree(void *obj)
 {
-    struct snd_alloc_track *t;
-    if (obj == NULL) {
-        snd_printk("null vfree (called from %p)\n", __builtin_return_address(0));
-        return;
-    }
-    t = snd_alloc_track_entry(obj);
-    if (t->magic != VMALLOC_MAGIC) {
-        snd_printk("bad vfree (called from %p)\n", __builtin_return_address(0));
-        return;
-    }
-    spin_lock(&snd_alloc_vmalloc_lock);
-    list_del(&t->list);
-    spin_unlock(&snd_alloc_vmalloc_lock);
-    t->magic = 0;
-    snd_alloc_vmalloc -= t->size;
-    obj = t;
-    snd_wrapper_vfree(obj);
+        struct snd_alloc_track *t;
+        if (obj == NULL) {
+                snd_printk(KERN_WARNING "null vfree (called from %p)\n", __builtin_return_address(0));
+                return;
+        }
+        t = snd_alloc_track_entry(obj);
+        if (t->magic != VMALLOC_MAGIC) {
+                snd_printk(KERN_ERR "bad vfree (called from %p)\n", __builtin_return_address(0));
+                return;
+        }
+        spin_lock(&snd_alloc_vmalloc_lock);
+        list_del(&t->list);
+        spin_unlock(&snd_alloc_vmalloc_lock);
+        t->magic = 0;
+        snd_alloc_vmalloc -= t->size;
+        obj = t;
+        snd_wrapper_vfree(obj);
 }
 
 static void snd_memory_info_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer)
 {
-    long pages = snd_alloc_pages >> (PAGE_SHIFT-12);
-    snd_iprintf(buffer, "pages  : %li bytes (%li pages per %likB)\n", pages * PAGE_SIZE, pages, PAGE_SIZE / 1024);
-    snd_iprintf(buffer, "kmalloc: %li bytes\n", snd_alloc_kmalloc);
-    snd_iprintf(buffer, "vmalloc: %li bytes\n", snd_alloc_vmalloc);
+        long pages = snd_alloc_pages >> (PAGE_SHIFT-12);
+        snd_iprintf(buffer, "pages  : %li bytes (%li pages per %likB)\n", pages * PAGE_SIZE, pages, PAGE_SIZE / 1024);
+        snd_iprintf(buffer, "kmalloc: %li bytes\n", snd_alloc_kmalloc);
+        snd_iprintf(buffer, "vmalloc: %li bytes\n", snd_alloc_vmalloc);
 }
 
 int __init snd_memory_info_init(void)
 {
-    snd_info_entry_t *entry;
-
-    entry = snd_info_create_module_entry(THIS_MODULE, "meminfo", NULL);
-    if (entry) {
-        entry->content = SNDRV_INFO_CONTENT_TEXT;
-        entry->c.text.read_size = 256;
-        entry->c.text.read = snd_memory_info_read;
-        if (snd_info_register(entry) < 0) {
-            snd_info_free_entry(entry);
-            entry = NULL;
-        }
-    }
-    snd_memory_info_entry = entry;
-    return 0;
+        snd_info_entry_t *entry;
+
+        entry = snd_info_create_module_entry(THIS_MODULE, "meminfo", NULL);
+        if (entry) {
+                entry->content = SNDRV_INFO_CONTENT_TEXT;
+                entry->c.text.read_size = 256;
+                entry->c.text.read = snd_memory_info_read;
+                if (snd_info_register(entry) < 0) {
+                        snd_info_free_entry(entry);
+                        entry = NULL;
+                }
+        }
+        snd_memory_info_entry = entry;
+        return 0;
 }
 
 int __exit snd_memory_info_done(void)
 {
-    if (snd_memory_info_entry)
-        snd_info_unregister(snd_memory_info_entry);
-    return 0;
+        if (snd_memory_info_entry)
+                snd_info_unregister(snd_memory_info_entry);
+        return 0;
 }
 #else

GPL/branches/alsa-resync1/alsa-kernel/core/misc.c

@@ -21 +21 @@
 
 #include <sound/driver.h>
-#include <sound/firmware.h>
+#include <linux/firmware.h>
 int snd_task_name(struct task_struct *task, char *name, size_t size)
 {
@@ -541 +541 @@
 }
 
+#if 0
 void flush_workqueue(struct workqueue_struct *wq)
 {
@@ -561 +562 @@
         }
 }
+#endif 
 
 void destroy_workqueue(struct workqueue_struct *wq)
 {
+#if 0
     flush_workqueue(wq);
-#if 0
         kill_proc(wq->task_pid, SIGKILL, 1);
         if (wq->task_pid >= 0)
@@ -686 +688 @@
 }
 
-int request_firmware(const struct firmware **fw, const char *name)
+int request_firmware(const struct firmware **fw, const char *name,
+                     struct device *device)
 {
         struct firmware *firmware;

GPL/branches/alsa-resync1/alsa-kernel/core/pcm.c

@@ -21 +21 @@
 
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/pcm.h>
@@ -564 +568 @@
 int snd_pcm_new_stream(snd_pcm_t *pcm, int stream, int substream_count)
 {
-    int idx, err;
+        int idx, err;
     snd_pcm_str_t *pstr = &pcm->streams[stream];
     struct snd_pcm_substream *substream, *prev;
 
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
-    init_MUTEX(&pstr->oss.setup_mutex);
+        init_MUTEX(&pstr->oss.setup_mutex);
 #endif
-    pstr->stream = stream;
-    pstr->pcm = pcm;
-    pstr->substream_count = substream_count;
-    pstr->reg = &snd_pcm_reg[stream];
-    if (substream_count > 0) {
-        err = snd_pcm_stream_proc_init(pstr);
-        if (err < 0)
-            return err;
-    }
-    prev = NULL;
-    for (idx = 0, prev = NULL; idx < substream_count; idx++) {
-        substream = (struct snd_pcm_substream *)kzalloc(sizeof(*substream), GFP_KERNEL);
-        if (substream == NULL)
-            return -ENOMEM;
-        substream->pcm = pcm;
-        substream->pstr = pstr;
-        substream->number = idx;
-        substream->stream = stream;
-        sprintf(substream->name, "subdevice #%i", idx);
-        substream->buffer_bytes_max = UINT_MAX;
-        if (prev == NULL)
-            pstr->substream = substream;
-        else
-            prev->next = substream;
-        err = snd_pcm_substream_proc_init(substream);
-        if (err < 0) {
-            kfree(substream);
-            return err;
-        }
-        substream->group = &substream->self_group;
-        spin_lock_init(&substream->self_group.lock);
-        INIT_LIST_HEAD(&substream->self_group.substreams);
-        list_add_tail(&substream->link_list, &substream->self_group.substreams);
-        spin_lock_init(&substream->timer_lock);
-        prev = substream;
-    }
-    return 0;
-}
+        pstr->stream = stream;
+        pstr->pcm = pcm;
+        pstr->substream_count = substream_count;
+        pstr->reg = &snd_pcm_reg[stream];
+        if (substream_count > 0) {
+                err = snd_pcm_stream_proc_init(pstr);
+                if (err < 0)
+                        return err;
+        }
+        prev = NULL;
+        for (idx = 0, prev = NULL; idx < substream_count; idx++) {
+                substream = (struct snd_pcm_substream *)kzalloc(sizeof(*substream), GFP_KERNEL);
+                if (substream == NULL)
+                        return -ENOMEM;
+                substream->pcm = pcm;
+                substream->pstr = pstr;
+                substream->number = idx;
+                substream->stream = stream;
+                sprintf(substream->name, "subdevice #%i", idx);
+                substream->buffer_bytes_max = UINT_MAX;
+                if (prev == NULL)
+                        pstr->substream = substream;
+                else
+                        prev->next = substream;
+                err = snd_pcm_substream_proc_init(substream);
+                if (err < 0) {
+                        kfree(substream);
+                        return err;
+                }
+                substream->group = &substream->self_group;
+                spin_lock_init(&substream->self_group.lock);
+                INIT_LIST_HEAD(&substream->self_group.substreams);
+                list_add_tail(&substream->link_list, &substream->self_group.substreams);
+                spin_lock_init(&substream->timer_lock);
+                prev = substream;
+        }
+        return 0;
+}                               
 
 /**
@@ -627 +631 @@
  */
 int snd_pcm_new(snd_card_t * card, char *id, int device,
-                int playback_count, int capture_count,
-                snd_pcm_t ** rpcm)
-{
-    snd_pcm_t *pcm;
-    int err;
-    static snd_device_ops_t ops = {
-        snd_pcm_dev_free,
-        snd_pcm_dev_register,
-        snd_pcm_dev_disconnect,
-        snd_pcm_dev_unregister
-    };
-
-    snd_assert(rpcm != NULL, return -EINVAL);
-    *rpcm = NULL;
-    snd_assert(card != NULL, return -ENXIO);
-    pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);
-    if (pcm == NULL)
-        return -ENOMEM;
-    pcm->card = card;
-    pcm->device = device;
-    if (id) {
-        strlcpy(pcm->id, id, sizeof(pcm->id));
-    }
-    if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK, playback_count)) < 0) {
-        snd_pcm_free(pcm);
-        return err;
-    }
-    if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count)) < 0) {
-        snd_pcm_free(pcm);
+                int playback_count, int capture_count,
+                snd_pcm_t ** rpcm)
+{
+        snd_pcm_t *pcm;
+        int err;
+        static snd_device_ops_t ops = {
+                snd_pcm_dev_free,
+                snd_pcm_dev_register,
+                snd_pcm_dev_disconnect,
+                snd_pcm_dev_unregister
+        };
+
+        snd_assert(rpcm != NULL, return -EINVAL);
+        *rpcm = NULL;
+        snd_assert(card != NULL, return -ENXIO);
+        pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);
+        if (pcm == NULL)
+                return -ENOMEM;
+        pcm->card = card;
+        pcm->device = device;
+        if (id) {
+                strlcpy(pcm->id, id, sizeof(pcm->id));
+        }
+        if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK, playback_count)) < 0) {
+                snd_pcm_free(pcm);
+                return err;
+        }
+        if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count)) < 0) {
+                snd_pcm_free(pcm);
         return err;
     }

GPL/branches/alsa-resync1/alsa-kernel/core/rawmidi.c

@@ -20 +20 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <sound/core.h>
+#include <linux/major.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <linux/wait.h>
 #include <sound/rawmidi.h>
 #include <sound/info.h>
@@ -346 +352 @@
 static int snd_rawmidi_open(struct inode *inode, struct file *file)
 {
-    int major = MAJOR(inode->i_rdev);
+        int maj = major(inode->i_rdev);
     int cardnum;
     snd_card_t *card;
@@ -359 +365 @@
 
     printk("rawmidi open\n");
-    switch (major) {
+    switch (maj) {
     case CONFIG_SND_MAJOR:
         cardnum = SNDRV_MINOR_CARD(MINOR(inode->i_rdev));
@@ -382 +388 @@
         return -ENODEV;
 #ifdef CONFIG_SND_OSSEMUL
-    if (major == SOUND_MAJOR && !rmidi->ossreg)
+        if (maj == SOUND_MAJOR && !rmidi->ossreg)
         return -ENXIO;
 #endif
@@ -392 +398 @@
         return -ENODEV;
     fflags = snd_rawmidi_file_flags(file);
-    if ((file->f_flags & O_APPEND) || major != CONFIG_SND_MAJOR) /* OSS emul? */
+        if ((file->f_flags & O_APPEND) || maj != CONFIG_SND_MAJOR) /* OSS emul? */
         fflags |= SNDRV_RAWMIDI_LFLG_APPEND;
     fflags |= SNDRV_RAWMIDI_LFLG_NOOPENLOCK;
@@ -781 +787 @@
 #ifdef CONFIG_SND_DEBUG
     default:
-        snd_printk("rawmidi: unknown command = 0x%x\n", cmd);
+                snd_printk(KERN_WARNING "rawmidi: unknown command = 0x%x\n", cmd);
 #endif
     }
@@ -1454 +1460 @@
 }
 
-#ifdef CONFIG_SND_SEQUENCER
+#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
 static void snd_rawmidi_dev_seq_free(snd_seq_device_t *device)
 {
@@ -1482 +1488 @@
                                    rmidi->card, rmidi->device,
                                    &snd_rawmidi_reg, name)) < 0) {
-        snd_printk("unable to register rawmidi device %i:%i\n", rmidi->card->number, rmidi->device);
+                snd_printk(KERN_ERR "unable to register rawmidi device %i:%i\n", rmidi->card->number, rmidi->device);
         snd_rawmidi_devices[idx] = NULL;
         up(&register_mutex);
@@ -1499 +1505 @@
         if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
                                     rmidi->card, 0, &snd_rawmidi_reg, name) < 0) {
-            snd_printk("unable to register OSS rawmidi device %i:%i\n", rmidi->card->number, 0);
+                        snd_printk(KERN_ERR "unable to register OSS rawmidi device %i:%i\n", rmidi->card->number, 0);
         } else {
             rmidi->ossreg++;
@@ -1510 +1516 @@
         if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
                                     rmidi->card, 1, &snd_rawmidi_reg, name) < 0) {
-            snd_printk("unable to register OSS rawmidi device %i:%i\n", rmidi->card->number, 1);
+                        snd_printk(KERN_ERR "unable to register OSS rawmidi device %i:%i\n", rmidi->card->number, 1);
         } else {
             rmidi->ossreg++;
@@ -1529 +1535 @@
     }
     rmidi->proc_entry = entry;
-#ifdef CONFIG_SND_SEQUENCER
+#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
     if (!rmidi->ops || !rmidi->ops->dev_register) { /* own registration mechanism */
         if (snd_seq_device_new(rmidi->card, rmidi->device, SNDRV_SEQ_DEV_ID_MIDISYNTH, 0, &rmidi->seq_dev) >= 0) {
@@ -1584 +1590 @@
     snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device);
     up(&register_mutex);
-#ifdef CONFIG_SND_SEQUENCER
+#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
     if (rmidi->seq_dev) {
         snd_device_free(rmidi->card, rmidi->seq_dev);
@@ -1623 +1629 @@
     { int i;
         /* check device map table */
-        for (i = 0; i < SNDRV_CARDS; i++) {
-            if (midi_map[i] < 0 || midi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
-                snd_printk(KERN_ERR "invalid midi_map[%d] = %d\n", i, midi_map[i]);
-                midi_map[i] = 0;
-            }
-            if (amidi_map[i] < 0 || amidi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
-                snd_printk(KERN_ERR "invalid amidi_map[%d] = %d\n", i, amidi_map[i]);
-                amidi_map[i] = 1;
-            }
+                for (i = 0; i < SNDRV_CARDS; i++) {
+                        if (midi_map[i] < 0 || midi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
+                                snd_printk(KERN_ERR "invalid midi_map[%d] = %d\n", i, midi_map[i]);
+                                midi_map[i] = 0;
+                        }
+                        if (amidi_map[i] < 0 || amidi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
+                                snd_printk(KERN_ERR "invalid amidi_map[%d] = %d\n", i, amidi_map[i]);
+                                amidi_map[i] = 1;
+                        }
         }
     }

GPL/branches/alsa-resync1/alsa-kernel/core/rtctimer.c

@@ -17 +17 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  * 
@@ -29 +29 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/timer.h>
 #include <sound/info.h>
@@ -124 +126 @@
 
 #ifdef USE_TASKLET
-static void rtctimer_interrupt2(void *private_data)
-{
-        snd_timer_t *timer = private_data;
+static void rtctimer_interrupt2(unsigned long private_data)
+{
+        snd_timer_t *timer = (snd_timer_t *)private_data;
         snd_assert(timer != NULL, return);
         do {
@@ -151 +153 @@
 
         if (rtctimer_freq < 2 || rtctimer_freq > 8192) {
-                snd_printk("rtctimer: invalid frequency %d\n", rtctimer_freq);
+                snd_printk(KERN_ERR "rtctimer: invalid frequency %d\n", rtctimer_freq);
                 return -EINVAL;
         }
@@ -157 +159 @@
                 ;
         if (rtctimer_freq != order) {
-                snd_printk("rtctimer: invalid frequency %d\n", rtctimer_freq);
+                snd_printk(KERN_ERR "rtctimer: invalid frequency %d\n", rtctimer_freq);
                 return -EINVAL;
         }
@@ -167 +169 @@
 
 #ifdef USE_TASKLET
-        tasklet_init(&rtc_tq, rtctimer_interrupt2, timer);
+        tasklet_init(&rtc_tq, rtctimer_interrupt2, (unsigned long)timer);
 #endif /* USE_TASKLET */
 
@@ -213 +215 @@
 MODULE_PARM_DESC(rtctimer_freq, "timer frequency in Hz");
 
+MODULE_LICENSE("GPL");
+
+EXPORT_NO_SYMBOLS;
+
 #endif /* CONFIG_RTC || CONFIG_RTC_MODULE */

GPL/branches/alsa-resync1/alsa-kernel/core/timer.c

@@ -1873 +1873 @@
     snd_timer_proc_entry = entry;
     if ((err = snd_timer_register_system()) < 0)
-        snd_printk("unable to register system timer (%i)\n", err);
+                snd_printk(KERN_ERR "unable to register system timer (%i)\n", err);
     if ((err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER,
                                    NULL, 0, &snd_timer_reg, "timer"))<0)
-        snd_printk("unable to register timer device (%i)\n", err);
+                snd_printk(KERN_ERR "unable to register timer device (%i)\n", err);
     return 0;
 }

GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c

@@ -15 +15 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
@@ -26 +31 @@
 #define SNDRV_GET_ID
 #include <sound/initval.h>
+
+EXPORT_NO_SYMBOLS;
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -609 +616 @@
         if (snd_card_dummy_probe(dev) < 0) {
 #ifdef MODULE
-            snd_printk("Dummy soundcard #%i not found or device busy\n", dev + 1);
+                        printk(KERN_ERR "Dummy soundcard #%i not found or device busy\n", dev + 1);
 #endif
             break;
@@ -617 +624 @@
     if (!cards) {
 #ifdef MODULE
-        snd_printk("Dummy soundcard not found or device busy\n");
+                printk(KERN_ERR "Dummy soundcard not found or device busy\n");
 #endif
         return -ENODEV;
@@ -637 +644 @@
 #ifndef MODULE
 
-/* format is: snd-card-dummy=snd_enable,snd_index,snd_id,
+/* format is: snd-dummy=snd_enable,snd_index,snd_id,
  snd_pcm_devs,snd_pcm_substreams */
 

GPL/branches/alsa-resync1/alsa-kernel/drivers/mpu401/mpu401.c

@@ -20 +20 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/mpu401.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
+#include <linux/delay.h>
+
+EXPORT_NO_SYMBOLS;
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -119 +126 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("MPU-401 device not found or device busy\n");
+                printk(KERN_ERR "MPU-401 device not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -139 +146 @@
 #ifndef MODULE
 
-/* format is: snd-mpu401=enable,index,id,port,irq */
+/* format is: snd-mpu401=snd_enable,snd_index,snd_id,snd_port,snd_irq */
 
 static int __init alsa_card_mpu401_setup(char *str)

GPL/branches/alsa-resync1/alsa-kernel/drivers/mtpav.c

@@ -17 +17 @@
  *      You should have received a copy of the GNU General Public License
  *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  *
@@ -51 +51 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
 #include <sound/rawmidi.h>
+#include <linux/delay.h>
 
 /*
@@ -61 +65 @@
  */
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Michael T. Mayers");
 MODULE_DESCRIPTION("MOTU MidiTimePiece AV multiport MIDI");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{MOTU,MidiTimePiece AV multiport MIDI}}");
@@ -84 +91 @@
 MODULE_PARM(snd_port, "l");
 MODULE_PARM_DESC(snd_port, "Parallel port # for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_port, "allows:{{0x378},{0x278}},dialog:list");
+MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED ",allows:{{0x378},{0x278}},dialog:list");
 MODULE_PARM(snd_irq, "i");
 MODULE_PARM_DESC(snd_irq, "Parallel IRQ # for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_irq,  "allows:{{7},{5}},dialog:list");
+MODULE_PARM_SYNTAX(snd_irq,  SNDRV_ENABLED ",allows:{{7},{5}},dialog:list");
 MODULE_PARM(snd_hwports, "i");
 MODULE_PARM_DESC(snd_hwports, "Hardware ports # for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_hwports, "allows:{{1,8}},dialog:list");
+MODULE_PARM_SYNTAX(snd_hwports, SNDRV_ENABLED ",allows:{{1,8}},dialog:list");
 
 /*
@@ -721 +728 @@
         if (crd->irq >= 0)
                 free_irq(crd->irq, (void *)crd);
-        if (crd->res_port)
+        if (crd->res_port) {
                 release_resource(crd->res_port);
+                kfree_nocheck(crd->res_port);
+        }
         if (crd != NULL)
                 kfree(crd);
@@ -769 +778 @@
         snd_mtpav_portscan(mtp_card);
 
-        snd_printk("Motu MidiTimePiece on parallel port irq: %d ioport: 0x%lx\n", snd_irq, snd_port);
+        printk(KERN_INFO "Motu MidiTimePiece on parallel port irq: %d ioport: 0x%lx\n", snd_irq, snd_port);
 
         return 0;
@@ -799 +808 @@
 #ifndef MODULE
 
-/* format is: snd-card-mtpav=snd_enable,snd_index,snd_id,
+/* format is: snd-mtpav=snd_enable,snd_index,snd_id,
                              snd_port,snd_irq,snd_hwports */
 
@@ -815 +824 @@
 }
 
-__setup("snd-card-mtpav=", alsa_card_mtpav_setup);
+__setup("snd-mtpav=", alsa_card_mtpav_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/drivers/serial-u16550.c

@@ -8 +8 @@
  *   This code is based on the code from ALSA 0.5.9, but heavily rewritten.
  *
- * Sat Mar 31 17:27:57 PST 2001 tim.mann@compaq.com
+ * Sat Mar 31 17:27:57 PST 2001 tim.mann@compaq.com 
  *      Added support for the Midiator MS-124T and for the MS-124W in
  *      Single Addressed (S/A) or Multiple Burst (M/B) mode, with
  *      power derived either parasitically from the serial port or
  *      from a separate power supply.
- *
+ * 
  *      The new snd_adaptor module parameter allows you to select
  *      either the default Roland Soundcanvas support (0), which was
@@ -21 +21 @@
  *      Midiator MS-124W, you must set the physical M-S and A-B
  *      switches on the Midiator to match the driver mode you select.
- *
+ *  
  *      - In Roland Soundcanvas mode, multiple ALSA raw MIDI
  *      substreams are supported (midiCnD0-midiCnD15).  Whenever you
@@ -99 +99 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-
-#define SNDRV_MAIN_OBJECT_FILE
-
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/rawmidi.h>
 #define SNDRV_GET_ID
@@ -115 +116 @@
 EXPORT_NO_SYMBOLS;
 MODULE_DESCRIPTION("MIDI serial");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{ALSA, MIDI serial}}");
@@ -769 +771 @@
     if (uart->irq >= 0)
         free_irq(uart->irq, (void *)uart);
-    if (uart->res_base)
+        if (uart->res_base) {
         release_resource(uart->res_base);
-    kfree(uart);
+                kfree_nocheck(uart->res_base);
+        }
+        snd_magic_kfree(uart);
     return 0;
 };
@@ -918 +922 @@
     if ((err = snd_uart16550_detect(snd_port[dev])) <= 0) {
         snd_card_free(card);
-        snd_printk("no UART detected at 0x%lx\n", (long)snd_port[dev]);
+                printk(KERN_ERR "no UART detected at 0x%lx\n", (long)snd_port[dev]);
         return err;
     }
@@ -967 +971 @@
     if (cards == 0) {
 #ifdef MODULE
-        snd_printk("serial midi soundcard not found or device busy\n");
+                printk(KERN_ERR "serial midi soundcard not found or device busy\n");
 #endif
         return -ENODEV;
@@ -989 +993 @@
 #ifndef MODULE
 
-/* format is: snd-card-serial=snd_enable,snd_index,snd_id,
+/* format is: snd-serial=snd_enable,snd_index,snd_id,
  snd_port,snd_irq,snd_speed,snd_base,snd_outs */
 
@@ -1011 +1015 @@
 }
 
-__setup("snd-card-serial=", alsa_card_serial_setup);
+__setup("snd-serial=", alsa_card_serial_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/drivers/virmidi.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -30 +30 @@
  *
  * Typical usage is like following:
- * - Load snd-card-virmidi module.
- *      # modprobe snd-card-virmidi snd_index=2
+ * - Load snd-virmidi module.
+ *      # modprobe snd-virmidi snd_index=2
  *   Then, sequencer clients 72:0 to 75:0 will be created, which are
  *   mapped from /dev/snd/midiC1D0 to /dev/snd/midiC1D3, respectively.
@@ -42 +42 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <sound/core.h>
 #include <sound/seq_kernel.h>
 #include <sound/seq_virmidi.h>
@@ -50 +53 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("Dummy soundcard for virtual rawmidi devices");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{ALSA,Virtual rawmidi device}}");
@@ -136 +142 @@
         if (snd_card_virmidi_probe(dev) < 0) {
 #ifdef MODULE
-            snd_printk("Card-VirMIDI #%i not found or device busy\n", dev + 1);
+                        printk(KERN_ERR "Card-VirMIDI #%i not found or device busy\n", dev + 1);
 #endif
             break;
@@ -144 +150 @@
     if (!cards) {
 #ifdef MODULE
-        snd_printk("Card-VirMIDI soundcard not found or device busy\n");
+                printk(KERN_ERR "Card-VirMIDI soundcard not found or device busy\n");
 #endif
         return -ENODEV;
@@ -164 +170 @@
 #ifndef MODULE
 
-/* format is: snd-card-virmidi=snd_enable,snd_index,snd_id,snd_midi_devs */
+/* format is: snd-virmidi=snd_enable,snd_index,snd_id,snd_midi_devs */
 
 static int __init alsa_card_virmidi_setup(char *str)
@@ -180 +186 @@
 }
 
-__setup("snd-card-virmidi=", alsa_card_virmidi_setup);
+__setup("snd-virmidi=", alsa_card_virmidi_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/include/sound/driver.h

@@ -106 +106 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7)
 #include <linux/malloc.h>
+#else
+#include <linux/slab.h>
+#endif
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <linux/ioport.h>
@@ -136 +141 @@
 #endif
 #include "compat_22.h"
-#endif
+#endif /* LINUX_2_2 */
+
 #ifdef LINUX_2_3
 #include <linux/init.h>
@@ -166 +172 @@
 #define pci_alloc_consistent snd_pci_hack_alloc_consistent
 #endif /* i386 or ppc */
+#ifndef list_for_each_safe
+#define list_for_each_safe(pos, n, head) \
+        for (pos = (head)->next, n = pos->next; pos != (head); pos = n, n = pos->next)
+#endif
 #endif
 
@@ -180 +190 @@
 #endif
 
+#ifndef MODULE_LICENSE
+#define MODULE_LICENSE(license)
 #ifndef PCI_D0
 #define PCI_D0     0
@@ -227 +239 @@
 #define schedule_work(w) snd_compat_schedule_work(w)
 
-/* Name change */
+/* Typedef's */
 typedef struct timeval snd_timestamp_t;
 #ifndef TARGET_OS2

GPL/branches/alsa-resync1/alsa-kernel/include/sound/initval.h

@@ -1 @@
-#ifndef __INITVAL_H
-#define __INITVAL_H
+#ifndef __SOUND_INITVAL_H
+#define __SOUND_INITVAL_H
 
 /*
@@ -18 +18 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -73 +73 @@
 #define SNDRV_DEFAULT_ENABLE    { 1,1,1,1,1,1,1,1 }
 #define SNDRV_DEFAULT_ENABLE_PNP        SNDRV_DEFAULT_ENABLE
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
 #define SNDRV_DEFAULT_PORT      { REPEAT_SNDRV(-1) }
 #define SNDRV_DEFAULT_IRQ       { REPEAT_SNDRV(SNDRV_AUTO_IRQ) }
@@ -85 +86 @@
 #define SNDRV_DEFAULT_STR       { [0 ... (SNDRV_CARDS-1)] = NULL }
 #define SNDRV_DEFAULT_ENABLE    { 1, [1 ... (SNDRV_CARDS-1)] = 0 }
+#define SNDRV_DEFAULT_ENABLE_PNP { [0 ... (SNDRV_CARDS-1)] = 1 }
+#ifdef __ISAPNP__
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
+#else
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
+#endif
 #define SNDRV_DEFAULT_PORT      { SNDRV_AUTO_PORT, [1 ... (SNDRV_CARDS-1)] = -1 }
 #define SNDRV_DEFAULT_IRQ       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
@@ -196 +203 @@
 #endif
 
-#endif                          /* __INITVAL_H */
+#endif /* __SOUND_INITVAL_H */

GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm_params.h

@@ -1 @@
-#ifndef __PCM_PARAMS_H
-#define __PCM_PARAMS_H
+#ifndef __SOUND_PCM_PARAMS_H
+#define __SOUND_PCM_PARAMS_H
 
 /*
@@ -19 +19 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -363 +363 @@
 #undef assert
 
-#endif
+#endif /* __SOUND_PCM_PARAMS_H */
+

GPL/branches/alsa-resync1/alsa-kernel/include/sound/version.h

@@ -2 +2 @@
  *  Configuration header file for compilation of the ALSA driver
  */
+#define CONFIG_SND_DATE "04-29-2007"
 
 #ifndef __ALSA_VERSION_H__

GPL/branches/alsa-resync1/alsa-kernel/isa/ad1816a/ad1816a.c

@@ -16 +16 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -29 +37 @@
 #define chip_t ad1816a_t
 
+#define PFX "ad1816a: "
+
 EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
 MODULE_DESCRIPTION("AD1816A, AD1815");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Highscreen,Sound-Boostar 16 3D},"
@@ -36 +48 @@
                 "{Analog Devices,AD1816A},"
                 "{TerraTec,Base 64},"
-                "{Aztech/Newcom SC-16 3D}}");
+                "{TerraTec,AudioSystem EWS64S},"
+                "{Aztech/Newcom SC-16 3D},"
+                "{Shark Predator ISA}}");
 
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 1-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;       /* Enable this card */
 static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
 static long snd_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* PnP setup */
@@ -121 +135 @@
         /* Analog Devices AD1816A - Terratec Base 64 */
         ISAPNP_AD1816A('T','E','R',0x1411,'A','D','S',0x7180,0x7181),
+        /* Analog Devices AD1816A - Terratec AudioSystem EWS64S */
+        ISAPNP_AD1816A('T','E','R',0x1112,'A','D','S',0x7180,0x7181),
         /* Analog Devices AD1816A - Aztech/Newcom SC-16 3D */
         ISAPNP_AD1816A('A','Z','T',0x1022,'A','Z','T',0x1018,0x2002),
+        /* Shark Predator ISA - added by Ken Arromdee */
+        ISAPNP_AD1816A('S','M','M',0x7180,'A','D','S',0x7180,0x7181),
         { ISAPNP_CARD_END, }
 };
@@ -170 +188 @@
 
         if (pdev->activate(pdev) < 0) {
-                snd_printk("AUDIO isapnp configure failure\n");
+                printk(KERN_ERR PFX "AUDIO isapnp configure failure\n");
                 return -EBUSY;
         }
@@ -196 +214 @@
         if (pdev->activate(pdev) < 0) {
                 /* not fatal error */
-                snd_printk("MPU-401 isapnp configure failure\n");
+                printk(KERN_ERR PFX "MPU-401 isapnp configure failure\n");
                 snd_mpu_port[dev] = -1;
                 acard->devmpu = NULL;
@@ -251 +269 @@
         }
 #else
-        snd_printk("you have to enable ISA PnP support.\n");
+        printk(KERN_ERR PFX "you have to enable ISA PnP support.\n");
         return -ENOSYS;
 #endif  /* __ISAPNP__ */
@@ -278 +296 @@
                                         snd_mpu_port[dev], 0, snd_mpu_irq[dev], SA_INTERRUPT,
                                         NULL) < 0)
-                        snd_printk("no MPU-401 device at 0x%lx.\n", snd_mpu_port[dev]);
+                        printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", snd_mpu_port[dev]);
         }
 
@@ -285 +303 @@
                                     snd_fm_port[dev], snd_fm_port[dev] + 2,
                                     OPL3_HW_AUTO, 0, &opl3) < 0) {
-                        snd_printk("no OPL device at 0x%lx-0x%lx.\n", snd_fm_port[dev], snd_fm_port[dev] + 2);
+                        printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx.\n", snd_fm_port[dev], snd_fm_port[dev] + 2);
                 } else {
                         if ((error = snd_opl3_timer_new(opl3, 1, 2)) < 0) {
@@ -340 +358 @@
         cards += isapnp_probe_cards(snd_ad1816a_pnpids, snd_ad1816a_isapnp_detect);
 #else
-        snd_printk("you have to enable ISA PnP support.\n");
+        printk(KERN_ERR PFX "you have to enable ISA PnP support.\n");
 #endif
 #ifdef MODULE
         if (!cards)
-                snd_printk("no AD1816A based soundcards found.\n");
+                printk(KERN_ERR "no AD1816A based soundcards found.\n");
 #endif  /* MODULE */
         return cards ? 0 : -ENODEV;
@@ -362 +380 @@
 #ifndef MODULE
 
-/* format is: snd-card-ad1816a=snd_enable,snd_index,snd_id,snd_port,
+/* format is: snd-ad1816a=snd_enable,snd_index,snd_id,snd_port,
                                snd_mpu_port,snd_fm_port,snd_irq,snd_mpu_irq,
                                snd_dma1,snd_dma2 */
@@ -386 +404 @@
 }
 
-__setup("snd-card-ad1816a=", alsa_card_ad1816a_setup);
+__setup("snd-ad1816a=", alsa_card_ad1816a_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/ad1816a/ad1816a_lib.c

@@ -16 +16 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/ad1816a.h>
+
+MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
+MODULE_DESCRIPTION("lowlevel code for Analog Devices AD1816A chip");
+MODULE_LICENSE("GPL");
 
 #define chip_t ad1816a_t
@@ -233 +242 @@
                 AD1816A_PLAYBACK_ENABLE | AD1816A_PLAYBACK_PIO, 0x00);
 
-        snd_dma_program(chip->dma1, runtime->dma_area, size,
+        snd_dma_program(chip->dma1, runtime->dma_addr, size,
                         DMA_MODE_WRITE | DMA_AUTOINIT);
 
@@ -262 +271 @@
                 AD1816A_CAPTURE_ENABLE | AD1816A_CAPTURE_PIO, 0x00);
 
-        snd_dma_program(chip->dma2, runtime->dma_area, size,
+        snd_dma_program(chip->dma2, runtime->dma_addr, size,
                         DMA_MODE_READ | DMA_AUTOINIT);
 
@@ -490 +499 @@
         snd_pcm_limit_isa_dma_size(chip->dma1, &runtime->hw.buffer_bytes_max);
         snd_pcm_limit_isa_dma_size(chip->dma1, &runtime->hw.period_bytes_max);
+        chip->playback_substream = substream;
         return 0;
 }
@@ -505 +515 @@
         snd_pcm_limit_isa_dma_size(chip->dma2, &runtime->hw.buffer_bytes_max);
         snd_pcm_limit_isa_dma_size(chip->dma2, &runtime->hw.period_bytes_max);
+        chip->capture_substream = substream;
         return 0;
 }
@@ -573 +584 @@
 static int snd_ad1816a_free(ad1816a_t *chip)
 {
-        if (chip->res_port)
+        if (chip->res_port) {
                 release_resource(chip->res_port);
+                kfree_nocheck(chip->res_port);
+        }
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void *) chip);
@@ -745 +758 @@
         snd_ad1816a_init(chip);
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
 
         chip->pcm = pcm;
@@ -978 +991 @@
 static snd_kcontrol_new_t snd_ad1816a_controls[] = {
 AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),
-AD1816A_DOUBLE("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 0),
+AD1816A_DOUBLE("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1),
 AD1816A_DOUBLE("PCM Playback Switch", AD1816A_VOICE_ATT, 15, 7, 1, 1),
-AD1816A_DOUBLE("PCM Playback Volume", AD1816A_VOICE_ATT, 8, 0, 63, 0),
+AD1816A_DOUBLE("PCM Playback Volume", AD1816A_VOICE_ATT, 8, 0, 63, 1),
 AD1816A_DOUBLE("Line Playback Switch", AD1816A_LINE_GAIN_ATT, 15, 7, 1, 1),
-AD1816A_DOUBLE("Line Playback Volume", AD1816A_LINE_GAIN_ATT, 8, 0, 31, 0),
+AD1816A_DOUBLE("Line Playback Volume", AD1816A_LINE_GAIN_ATT, 8, 0, 31, 1),
 AD1816A_DOUBLE("CD Playback Switch", AD1816A_CD_GAIN_ATT, 15, 7, 1, 1),
-AD1816A_DOUBLE("CD Playback Volume", AD1816A_CD_GAIN_ATT, 8, 0, 31, 0),
+AD1816A_DOUBLE("CD Playback Volume", AD1816A_CD_GAIN_ATT, 8, 0, 31, 1),
 AD1816A_DOUBLE("Synth Playback Switch", AD1816A_SYNTH_GAIN_ATT, 15, 7, 1, 1),
-AD1816A_DOUBLE("Synth Playback Volume", AD1816A_SYNTH_GAIN_ATT, 8, 0, 31, 0),
+AD1816A_DOUBLE("Synth Playback Volume", AD1816A_SYNTH_GAIN_ATT, 8, 0, 31, 1),
 AD1816A_DOUBLE("FM Playback Switch", AD1816A_FM_ATT, 15, 7, 1, 1),
-AD1816A_DOUBLE("FM Playback Volume", AD1816A_FM_ATT, 8, 0, 63, 0),
+AD1816A_DOUBLE("FM Playback Volume", AD1816A_FM_ATT, 8, 0, 63, 1),
 AD1816A_SINGLE("Mic Playback Switch", AD1816A_MIC_GAIN_ATT, 15, 1, 1),
-AD1816A_SINGLE("Mic Playback Volume", AD1816A_MIC_GAIN_ATT, 8, 63, 0),
+AD1816A_SINGLE("Mic Playback Volume", AD1816A_MIC_GAIN_ATT, 8, 63, 1),
 AD1816A_SINGLE("Mic Boost", AD1816A_MIC_GAIN_ATT, 14, 1, 0),
 AD1816A_DOUBLE("Video Playback Switch", AD1816A_VID_GAIN_ATT, 15, 7, 1, 1),
-AD1816A_DOUBLE("Video Playback Volume", AD1816A_VID_GAIN_ATT, 8, 0, 31, 0),
+AD1816A_DOUBLE("Video Playback Volume", AD1816A_VID_GAIN_ATT, 8, 0, 31, 1),
 AD1816A_SINGLE("Phone Capture Switch", AD1816A_PHONE_IN_GAIN_ATT, 15, 1, 1),
-AD1816A_SINGLE("Phone Capture Volume", AD1816A_PHONE_IN_GAIN_ATT, 0, 31, 0),
+AD1816A_SINGLE("Phone Capture Volume", AD1816A_PHONE_IN_GAIN_ATT, 0, 15, 1),
 AD1816A_SINGLE("Phone Playback Switch", AD1816A_PHONE_OUT_ATT, 7, 1, 1),
-AD1816A_SINGLE("Phone Playback Volume", AD1816A_PHONE_OUT_ATT, 0, 31, 0),
+AD1816A_SINGLE("Phone Playback Volume", AD1816A_PHONE_OUT_ATT, 0, 31, 1),
 {
 #ifdef TARGET_OS2

GPL/branches/alsa-resync1/alsa-kernel/isa/ad1848/ad1848.c

@@ -18 +18 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <sound/core.h>
 #include <sound/ad1848.h>
 #define SNDRV_GET_ID
@@ -31 +34 @@
 
 EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("Tugrul Galatali <galatalt@stuy.edu>, Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("AD1848/AD1847/CS4248");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Analog Devices,AD1848},"
@@ -131 +136 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("AD1848 soundcard not found or device busy\n");
+                printk(KERN_ERR "AD1848 soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -151 +156 @@
 #ifndef MODULE
 
-/* format is: snd-card-ad1848=snd_enable,snd_index,snd_id,snd_port,
+/* format is: snd-ad1848=snd_enable,snd_index,snd_id,snd_port,
                               snd_irq,snd_dma1 */
 
@@ -170 +175 @@
 }
 
-__setup("snd-card-ad1848=", alsa_card_ad1848_setup);
+__setup("snd-ad1848=", alsa_card_ad1848_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/ad1848/ad1848_lib.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -22 +22 @@
 #define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/ad1848.h>
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_DESCRIPTION("Routines for control of AD1848/AD1847/CS4248");
+MODULE_LICENSE("GPL");
 
 #define chip_t ad1848_t
@@ -114 +123 @@
 }
 
-static void snd_ad1848_dout(ad1848_t *chip,
+void snd_ad1848_dout(ad1848_t *chip,
                             unsigned char reg,
                             unsigned char value)
@@ -127 +136 @@
 }
 
-static unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg)
+unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg)
 {
         int timeout;
@@ -172 +181 @@
  */
 
-static void snd_ad1848_mce_up(ad1848_t *chip)
+void snd_ad1848_mce_up(ad1848_t *chip)
 {
         unsigned long flags;
@@ -193 +202 @@
 }
 
-static void snd_ad1848_mce_down(ad1848_t *chip)
+void snd_ad1848_mce_down(ad1848_t *chip)
 {
         unsigned long flags;
@@ -292 +301 @@
                 }
                 snd_ad1848_out(chip, AD1848_IFACE_CTRL, chip->image[AD1848_IFACE_CTRL] |= what);
+                chip->mode |= AD1848_MODE_RUNNING;
         } else if (cmd == SNDRV_PCM_TRIGGER_STOP) {
                 if (!(chip->image[AD1848_IFACE_CTRL] & what)) {
@@ -298 +308 @@
                 }
                 snd_ad1848_out(chip, AD1848_IFACE_CTRL, chip->image[AD1848_IFACE_CTRL] &= ~what);
+                chip->mode &= ~AD1848_MODE_RUNNING;
         } else {
                 result = -EINVAL;
@@ -524 +535 @@
         chip->dma_size = size;
         chip->image[AD1848_IFACE_CTRL] &= ~(AD1848_PLAYBACK_ENABLE | AD1848_PLAYBACK_PIO);
-        snd_dma_program(chip->dma, runtime->dma_area, size, DMA_MODE_WRITE | DMA_AUTOINIT);
+        snd_dma_program(chip->dma, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
         count = snd_ad1848_get_count(chip->image[AD1848_DATA_FORMAT], count) - 1;
         spin_lock_irqsave(&chip->reg_lock, flags);
@@ -568 +579 @@
         chip->dma_size = size;
         chip->image[AD1848_IFACE_CTRL] &= ~(AD1848_CAPTURE_ENABLE | AD1848_CAPTURE_PIO);
-        snd_dma_program(chip->dma, runtime->dma_area, size, DMA_MODE_READ | DMA_AUTOINIT);
+        snd_dma_program(chip->dma, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
         count = snd_ad1848_get_count(chip->image[AD1848_DATA_FORMAT], count) - 1;
         spin_lock_irqsave(&chip->reg_lock, flags);
@@ -581 +592 @@
         ad1848_t *chip = snd_magic_cast(ad1848_t, dev_id, return);
 
-        if ((chip->mode & AD1848_MODE_PLAY) && chip->playback_substream)
+        if ((chip->mode & AD1848_MODE_PLAY) && chip->playback_substream &&
+            (chip->mode & AD1848_MODE_RUNNING))
                 snd_pcm_period_elapsed(chip->playback_substream);
-        if ((chip->mode & AD1848_MODE_CAPTURE) && chip->capture_substream)
+        if ((chip->mode & AD1848_MODE_CAPTURE) && chip->capture_substream &&
+            (chip->mode & AD1848_MODE_RUNNING))
                 snd_pcm_period_elapsed(chip->capture_substream);
         outb(0, AD1848P(chip, STATUS)); /* clear global interrupt bit */
@@ -821 +834 @@
 static int snd_ad1848_free(ad1848_t *chip)
 {
-        if (chip->res_port)
+        if (chip->res_port) {
                 release_resource(chip->res_port);
+                kfree_nocheck(chip->res_port);
+        }
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void *) chip);
@@ -980 +995 @@
         strcpy(pcm->name, snd_ad1848_chip_id(chip));
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, chip->dma > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip->dma > 3 ? 128*1024 : 64*1024);
 
         chip->pcm = pcm;
@@ -995 +1010 @@
 {
         static char *texts[4] = {
-                "Line1", "Aux", "Line2", "Mix"
+                "Line", "Aux", "Mic", "Mix"
         };
 
@@ -1172 +1187 @@
 AD1848_DOUBLE("Aux Playback Switch", 1, AD1848_AUX2_LEFT_INPUT, AD1848_AUX2_RIGHT_INPUT, 7, 7, 1, 1),
 AD1848_DOUBLE("Aux Playback Volume", 1, AD1848_AUX2_LEFT_INPUT, AD1848_AUX2_RIGHT_INPUT, 0, 0, 31, 1),
-AD1848_DOUBLE("Capture Volume", 0, AD1848_LEFT_INPUT, AD1848_LEFT_INPUT, 0, 0, 15, 0),
+AD1848_DOUBLE("Capture Volume", 0, AD1848_LEFT_INPUT, AD1848_RIGHT_INPUT, 0, 0, 15, 0),
 {
 #ifdef TARGET_OS2
@@ -1212 +1227 @@
 }
 
+EXPORT_SYMBOL(snd_ad1848_in);
 EXPORT_SYMBOL(snd_ad1848_out);
+EXPORT_SYMBOL(snd_ad1848_dout);
+EXPORT_SYMBOL(snd_ad1848_mce_up);
+EXPORT_SYMBOL(snd_ad1848_mce_down);
 EXPORT_SYMBOL(snd_ad1848_interrupt);
 EXPORT_SYMBOL(snd_ad1848_create);

GPL/branches/alsa-resync1/alsa-kernel/isa/als100.c

@@ -18 +18 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
 #define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -31 +36 @@
 #define chip_t sb_t
 
+#define PFX "als100: "
+
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
 MODULE_DESCRIPTION("Avance Logic ALS1X0");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Avance Logic,ALS100 - PRO16PNP},"
                 "{Avance Logic,ALS110},"
+                "{Avance Logic,ALS120},"
+                "{Avance Logic,ALS200},"
                 "{3D Melody,MF1000},"
                 "{Digimate,3D Sound},"
@@ -122 +134 @@
         /* ALS120 */
         ISAPNP_ALS100('A','L','S',0x0120,0x2001,0x2001,0x2001),
+        /* ALS200 */
+        ISAPNP_ALS100('A','L','S',0x0200,0x0020,0x0020,0x0001),
         /* RTL3000 */
         ISAPNP_ALS100('R','T','L',0x3000,0x2001,0x2001,0x2001),
@@ -173 +187 @@
 
         if (pdev->activate(pdev)<0) {
-                snd_printk("AUDIO isapnp configure failure\n");
+                printk(KERN_ERR PFX "AUDIO isapnp configure failure\n");
                 return -EBUSY;
         }
@@ -196 +210 @@
 
         if (pdev->activate(pdev)<0) {
-                snd_printk("MPU-401 isapnp configure failure\n");
+                printk(KERN_ERR PFX "MPU-401 isapnp configure failure\n");
                 snd_mpu_port[dev] = -1;
                 acard->devmpu = NULL;
@@ -214 +228 @@
 
         if (pdev->activate(pdev)<0) {
-                snd_printk("OPL isapnp configure failure\n");
+                printk(KERN_ERR PFX "OPL isapnp configure failure\n");
                 snd_fm_port[dev] = -1;
                 acard->devopl = NULL;
@@ -272 +286 @@
         }
 #else
-        snd_printk("you have to enable PnP support ...\n");
+        printk(KERN_ERR PFX "you have to enable PnP support ...\n");
         snd_card_free(card);
         return -ENOSYS;
@@ -302 +316 @@
                                         snd_mpu_irq[dev], SA_INTERRUPT,
                                         NULL) < 0)
-                        snd_printk("no MPU-401 device at 0x%lx\n", snd_mpu_port[dev]);
+                        printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", snd_mpu_port[dev]);
         }
 
@@ -309 +323 @@
                                     snd_fm_port[dev], snd_fm_port[dev] + 2,
                                     OPL3_HW_AUTO, 0, &opl3) < 0) {
-                        snd_printk("no OPL device at 0x%lx-0x%lx\n",
+                        printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
                                 snd_fm_port[dev], snd_fm_port[dev] + 2);
                 } else {
@@ -365 +379 @@
         cards += isapnp_probe_cards(snd_als100_pnpids, snd_als100_isapnp_detect);
 #else
-        snd_printk("you have to enable ISA PnP support.\n");
+        printk(KERN_ERR PFX "you have to enable ISA PnP support.\n");
 #endif
 #ifdef MODULE
         if (!cards)
-                snd_printk("no ALS100 based soundcards found\n");
+                printk(KERN_ERR "no ALS100 based soundcards found\n");
 #endif
         return cards ? 0 : -ENODEV;
@@ -387 +401 @@
 #ifndef MODULE
 
-/* format is: snd-card-als100=snd_enable,snd_index,snd_id,snd_port,
+/* format is: snd-als100=snd_enable,snd_index,snd_id,snd_port,
                               snd_mpu_port,snd_fm_port,snd_irq,snd_mpu_irq,
                               snd_dma8,snd_dma16 */
@@ -411 +425 @@
 }
 
-__setup("snd-card-als100=", alsa_card_als100_setup);
+__setup("snd-als100=", alsa_card_als100_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/azt2320.c

@@ -16 +16 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
@@ -31 +31 @@
 */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -41 +46 @@
 #define chip_t cs4231_t
 
+#define PFX "azt2320: "
+
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
 MODULE_DESCRIPTION("Aztech Systems AZT2320");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Aztech Systems,PRO16V},"
@@ -188 +198 @@
 
         if (pdev->activate(pdev) < 0) {
-                snd_printk("AUDIO isapnp configure failure\n");
+                printk(KERN_ERR PFX "AUDIO isapnp configure failure\n");
                 return -EBUSY;
         }
@@ -214 +224 @@
         if (pdev->activate(pdev) < 0) {
                 /* not fatal error */
-                snd_printk("MPU-401 isapnp configure failure\n");
+                printk(KERN_ERR PFX "MPU-401 isapnp configure failure\n");
                 snd_mpu_port[dev] = -1;
                 acard->devmpu = NULL;
@@ -326 +336 @@
                                 snd_mpu_irq[dev], SA_INTERRUPT,
                                 NULL) < 0)
-                        snd_printk("no MPU-401 device at 0x%lx\n",
+                        printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
                                 snd_mpu_port[dev]);
         }
@@ -334 +344 @@
                                     snd_fm_port[dev], snd_fm_port[dev] + 2,
                                     OPL3_HW_AUTO, 0, &opl3) < 0) {
-                        snd_printk("no OPL device at 0x%lx-0x%lx\n",
+                        printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
                                 snd_fm_port[dev], snd_fm_port[dev] + 2);
                 } else {
@@ -390 +400 @@
         cards += isapnp_probe_cards(snd_azt2320_pnpids, snd_azt2320_isapnp_detect);
 #else
-        snd_printk("you have to enable ISA PnP support.\n");
+        printk(KERN_ERR PFX "you have to enable ISA PnP support.\n");
 #endif
 #ifdef MODULE
         if (!cards)
-                snd_printk("no AZT2320 based soundcards found\n");
+                printk(KERN_ERR "no AZT2320 based soundcards found\n");
 #endif
         return cards ? 0 : -ENODEV;
@@ -412 +422 @@
 #ifndef MODULE
 
-/* format is: snd-card-azt2320=snd_enable,snd_index,snd_id,snd_port,
+/* format is: snd-azt2320=snd_enable,snd_index,snd_id,snd_port,
                                snd_wss_port,snd_mpu_port,snd_fm_port,
                                snd_irq,snd_mpu_irq,snd_dma1,snd_dma2 */
@@ -436 +446 @@
 }
 
-__setup("snd-card-azt2320=", alsa_card_azt2320_setup);
+__setup("snd-azt2320=", alsa_card_azt2320_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -44 +44 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
-
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/ad1848.h>
 #include <sound/sb.h>
@@ -53 +54 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("George Talusan <gstalusan@uwaterloo.ca>");
 MODULE_DESCRIPTION("C-Media CMI8330");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{C-Media,CMI8330,isapnp:{CMI0001,@@@0001,@X@0001}}}");
@@ -75 +79 @@
 static int snd_wssdma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
 
-MODULE_AUTHOR("George Talusan <gstalusan@uwaterloo.ca>");
 MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(snd_index, "Index value for CMI8330 soundcard.");
@@ -499 +502 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("CMI8330 not found or device busy\n");
+                printk(KERN_ERR "CMI8330 not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -511 +514 @@
 #ifndef MODULE
 
-/* format is: snd-card-cmi8330=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-cmi8330=snd_enable,snd_index,snd_id,snd_isapnp,
                                snd_sbport,snd_sbirq,
                                snd_sbdma8,snd_sbdma16,
@@ -532 +535 @@
                get_option(&str,&snd_sbdma8[nr_dev]) == 2 &&
                get_option(&str,&snd_sbdma16[nr_dev]) == 2 &&
-               get_option(&str,&snd_wssport[nr_dev]) == 2 &&
+               get_option(&str,(int *)&snd_wssport[nr_dev]) == 2 &&
                get_option(&str,&snd_wssirq[nr_dev]) == 2 &&
                get_option(&str,&snd_wssdma[nr_dev]) == 2);
@@ -543 +546 @@
 }
 
-__setup("snd-card-cmi8330=", alsa_card_cmi8330_setup);
+__setup("snd-cmi8330=", alsa_card_cmi8330_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/cs423x/cs4231.c

@@ -17 +17 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <sound/core.h>
 #include <sound/cs4231.h>
 #include <sound/mpu401.h>
@@ -31 +34 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Generic CS4231");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Crystal Semiconductors,CS4231}}");
@@ -130 +136 @@
                                         snd_mpu_irq[dev], SA_INTERRUPT,
                                         NULL) < 0)
-                        snd_printk("MPU401 not detected\n");
+                        printk(KERN_ERR "cs4231: MPU401 not detected\n");
         }
         strcpy(card->driver, "CS4231");
@@ -156 +162 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("CS4231 soundcard not found or device busy\n");
+                printk(KERN_ERR "CS4231 soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -176 +182 @@
 #ifndef MODULE
 
-/* format is: snd-card-cs4231=snd_enable,snd_index,snd_id,
+/* format is: snd-cs4231=snd_enable,snd_index,snd_id,
                               snd_port,snd_mpu_port,snd_irq,snd_mpu_irq,
                               snd_dma1,snd_dma2 */
@@ -201 +207 @@
 }
 
-__setup("snd-card-cs4231=", alsa_card_cs4231_setup);
+__setup("snd-cs4231=", alsa_card_cs4231_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/cs423x/cs4231_lib.c

@@ -21 +21 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <asm/irq.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/cs4231.h>
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_DESCRIPTION("Routines for control of CS4231(A)/CS4232/InterWave & compatible chips");
+MODULE_LICENSE("GPL");
 
 #define chip_t cs4231_t
@@ -743 +754 @@
         chip->image[CS4231_PIN_CTRL] &= ~CS4231_IRQ_ENABLE;
         snd_cs4231_out(chip, CS4231_PIN_CTRL, chip->image[CS4231_PIN_CTRL]);
-        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
         /* now disable record & playback */
 
-        spin_lock_irqsave(&chip->reg_lock, flags);
         if (chip->image[CS4231_IFACE_CTRL] & (CS4231_PLAYBACK_ENABLE | CS4231_PLAYBACK_PIO |
                                                CS4231_RECORD_ENABLE | CS4231_RECORD_PIO)) {
@@ -849 +858 @@
         unsigned int count = snd_pcm_lib_period_bytes(substream);
 
+        spin_lock_irqsave(&chip->reg_lock, flags);
         chip->p_dma_size = size;
         chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE | CS4231_PLAYBACK_PIO);
-        snd_dma_program(chip->dma1, runtime->dma_area, size, DMA_MODE_WRITE | DMA_AUTOINIT);
+        snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
         count = snd_cs4231_get_count(chip->image[CS4231_PLAYBK_FORMAT], count) - 1;
-        spin_lock_irqsave(&chip->reg_lock, flags);
         snd_cs4231_out(chip, CS4231_PLY_LWR_CNT, (unsigned char) count);
         snd_cs4231_out(chip, CS4231_PLY_UPR_CNT, (unsigned char) (count >> 8));
@@ -891 +900 @@
         unsigned int count = snd_pcm_lib_period_bytes(substream);
 
+        spin_lock_irqsave(&chip->reg_lock, flags);
         chip->c_dma_size = size;
         chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_RECORD_ENABLE | CS4231_RECORD_PIO);
-        snd_dma_program(chip->dma2, runtime->dma_area, size, DMA_MODE_READ | DMA_AUTOINIT);
+        snd_dma_program(chip->dma2, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
         count = snd_cs4231_get_count(chip->image[CS4231_REC_FORMAT], count) - 1;
-        spin_lock_irqsave(&chip->reg_lock, flags);
         if (chip->single_dma && chip->hardware != CS4231_HW_INTERWAVE) {
                 snd_cs4231_out(chip, CS4231_PLY_LWR_CNT, (unsigned char) count);
@@ -1358 +1367 @@
         }
         snd_cs4231_busy_wait(chip);
-        return;
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
 #endif
 }
@@ -1383 +1392 @@
 static int snd_cs4231_free(cs4231_t *chip)
 {
-        if (chip->res_port)
+        if (chip->res_port) {
                 release_resource(chip->res_port);
-        if (chip->res_cport)
+                kfree_nocheck(chip->res_port);
+        }
+        if (chip->res_cport) {
                 release_resource(chip->res_cport);
+                kfree_nocheck(chip->res_cport);
+        }
         if (chip->irq >= 0) {
                 disable_irq(chip->irq);
@@ -1612 +1625 @@
         strcpy(pcm->name, snd_cs4231_chip_id(chip));
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
 
         chip->pcm = pcm;

GPL/branches/alsa-resync1/alsa-kernel/isa/cs423x/cs4236.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #include <sound/cs4231.h>
 #include <sound/mpu401.h>
@@ -31 +38 @@
 
 EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_LICENSE("GPL");
+MODULE_CLASSES("{sound}");
 #ifdef CS4232
 MODULE_DESCRIPTION("Cirrus Logic CS4232");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Turtle Beach,TBS-2000},"
                 "{Turtle Beach,Tropez Plus},"
                 "{SIC CrystalWave 32},"
-                "{HP,Omnibook 5500}},"
-                "{TerraTec,Maestro 32/96}");
+                "{Hewlett Packard,Omnibook 5500},"
+                "{TerraTec,Maestro 32/96},"
+                "{Philips,PCA70PS}}");
 #else
 MODULE_DESCRIPTION("Cirrus Logic CS4235-9");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Crystal Semiconductors,CS4235},"
                 "{Crystal Semiconductors,CS4236},"
@@ -47 +56 @@
                 "{Crystal Semiconductors,CS4238},"
                 "{Crystal Semiconductors,CS4239},"
+                "{Acer,AW37},"
+                "{Acer,AW35/Pro},"
+                "{Crystal,3D},"
+                "{Crystal Computer,TidalWave128},"
+                "{Dell,Optiplex GX1},"
+                "{Dell,Workstation 400 sound},"
+                "{EliteGroup,P5TX-LA sound},"
+                "{Gallant,SC-70P},"
+                "{Gateway,E1000 Onboard CS4236B},"
                 "{Genius,Sound Maker 3DJ},"
                 "{Hewlett Packard,HP6330 sound},"
-                "{Crystal Computer,TidalWave128},"
-                "{Acer,AW37},"
-                "{EliteGroup,P5TX-LA sound},"
-                "{Crystal,3D},"
+                "{IBM,PC 300PL sound},"
+                "{IBM,Aptiva 2137 E24},"
+                "{IBM,IntelliStation M Pro},"
+                "{Intel,Marlin Spike Mobo CS4235},"
+                "{Guillemot,MaxiSound 16 PnP},"
+                "{NewClear,3D},"
+                "{TerraTec,AudioSystem EWS64L/XL},"
                 "{Typhoon Soundsystem,CS4236B},"
-                "{TerraTec, AudioSystem EWS64XL},"
-                "{NewClear,3D},"
-                "{Dell,Optiplex GX1},"
-                "{Dell,Workstation 400 sound},"
                 "{Turtle Beach,Malibu},"
-                "{Crystal Semiconductors,CS4235},"
-                "{IBM,Adaptiva 2137 E24},"
-                "{Maxi Sound,16 PnP},"
-                "{Gallant,SC-70P},"
-                "{Acer,AW37/Pro},"
-                "{Acer,AW35/Pro},"
-                "{Intel, Marlin Spike Mobo CS4235},"
-                "{IBM,IntelliStation M Pro}}");
+                "{Unknown,Digital PC 5000 Onboard}}");
 #endif
 
@@ -77 +87 @@
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 #ifdef __ISAPNP__
 #ifdef TARGET_OS2
@@ -200 +210 @@
 #ifdef CS4232
 static struct isapnp_card_id snd_card_pnpids[] __devinitdata = {
+        /* Philips PCA70PS */
+        ISAPNP_CS4232_1('C','S','C',0x0d32,0x0000,0x0010,0xb006),
+        /* TerraTec Maestro 32/96 (CS4232) */
+        ISAPNP_CS4232('C','S','C',0x1a32,0x0000,0x0010,0x0003),
         /* HP Omnibook 5500 onboard */
         ISAPNP_CS4232('C','S','C',0x4232,0x0000,0x0002,0x0003),
@@ -208 +222 @@
         /* SIC CrystalWave 32 (CS4232) */
         ISAPNP_CS4232('C','S','C',0xf032,0x0000,0x0010,0x0003),
-        /* TerraTec Maestro 32/96 (CS4232) */
-        ISAPNP_CS4232('C','S','C',0x1a32,0x0000,0x0010,0x0003),
         /* --- */
         { ISAPNP_CARD_END, }    /* end */
@@ -221 +233 @@
         /* Genius Sound Maker 3DJ - CS4237B */
         ISAPNP_CS4232('C','S','C',0x0437,0x0000,0x0010,0x0003),
+        /* Digital PC 5000 Onboard - CS4236B */
+        ISAPNP_CS4232_WOMPU('C','S','C',0x0735,0x0000,0x0010),
         /* some uknown CS4236B */
         ISAPNP_CS4232('C','S','C',0x0b35,0x0000,0x0010,0x0003),
         /* CS4235 on mainboard without MPU */
         ISAPNP_CS4232_WOMPU('C','S','C',0x1425,0x0100,0x0110),
+        /* Gateway E1000 Onboard CS4236B */
+        ISAPNP_CS4232('C','S','C',0x1335,0x0000,0x0010,0x0003),
         /* HP 6330 Onboard sound */
         ISAPNP_CS4232('C','S','C',0x1525,0x0100,0x0110,0x0103),
@@ -253 +269 @@
         /* CS4235 - onboard */
         ISAPNP_CS4232('C','S','C',0x8025,0x0100,0x0110,0x0103),
+        /* IBM PC 300PL Onboard - CS4236B */
+        ISAPNP_CS4232_WOMPU('C','S','C',0xe836,0x0000,0x0010),
         /* IBM Aptiva 2137 E24 Onboard - CS4237B */
         ISAPNP_CS4232('C','S','C',0x8037,0x0000,0x0010,0x0003),
-        /* Maxi Sound 16 PnP - CS4236B */
+        /* IBM IntelliStation M Pro motherboard */
+        ISAPNP_CS4232_WOMPU('C','S','C',0xc835,0x0000,0x0010),
+        /* Guillemot MaxiSound 16 PnP - CS4236B */
         ISAPNP_CS4232('C','S','C',0x9836,0x0000,0x0010,0x0003),
         /* Gallant SC-70P */
         ISAPNP_CS4232('C','S','C',0x9837,0x0000,0x0010,0x0003),
-        /* IBM IntelliStation M Pro motherboard */
-        ISAPNP_CS4232_WOMPU('C','S','C',0xc835,0x0000,0x0010),
         /* ACER AW37/Pro - CS4235 */
         ISAPNP_CS4232('C','S','C',0xd925,0x0000,0x0010,0x0003),
@@ -319 +337 @@
                 isapnp_resource_change(&pdev->dma_resource[1], snd_dma2[dev] < 0 ? 4 : snd_dma2[dev], 1);
         if (pdev->activate(pdev)<0) {
-                snd_printk(IDENT " isapnp configure failed for WSS (out of resources?)\n");
+                printk(KERN_ERR IDENT " isapnp configure failed for WSS (out of resources?)\n");
                 return -EBUSY;
         }
@@ -341 +359 @@
                 isapnp_resource_change(&pdev->resource[0], snd_cport[dev], 8);
         if (pdev->activate(pdev)<0) {
-                snd_printk(IDENT " isapnp configure failed for control (out of resources?)\n");
+                printk(KERN_ERR IDENT " isapnp configure failed for control (out of resources?)\n");
                 acard->wss->deactivate(acard->wss);
                 return -EBUSY;
@@ -361 +379 @@
                 if (pdev->activate(pdev)<0) {
                         snd_mpu_port[dev] = SNDRV_AUTO_PORT;
-                        snd_printk(IDENT " isapnp configure failed for MPU (out of resources?)\n");
+                        snd_mpu_irq[dev] = SNDRV_AUTO_IRQ;
+                        printk(KERN_ERR IDENT " isapnp configure failed for MPU (out of resources?)\n");
                 } else {
                         snd_mpu_port[dev] = pdev->resource[0].start;
+                        if (pdev->irq_resource[0].flags & IORESOURCE_IRQ) {
                         snd_mpu_irq[dev] = pdev->irq_resource[0].start;
+                        } else {
+                                snd_mpu_irq[dev] = -1;  /* disable interrupt */
+                        }
                 }
                 snd_printdd("isapnp MPU: port=0x%lx, irq=%i\n", snd_mpu_port[dev], snd_mpu_irq[dev]);
@@ -396 +419 @@
                 snd_card_cs4236_deactivate(acard);
 #endif
-                if (acard->res_sb_port)
+                if (acard->res_sb_port) {
                         release_resource(acard->res_sb_port);
+                        kfree_nocheck(acard->res_sb_port);
+                }
         }
 }
@@ -432 +457 @@
 #ifdef __ISAPNP__
         if (snd_isapnp[dev] && (err = snd_card_cs4236_isapnp(dev, acard))<0) {
-                snd_printk("isapnp detection failed and probing for " IDENT " is not supported\n");
+                printk(KERN_ERR "isapnp detection failed and probing for " IDENT " is not supported\n");
                 snd_card_free(card);
                 return -ENXIO;
@@ -445 +470 @@
         if (snd_sb_port[dev] != SNDRV_AUTO_PORT)
                 if ((acard->res_sb_port = request_region(snd_sb_port[dev], 16, IDENT " SB")) == NULL) {
-                        snd_printk("unable to register SB port at 0x%lx\n", snd_sb_port[dev]);
+                        printk(KERN_ERR IDENT ": unable to register SB port at 0x%lx\n", snd_sb_port[dev]);
                         snd_card_free(card);
                         return -ENOMEM;
@@ -504 +529 @@
                                     snd_fm_port[dev], snd_fm_port[dev] + 2,
                                     OPL3_HW_OPL3_CS, 0, &opl3) < 0) {
-                        snd_printk(IDENT ": OPL3 not detected\n");
+                        printk(KERN_ERR IDENT ": OPL3 not detected\n");
                 } else {
                         if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
@@ -516 +541 @@
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
                                         snd_mpu_port[dev], 0,
-                                        snd_mpu_irq[dev], SA_INTERRUPT, NULL) < 0)
-                        snd_printk(IDENT ": MPU401 not detected\n");
+                                        snd_mpu_irq[dev],
+                                        snd_mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0)
+                        printk(KERN_ERR IDENT ": MPU401 not detected\n");
         }
         strcpy(card->driver, pcm->name);
@@ -577 +603 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk(IDENT " soundcard not found or device busy\n");
+                printk(KERN_ERR IDENT " soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -597 +623 @@
 #ifndef MODULE
 
-/* format is: snd-card-cs4232=snd_enable,snd_index,snd_id,snd_isapnp,snd_port,
+/* format is: snd-cs4232=snd_enable,snd_index,snd_id,snd_isapnp,snd_port,
                               snd_cport,snd_mpu_port,snd_fm_port,snd_sb_port,
                               snd_irq,snd_mpu_irq,snd_dma1,snd_dma1_size,
                               snd_dma2,snd_dma2_size */
-/* format is: snd-card-cs4236=snd_enable,snd_index,snd_id,snd_isapnp,snd_port,
+/* format is: snd-cs4236=snd_enable,snd_index,snd_id,snd_isapnp,snd_port,
                               snd_cport,snd_mpu_port,snd_fm_port,snd_sb_port,
                               snd_irq,snd_mpu_irq,snd_dma1,snd_dma1_size,
@@ -635 +661 @@
 
 #ifdef CS4232
-__setup("snd-card-cs4232=", alsa_card_cs423x_setup);
+__setup("snd-cs4232=", alsa_card_cs423x_setup);
 #else /* CS4236 */
-__setup("snd-card-cs4236=", alsa_card_cs423x_setup);
+__setup("snd-cs4236=", alsa_card_cs423x_setup);
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/isa/dt0197h.c

@@ -16 +16 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -29 +32 @@
 #define chip_t sb_t
 
+#define PFX "dt0197h: "
+
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
 MODULE_DESCRIPTION("Diamond Technologies DT-0197H");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Diamond Technologies,DT-0197H}}");
@@ -147 +155 @@
 
         if (pdev->activate(pdev)<0) {
-                snd_printk("AUDIO isapnp configure failure\n");
+                printk(KERN_ERR PFX "AUDIO isapnp configure failure\n");
                 return -EBUSY;
         }
@@ -167 +175 @@
 
         if (pdev->activate(pdev)<0) {
-                snd_printk("MPU-401 isapnp configure failure\n");
+                printk(KERN_ERR PFX "MPU-401 isapnp configure failure\n");
                 snd_mpu_port[dev] = -1;
                 acard->devmpu = NULL;
@@ -183 +191 @@
 
         if (pdev->activate(pdev)<0) {
-                snd_printk("OPL isapnp configure failure\n");
+                printk(KERN_ERR PFX "OPL isapnp configure failure\n");
                 snd_fm_port[dev] = -1;
                 acard->devopl = NULL;
@@ -241 +249 @@
         }
 #else
-        snd_printk("you have to enable PnP support ...\n");
+        printk(KERN_ERR PFX "you have to enable PnP support ...\n");
         snd_card_free(card);
         return -ENOSYS;
@@ -273 +281 @@
                                         SA_INTERRUPT,
                                         NULL) < 0)
-                        snd_printk("no MPU-401 device at 0x%lx ?\n",
+                        printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n",
                                 snd_mpu_port[dev]);
         }
@@ -282 +290 @@
                                     snd_fm_port[dev] + 2,
                                     OPL3_HW_AUTO, 0, &opl3) < 0) {
-                        snd_printk("no OPL device at 0x%lx-0x%lx ?\n",
+                        printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx ?\n",
                                 snd_fm_port[dev], snd_fm_port[dev] + 2);
                 } else {
@@ -338 +346 @@
         cards += isapnp_probe_cards(snd_dt0197h_pnpids, snd_dt0197h_isapnp_detect);
 #else
-        snd_printk("you have to enable ISA PnP support.\n");
+        printk(KERN_ERR PFX "you have to enable ISA PnP support.\n");
 #endif
 #ifdef MODULE
         if (!cards)
-                snd_printk("no DT-0197H based soundcards found\n");
+                printk(KERN_ERR "no DT-0197H based soundcards found\n");
 #endif
         return cards ? 0 : -ENODEV;
@@ -360 +368 @@
 #ifndef MODULE
 
-/* format is: snd-card-dt0197h=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-dt0197h=snd_enable,snd_index,snd_id,snd_isapnp,
                                snd_port,snd_mpu_port,snd_fm_port,
                                snd_irq,snd_mpu_irq,snd_dma8,snd_dma8_size */
@@ -383 +391 @@
 }
 
-__setup("snd-card-dt0197h=", alsa_card_dt0197h_setup);
+__setup("snd-dt0197h=", alsa_card_dt0197h_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/es1688/es1688.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <sound/core.h>
 #include <sound/es1688.h>
 #include <sound/mpu401.h>
@@ -34 +38 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("ESS ESx688 AudioDrive");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{ESS,ES688 PnP AudioDrive,pnp:ESS0100},"
@@ -131 +138 @@
 
         if ((snd_opl3_create(card, chip->port, chip->port + 2, OPL3_HW_OPL3, 0, &opl3)) < 0) {
-                snd_printk("opl3 not detected at 0x%lx\n", chip->port);
+                printk(KERN_ERR "es1688: opl3 not detected at 0x%lx\n", chip->port);
         } else {
                 if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
@@ -212 +219 @@
 #ifndef MODULE
 
-/* format is: snd-card-es1688=snd_enable,snd_index,snd_id,
+/* format is: snd-es1688=snd_enable,snd_index,snd_id,
                               snd_port,snd_mpu_port,
                               snd_irq,snd_mpu_irq,
@@ -235 +242 @@
 }
 
-__setup("snd-card-es1688=", alsa_card_es1688_setup);
+__setup("snd-es1688=", alsa_card_es1688_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/es1688/es1688_lib.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/es1688.h>
+#include <sound/initval.h>
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_DESCRIPTION("ESS ESx688 lowlevel module");
+MODULE_CLASSES("{sound}");
+MODULE_LICENSE("GPL");
 
 #define chip_t es1688_t
@@ -419 +430 @@
         /* --- */
         count = -count;
-        snd_dma_program(chip->dma8, runtime->dma_area, size, DMA_MODE_WRITE | DMA_AUTOINIT);
+        snd_dma_program(chip->dma8, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
         spin_lock_irqsave(&chip->reg_lock, flags);
         snd_es1688_write(chip, 0xa4, (unsigned char) count);
@@ -476 +487 @@
         /* --- */
         count = -count;
-        snd_dma_program(chip->dma8, runtime->dma_area, size, DMA_MODE_READ | DMA_AUTOINIT);
+        snd_dma_program(chip->dma8, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
         spin_lock_irqsave(&chip->reg_lock, flags);
         snd_es1688_write(chip, 0xa4, (unsigned char) count);
@@ -656 +667 @@
                 snd_es1688_init(chip, 0);
                 release_resource(chip->res_port);
+                kfree_nocheck(chip->res_port);
         }
         if (chip->irq >= 0)
@@ -823 +835 @@
         chip->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, 64*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, 64*1024);
 
         if (rpcm)
-                *rpcm = NULL;
+                *rpcm = pcm;
         return 0;
 }

GPL/branches/alsa-resync1/alsa-kernel/isa/es18xx.c

@@ -17 +17 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -65 +65 @@
 
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/pm.h>
+#include <linux/slab.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
@@ -76 +86 @@
 #define SNDRV_GET_ID
 #include <sound/initval.h>
+
+#define PFX "es18xx: "
 
 struct _snd_es18xx {
@@ -114 +126 @@
         spinlock_t mixer_lock;
         spinlock_t ctrl_lock;
+#ifdef CONFIG_PM
+        struct pm_dev *pm_dev;
+        unsigned char pm_reg;
+#endif
 };
 
@@ -133 +149 @@
 #define ES18XX_MUTEREC  0x0400  /* Record source can be muted */
 #define ES18XX_CONTROL  0x0800  /* Has control ports */
+
+/* Power Management */
+#define ES18XX_PM       0x07
+#define ES18XX_PM_GPO0  0x01
+#define ES18XX_PM_GPO1  0x02
+#define ES18XX_PM_PDR   0x03
+#define ES18XX_PM_ANA   0x04
+#define ES18XX_PM_FM    0x06
+#define ES18XX_PM_SUS   0x08
 
 typedef struct _snd_es18xx es18xx_t;
@@ -502 +527 @@
 
         /* Set DMA controller */
-        snd_dma_program(chip->dma2, runtime->dma_area, size, DMA_MODE_WRITE | DMA_AUTOINIT);
+        snd_dma_program(chip->dma2, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
 
         return 0;
@@ -614 +639 @@
 
         /* Set DMA controler */
-        snd_dma_program(chip->dma1, runtime->dma_area, size, DMA_MODE_READ | DMA_AUTOINIT);
+        snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
 
         return 0;
@@ -677 +702 @@
 
         /* Set DMA controler */
-        snd_dma_program(chip->dma1, runtime->dma_area, size, DMA_MODE_WRITE | DMA_AUTOINIT);
+        snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
 
         return 0;
@@ -1620 +1645 @@
 {
         if (snd_es18xx_identify(chip) < 0) {
-                snd_printk("[0x%lx] ESS chip not found\n", chip->port);
+                printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port);
                 return -ENODEV;
         }
@@ -1736 +1761 @@
         chip->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
 
         if (rpcm)
@@ -1743 +1768 @@
 }
 
+/* Power Management support functions */
+#ifdef CONFIG_PM
+static void snd_es18xx_suspend(es18xx_t *chip)
+{
+        snd_card_t *card = chip->card;
+
+        snd_power_lock(card);
+        if (card->power_state == SNDRV_CTL_POWER_D3hot)
+                goto __skip;
+
+        snd_pcm_suspend_all(chip->pcm);
+
+        /* power down */
+        chip->pm_reg = (unsigned char)snd_es18xx_read(chip, ES18XX_PM);
+        chip->pm_reg |= (ES18XX_PM_FM | ES18XX_PM_SUS);
+        snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg);
+        snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg ^= ES18XX_PM_SUS);
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+      __skip:
+        snd_power_unlock(card);
+}
+
+static void snd_es18xx_resume(es18xx_t *chip)
+{
+        snd_card_t *card = chip->card;
+
+        snd_power_lock(card);
+        if (card->power_state == SNDRV_CTL_POWER_D0)
+                goto __skip;
+
+        /* restore PM register, we won't wake till (not 0x07) i/o activity though */
+        snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg ^= ES18XX_PM_FM);
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+      __skip:
+        snd_power_unlock(card);
+}
+
+/* callback for control API */
+static int snd_es18xx_set_power_state(snd_card_t *card, unsigned int power_state)
+{
+        es18xx_t *chip = (es18xx_t *) card->power_state_private_data;
+        switch (power_state) {
+        case SNDRV_CTL_POWER_D0:
+        case SNDRV_CTL_POWER_D1:
+        case SNDRV_CTL_POWER_D2:
+                snd_es18xx_resume(chip);
+                break;
+        case SNDRV_CTL_POWER_D3hot:
+        case SNDRV_CTL_POWER_D3cold:
+                snd_es18xx_suspend(chip);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int snd_es18xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
+{
+        es18xx_t *chip = snd_magic_cast(es18xx_t, dev->data, return 0);
+
+        switch (rqst) {
+        case PM_SUSPEND:
+                snd_es18xx_suspend(chip);
+                break;
+        case PM_RESUME:
+                snd_es18xx_resume(chip);
+                break;
+        }
+        return 0;
+}
+#endif /* CONFIG_PM */
+
 static int snd_es18xx_free(es18xx_t *chip)
 {
-        if (chip->res_port)
+#ifdef CONFIG_PM
+        if (chip->pm_dev)
+                pm_unregister(chip->pm_dev);
+#endif
+        if (chip->res_port) {
                 release_resource(chip->res_port);
-        if (chip->res_ctrl_port)
+                kfree_nocheck(chip->res_port);
+        }
+        if (chip->res_ctrl_port) {
                 release_resource(chip->res_ctrl_port);
-        if (chip->res_mpu_port)
+                kfree_nocheck(chip->res_ctrl_port);
+        }
+        if (chip->res_mpu_port) {
                 release_resource(chip->res_mpu_port);
+                kfree_nocheck(chip->res_mpu_port);
+        }
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void *) chip);
@@ -1809 +1919 @@
         if ((chip->res_port = request_region(port, 16, "ES18xx")) == NULL) {
                 snd_es18xx_free(chip);
-                snd_printk("unable to grap ports 0x%lx-0x%lx\n", port, port + 16 - 1);
+                printk(KERN_ERR PFX "unable to grap ports 0x%lx-0x%lx\n", port, port + 16 - 1);
                 return -EBUSY;
         }
@@ -1821 +1931 @@
         if (request_irq(irq, snd_es18xx_interrupt, SA_INTERRUPT, "ES18xx", (void *) chip)) {
                 snd_es18xx_free(chip);
-                snd_printk("unable to grap IRQ %d\n", irq);
+                printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
                 return -EBUSY;
         }
@@ -1828 +1938 @@
         if (request_dma(dma1, "ES18xx DMA 1")) {
                 snd_es18xx_free(chip);
-                snd_printk("unable to grap DMA1 %d\n", dma1);
+                printk(KERN_ERR PFX "unable to grap DMA1 %d\n", dma1);
                 return -EBUSY;
         }
@@ -1835 +1945 @@
         if (request_dma(dma2, "ES18xx DMA 2")) {
                 snd_es18xx_free(chip);
-                snd_printk("unable to grap DMA2 %d\n", dma2);
+                printk(KERN_ERR PFX "unable to grap DMA2 %d\n", dma2);
                 return -EBUSY;
         }
@@ -1909 +2019 @@
                 if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_micpre1_control, chip))) < 0)
                         return err;
+                break;
         case 0x1869:
         case 0x1879:
                 if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_micpre2_control, chip))) < 0)
                         return err;
+                break;
         }
         if (chip->caps & ES18XX_SPATIALIZER) {
@@ -1943 +2055 @@
 
 EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("Christian Fischbach <fishbach@pool.informatik.rwth-aachen.de>, Abramo Bagnara <abramo@alsa-project.org>");  
 MODULE_DESCRIPTION("ESS ES18xx AudioDrive");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{ESS,ES1868 PnP AudioDrive},"
@@ -1951 +2065 @@
                 "{ESS,ES1887 PnP AudioDrive},"
                 "{ESS,ES1888 PnP AudioDrive},"
-                "{ESS,ES1887 AudioDrive}"
+                "{ESS,ES1887 AudioDrive},"
                 "{ESS,ES1888 AudioDrive}}");
 
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 #ifdef __ISAPNP__
 #ifdef TARGET_OS2
@@ -2083 +2197 @@
                 return -EAGAIN;
         if (acard->devc->activate(acard->devc)<0) {
-                snd_printk("isapnp control configure failure (out of resources?)\n");
+                printk(KERN_ERR PFX "isapnp control configure failure (out of resources?)\n");
                 return -EAGAIN;
         }
@@ -2106 +2220 @@
                 isapnp_resource_change(&pdev->irq_resource[0], snd_irq[dev], 1);
         if (pdev->activate(pdev)<0) {
-                snd_printk("isapnp configure failure (out of resources?)\n");
+                printk(KERN_ERR PFX "isapnp configure failure (out of resources?)\n");
                 acard->devc->deactivate(acard->devc);
                 return -EBUSY;
@@ -2222 +2336 @@
 
         if (snd_opl3_create(card, chip->fm_port, chip->fm_port + 2, OPL3_HW_OPL3, 0, &opl3) < 0) {
-                snd_printk("opl3 not detected at 0x%lx\n", chip->port);
+                printk(KERN_ERR PFX "opl3 not detected at 0x%lx\n", chip->port);
         } else {
                 if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
@@ -2230 +2344 @@
         }
 
-        if (snd_mpu_port[dev] > SNDRV_AUTO_PORT) {
+        if (snd_mpu_port[dev] != SNDRV_AUTO_PORT) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
                                                chip->mpu_port, 0,
@@ -2240 +2354 @@
                 chip->rmidi = rmidi;
         }
+
+#ifdef CONFIG_PM
+        /* Power Management */
+        chip->pm_dev = pm_register(PM_ISA_DEV, 0, snd_es18xx_pm_callback);
+        if (chip->pm_dev) {
+                chip->pm_dev->data = chip;
+                /* set control api callback */
+                card->set_power_state = snd_es18xx_set_power_state;
+                card->power_state_private_data = chip;
+        }
+#endif
         sprintf(card->driver, "ES%x", chip->version);
         sprintf(card->shortname, "ESS AudioDrive ES%x", chip->version);
@@ -2323 +2448 @@
         if(!cards) {
 #ifdef MODULE
-                snd_printk("ESS AudioDrive ES18xx soundcard not found or device busy\n");
+                printk(KERN_ERR "ESS AudioDrive ES18xx soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -2343 +2468 @@
 #ifndef MODULE
 
-/* format is: snd-card-es18xx=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-es18xx=snd_enable,snd_index,snd_id,snd_isapnp,
                               snd_port,snd_mpu_port,snd_fm_port,snd_irq,
                               snd_dma1,snd_dma2 */
@@ -2372 +2497 @@
 }
 
-__setup("snd-card-es18xx=", alsa_card_es18xx_setup);
+__setup("snd-es18xx=", alsa_card_es18xx_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/gus/gus_pcm.c

@@ -22 +22 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/gus.h>
@@ -91 +95 @@
         block.addr = addr & ~31;
         block.buffer = runtime->dma_area + offset;
+        block.buf_addr = runtime->dma_addr + offset;
         block.count = count;
         block.private_data = pcmp;
@@ -582 +587 @@
         snd_gf1_i_write8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL, 0); /* disable sampling */
         snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL);     /* Sampling Control Register */
-        snd_dma_program(gus->gf1.dma2, &runtime->dma_area, gus->c_period_size, DMA_MODE_READ);
+        snd_dma_program(gus->gf1.dma2, runtime->dma_addr, gus->c_period_size, DMA_MODE_READ);
         return 0;
 }
@@ -925 +930 @@
         snd_pcm_t *pcm;
         snd_pcm_substream_t *substream;
-        int err;
+        int capture, err;
 
         if (rpcm)
                 *rpcm = NULL;
         card = gus->card;
+        capture = !gus->interwave && !gus->ess_flag && !gus->ace_flag ? 1 : 0;
         err = snd_pcm_new(card,
                           gus->interwave ? "AMD InterWave" : "GF1",
                           pcm_dev,
                           gus->gf1.pcm_channels / 2,
-                          !gus->interwave && !gus->ess_flag ? 1 : 0,
+                          capture,
                           &pcm);
         if (err < 0)
@@ -944 +950 @@
 
         for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
-                snd_pcm_lib_preallocate_pages(substream, 64*1024, gus->gf1.dma1 > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+                snd_pcm_lib_preallocate_isa_pages(substream, 64*1024, gus->gf1.dma1 > 3 ? 128*1024 : 64*1024);
         
         pcm->info_flags = 0;
         pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
-        if (gus->interwave && !gus->ess_flag && !gus->ace_flag) {
-                /* capture setup */
+        if (capture) {
                 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_gf1_pcm_capture_ops);
                 if (gus->gf1.dma2 == gus->gf1.dma1)
                         pcm->info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX;
-                snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream, 64*1024, gus->gf1.dma2 > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+                snd_pcm_lib_preallocate_isa_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream, 64*1024, gus->gf1.dma2 > 3 ? 128*1024 : 64*1024);
         }
         strcpy(pcm->name, pcm->id);

GPL/branches/alsa-resync1/alsa-kernel/isa/gus/gusclassic.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/gus.h>
 #define SNDRV_LEGACY_AUTO_PROBE
@@ -30 +34 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Gravis UltraSound Classic");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Gravis,UltraSound Classic}}");
@@ -252 +259 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("GUS Classic soundcard not found or device busy\n");
+                printk(KERN_ERR "GUS Classic soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -272 +279 @@
 #ifndef MODULE
 
-/* format is: snd-card-gusclassic=snd_enable,snd_index,snd_id,
+/* format is: snd-gusclassic=snd_enable,snd_index,snd_id,
                                   snd_port,snd_irq,
                                   snd_dma1,snd_dma2,
@@ -298 +305 @@
 }
 
-__setup("snd-card-gusclassic=", alsa_card_gusclassic_setup);
+__setup("snd-gusclassic=", alsa_card_gusclassic_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/gus/gusextreme.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/gus.h>
 #include <sound/es1688.h>
@@ -33 +37 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Gravis UltraSound Extreme");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Gravis,UltraSound Extreme}}");
@@ -322 +329 @@
         if (snd_opl3_create(card, es1688->port, es1688->port + 2,
                             OPL3_HW_OPL3, 0, &opl3) < 0) {
-                snd_printk("opl3 not detected at 0x%lx\n", es1688->port);
+                printk(KERN_ERR "gusextreme: opl3 not detected at 0x%lx\n", es1688->port);
         } else {
                 if ((err = snd_opl3_hwdep_new(opl3, 0, 2, NULL)) < 0) {
@@ -382 +389 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("GUS Extreme soundcard not found or device busy\n");
+                printk(KERN_ERR "GUS Extreme soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -409 +416 @@
 #ifndef MODULE
 
-/* format is: snd-card-gusextreme=snd_enable,snd_index,snd_id,
+/* format is: snd-gusextreme=snd_enable,snd_index,snd_id,
                                   snd_port,snd_gf1_port,snd_mpu_port,
                                   snd_irq,snd_gf1_irq,snd_mpu_irq,
@@ -437 +444 @@
 }
 
-__setup("snd-card-gusextreme=", alsa_card_gusextreme_setup);
+__setup("snd-gusextreme=", alsa_card_gusextreme_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/gus/gusmax.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/gus.h>
 #include <sound/cs4231.h>
@@ -31 +35 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Gravis UltraSound MAX");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Gravis,UltraSound MAX}}");
@@ -293 +300 @@
         if (!gus->max_flag) {
                 snd_card_free(card);
-                snd_printk("GUS MAX soundcard was not detected at 0x%lx\n", gus->gf1.port);
+                printk(KERN_ERR "GUS MAX soundcard was not detected at 0x%lx\n", gus->gf1.port);
                 return -ENODEV;
         }
@@ -299 +306 @@
         if (request_irq(irq, snd_gusmax_interrupt, SA_INTERRUPT, "GUS MAX", (void *)maxcard)) {
                 snd_card_free(card);
-                snd_printk("unable to grab IRQ %d\n", irq);
+                printk(KERN_ERR "gusmax: unable to grab IRQ %d\n", irq);
                 return -EBUSY;
         }
@@ -388 +395 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("GUS MAX soundcard not found or device busy\n");
+                printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -408 +415 @@
 #ifndef MODULE
 
-/* format is: snd-card-gusmax=snd_enable,snd_index,snd_id,
+/* format is: snd-gusmax=snd_enable,snd_index,snd_id,
                               snd_port,snd_irq,
                               snd_dma1,snd_dma2,
@@ -434 +441 @@
 }
 
-__setup("snd-card-gusmax=", alsa_card_gusmax_setup);
+__setup("snd-gusmax=", alsa_card_gusmax_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/gus/interwave.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  *   1999/07/22         Erik Inge Bolso <knan@mo.himolde.no>
@@ -23 +23 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #include <sound/gus.h>
 #include <sound/cs4231.h>
@@ -37 +46 @@
 
 EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_CLASSES("{sound}");
+MODULE_LICENSE("GPL");
 #ifndef SNDRV_STB
 MODULE_DESCRIPTION("AMD InterWave");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Gravis,UltraSound Plug & Play},"
                 "{STB,SoundRage32},"
@@ -47 +58 @@
 #else
 MODULE_DESCRIPTION("AMD InterWave STB with TEA6330T");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{AMD,InterWave STB with TEA6330T}}");
 #endif
@@ -53 +63 @@
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 #ifdef __ISAPNP__
 #ifdef TARGET_OS2
@@ -212 +222 @@
 }
 
-static int snd_interwave_i2c_getdataline(snd_i2c_bus_t *bus)
+static int snd_interwave_i2c_getclockline(snd_i2c_bus_t *bus)
 {
         unsigned long port = bus->private_value;
         unsigned char res;
 
+        res = inb(port) & 1;
+#if 0
+        printk("i2c_getclockline - 0x%lx -> %i\n", port, res);
+#endif
+        return res;
+}
+
+static int snd_interwave_i2c_getdataline(snd_i2c_bus_t *bus, int ack)
+{
+        unsigned long port = bus->private_value;
+        unsigned char res;
+
+        if (ack)
+                udelay(10);
         res = (inb(port) & 2) >> 1;
 #if 0
@@ -224 +248 @@
 }
 
+static snd_i2c_bit_ops_t snd_interwave_i2c_bit_ops = {
+        setlines: snd_interwave_i2c_setlines,
+        getclock: snd_interwave_i2c_getclockline,
+        getdata:  snd_interwave_i2c_getdataline,
+};
+
 static int __init snd_interwave_detect_stb(struct snd_interwave *iwcard,
                                            snd_gus_card_t * gus, int dev,
@@ -231 +261 @@
         snd_i2c_bus_t *bus;
         snd_card_t *card = iwcard->card;
-        unsigned long flags;
         char name[32];
         int err;
@@ -254 +283 @@
         }
         sprintf(name, "InterWave-%i", card->number);
-        if ((err = snd_i2c_bus_create(card, name, &bus)) < 0)
+        if ((err = snd_i2c_bus_create(card, name, NULL, &bus)) < 0)
                 return err;
         bus->private_value = port;
-        bus->i2c_setlines = snd_interwave_i2c_setlines;
-        bus->i2c_getdataline = snd_interwave_i2c_getdataline;
-        SNDRV_LOCK_I2C_BUS(bus);
-        snd_i2c_reset(bus);
-#if 0
-        {
-                int idx, ack;
-                for (idx = 0; idx < 256; idx += 2) {
-                        snd_i2c_start(bus);
-                        ack = snd_i2c_sendbyte(bus, idx, 0);
-                        snd_i2c_stop(bus);
-                        if (!ack) {
-                                printk("i2c: scanning bus %s: found device at addr=0x%x\n",
-                                       bus->name, idx);
-                        }
-                }
-        }
-#endif
-        SNDRV_UNLOCK_I2C_BUS(bus);
+        bus->hw_ops.bit = &snd_interwave_i2c_bit_ops;
         if ((err = snd_tea6330t_detect(bus, 0)) < 0)
                 return err;
@@ -707 +718 @@
 #endif
 #ifdef SNDRV_STB
-        if (iwcard->i2c_res)
+        if (iwcard->i2c_res) {
                 release_resource(iwcard->i2c_res);
+                kfree_nocheck(iwcard->i2c_res);
+        }
 #endif
         if (iwcard->irq >= 0)
@@ -961 +974 @@
                 }
 #ifdef MODULE
-                snd_printk("InterWave soundcard #%i not found at 0x%lx or device busy\n", dev, snd_port[dev]);
+                printk(KERN_ERR "InterWave soundcard #%i not found at 0x%lx or device busy\n", dev, snd_port[dev]);
 #endif
         }
@@ -973 +986 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("InterWave soundcard not found or device busy\n");
+                printk(KERN_ERR "InterWave soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -993 +1006 @@
 #ifndef MODULE
 
-/* format is: snd-card-interwave=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-interwave=snd_enable,snd_index,snd_id,snd_isapnp,
                                  snd_port[,snd_port_tc],snd_irq,
                                  snd_dma1,snd_dma2,
@@ -1030 +1043 @@
 
 #ifndef SNDRV_STB
-__setup("snd-card-interwave=", alsa_card_interwave_setup);
-#else
-__setup("snd-card-interwave-stb=", alsa_card_interwave_setup);
+__setup("snd-interwave=", alsa_card_interwave_setup);
+#else
+__setup("snd-interwave-stb=", alsa_card_interwave_setup);
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/isa/opl3sa2.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/init.h>
+#include <linux/pm.h>
+#include <linux/slab.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #include <sound/cs4231.h>
 #include <sound/mpu401.h>
@@ -29 +38 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Yamaha OPL3SA2+");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Yamaha,YMF719E-S},"
@@ -39 +51 @@
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 #ifdef __ISAPNP__
 #ifdef TARGET_OS2
@@ -101 +113 @@
 MODULE_PARM_SYNTAX(snd_opl3sa3_ymode, SNDRV_ENABLED ",allows:{{0,3}},dialog:list");  /* SL Added */
 
-struct snd_opl3sa {
+/* control ports */
+#define OPL3SA2_PM_CTRL         0x01
+#define OPL3SA2_SYS_CTRL                0x02
+#define OPL3SA2_IRQ_CONFIG      0x03
+#define OPL3SA2_IRQ_STATUS      0x04
+#define OPL3SA2_DMA_CONFIG      0x06
+#define OPL3SA2_MASTER_LEFT     0x07
+#define OPL3SA2_MASTER_RIGHT    0x08
+#define OPL3SA2_MIC             0x09
+#define OPL3SA2_MISC            0x0A
+
+/* opl3sa3 only */
+#define OPL3SA3_DGTL_DOWN       0x12
+#define OPL3SA3_ANLG_DOWN       0x13
+#define OPL3SA3_WIDE            0x14
+#define OPL3SA3_BASS            0x15
+#define OPL3SA3_TREBLE          0x16
+
+/* power management bits */
+#define OPL3SA2_PM_ADOWN                0x20
+#define OPL3SA2_PM_PSV          0x04            
+#define OPL3SA2_PM_PDN          0x02
+#define OPL3SA2_PM_PDX          0x01
+
+#define OPL3SA2_PM_D0   0x00
+#define OPL3SA2_PM_D3   (OPL3SA2_PM_ADOWN|OPL3SA2_PM_PSV|OPL3SA2_PM_PDN|OPL3SA2_PM_PDX)
+
+typedef struct snd_opl3sa2 opl3sa2_t;
+#define chip_t opl3sa2_t
+
+struct snd_opl3sa2 {
         snd_card_t *card;
         int version;            /* 2 or 3 */
@@ -119 +161 @@
         snd_kcontrol_t *master_switch;
         snd_kcontrol_t *master_volume;
+#ifdef CONFIG_PM
+        struct pm_dev *pm_dev;
+        void (*cs4231_suspend)(cs4231_t *);
+        void (*cs4231_resume)(cs4231_t *);
+#endif
 };
 
-static snd_card_t *snd_opl3sa_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+static snd_card_t *snd_opl3sa2_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 
 #ifdef __ISAPNP__
@@ -159 +206 @@
 #endif /* __ISAPNP__ */
 
-static unsigned char snd_opl3sa_read(unsigned long port, unsigned char reg)
-{
-        unsigned long flags;
+
+/* read control port (w/o spinlock) */
+static unsigned char __snd_opl3sa2_read(opl3sa2_t *chip, unsigned char reg)
+{
         unsigned char result;
-
-        save_flags(flags);
-        cli();
 #if 0
         outb(0x1d, port);       /* password */
         printk("read [0x%lx] = 0x%x\n", port, inb(port));
 #endif
-        outb(reg, port);        /* register */
-        result = inb(port + 1);
-        restore_flags(flags);
+        outb(reg, chip->port);  /* register */
+        result = inb(chip->port + 1);
 #if 0
         printk("read [0x%lx] = 0x%x [0x%x]\n", port, result, inb(port));
@@ -179 +223 @@
 }
 
-static void snd_opl3sa_write(unsigned long port,
-                             unsigned char reg, unsigned char value)
+/* read control port (with spinlock) */
+static unsigned char snd_opl3sa2_read(opl3sa2_t *chip, unsigned char reg)
 {
         unsigned long flags;
-
-        save_flags(flags);
-        cli();
+        unsigned char result;
+
+        spin_lock_irqsave(&chip->reg_lock, flags);
+        result = __snd_opl3sa2_read(chip, reg);
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
+        return result;
+}
+
+/* write control port (w/o spinlock) */
+static void __snd_opl3sa2_write(opl3sa2_t *chip, unsigned char reg, unsigned char value)
+{
 #if 0
         outb(0x1d, port);       /* password */
 #endif
-        outb(reg, port);        /* register */
-        outb(value, port + 1);
-        restore_flags(flags);
-}
-
-static int __init snd_opl3sa_detect(struct snd_opl3sa *oplcard)
+        outb(reg, chip->port);  /* register */
+        outb(value, chip->port + 1);
+        chip->ctlregs[reg] = value;
+}
+
+/* write control port (with spinlock) */
+static void snd_opl3sa2_write(opl3sa2_t *chip, unsigned char reg, unsigned char value)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&chip->reg_lock, flags);
+        __snd_opl3sa2_write(chip, reg, value);
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
+}
+
+static int __init snd_opl3sa2_detect(opl3sa2_t *chip)
 {
         snd_card_t *card;
@@ -201 +262 @@
         char str[2];
 
-        card = oplcard->card;
-        port = oplcard->port;
-        if ((oplcard->res_port = request_region(port, 2, "OPL3-SA control")) == NULL)
+        card = chip->card;
+        port = chip->port;
+        if ((chip->res_port = request_region(port, 2, "OPL3-SA control")) == NULL)
                 return -EBUSY;
-        // snd_printk("REG 0A = 0x%x\n", snd_opl3sa_read(port, 0x0a));
-        oplcard->version = 0;
-        tmp = snd_opl3sa_read(port, 0x0a);
+        // snd_printk("REG 0A = 0x%x\n", snd_opl3sa2_read(chip, 0x0a));
+        chip->version = 0;
+        tmp = snd_opl3sa2_read(chip, OPL3SA2_MISC);
         if (tmp == 0xff) {
                 snd_printd("OPL3-SA [0x%lx] detect = 0x%x\n", port, tmp);
@@ -214 +275 @@
         switch (tmp & 0x07) {
         case 0x01:
-                oplcard->version = 2;
+                chip->version = 2; /* YMF711 */
                 break;
         default:
-                oplcard->version = 3;
+                chip->version = 3;
                 /* 0x02 - standard */
                 /* 0x03 - YM715B */
@@ -224 +285 @@
                 break;
         }
-        str[0] = oplcard->version + '0';
+        str[0] = chip->version + '0';
         str[1] = 0;
         strcat(card->shortname, str);
-        snd_opl3sa_write(port, 0x0a, tmp ^ 7);
-        if ((tmp1 = snd_opl3sa_read(port, 0x0a)) != tmp) {
+        snd_opl3sa2_write(chip, OPL3SA2_MISC, tmp ^ 7);
+        if ((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MISC)) != tmp) {
                 snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1);
                 return -ENODEV;
         }
         /* try if the MIC register is accesible */
-        tmp = snd_opl3sa_read(port, 0x09);
-        snd_opl3sa_write(port, 0x09, 0x8a);
-        if (((tmp1 = snd_opl3sa_read(port, 0x09)) & 0x9f) != 0x8a) {
+        tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC);
+        snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a);
+        if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) {
                 snd_printd("OPL3-SA [0x%lx] detect (2) = 0x%x (0x%x)\n", port, tmp, tmp1);
                 return -ENODEV;
         }
-        snd_opl3sa_write(port, 0x09, 0x9f);
+        snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x9f);
         /* initialization */
-        snd_opl3sa_write(port, 0x01, 0x00);     /* Power Management - default */
-        if (oplcard->version > 2) {   /* SL Added */
-                snd_opl3sa_write(port, 0x02, (oplcard->ymode << 4)); /* SL Modified - System Control - ymode is bits 4&5 (of 0 to 7) on all but opl3sa2 versions */
-        } else { /* SL Added */
-                snd_opl3sa_write(port, 0x02, 0x00);     /* SL Modified - System Control - default for opl3sa2 versions */
-        } /* SL Added */
-        snd_opl3sa_write(port, 0x03, 0x0d);     /* Interrupt Channel Configuration - IRQ A = OPL3 + MPU + WSS */
-        if (oplcard->single_dma) {
-                snd_opl3sa_write(port, 0x06, 0x03);     /* DMA Configuration - DMA A = WSS-R + WSS-P */
+        /* Power Management - full on */
+        snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D0);
+        if (chip->version > 2) {
+                /* ymode is bits 4&5 (of 0 to 7) on all but opl3sa2 versions */
+                snd_opl3sa2_write(chip, OPL3SA2_SYS_CTRL, (chip->ymode << 4));
         } else {
-                snd_opl3sa_write(port, 0x06, 0x21);     /* DMA Configuration - DMA B = WSS-R, DMA A = WSS-P */
-        }
-        snd_opl3sa_write(port, 0x0a, 0x80 | (tmp & 7)); /* Miscellaneous - default */
-        if (oplcard->version > 2) {
-                snd_opl3sa_write(port, 0x12, 0x00);     /* Digital Block Partial Power Down - default */
-                snd_opl3sa_write(port, 0x13, 0x00);     /* Analog Block Partial Power Down - default */
-        }
-        return 0;
-}
-
-static void snd_opl3sa_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+                /* default for opl3sa2 versions */
+                snd_opl3sa2_write(chip, OPL3SA2_SYS_CTRL, 0x00);
+        }
+        snd_opl3sa2_write(chip, OPL3SA2_IRQ_CONFIG, 0x0d);      /* Interrupt Channel Configuration - IRQ A = OPL3 + MPU + WSS */
+        if (chip->single_dma) {
+                snd_opl3sa2_write(chip, OPL3SA2_DMA_CONFIG, 0x03);      /* DMA Configuration - DMA A = WSS-R + WSS-P */
+        } else {
+                snd_opl3sa2_write(chip, OPL3SA2_DMA_CONFIG, 0x21);      /* DMA Configuration - DMA B = WSS-R, DMA A = WSS-P */
+        }
+        snd_opl3sa2_write(chip, OPL3SA2_MISC, 0x80 | (tmp & 7));        /* Miscellaneous - default */
+        if (chip->version > 2) {
+                snd_opl3sa2_write(chip, OPL3SA3_DGTL_DOWN, 0x00);       /* Digital Block Partial Power Down - default */
+                snd_opl3sa2_write(chip, OPL3SA3_ANLG_DOWN, 0x00);       /* Analog Block Partial Power Down - default */
+        }
+        return 0;
+}
+
+static void snd_opl3sa2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
         unsigned short status;
-        struct snd_opl3sa *oplcard = (struct snd_opl3sa *) dev_id;
-
-        if (oplcard == NULL || oplcard->card == NULL)
+        opl3sa2_t *chip = dev_id;
+
+        if (chip == NULL || chip->card == NULL)
                 return;
 
-        spin_lock(&oplcard->reg_lock);
-        outb(0x04, oplcard->port);      /* register - Interrupt IRQ-A status */
-        status = inb(oplcard->port + 1);
-        spin_unlock(&oplcard->reg_lock);
+        status = snd_opl3sa2_read(chip, OPL3SA2_IRQ_STATUS);
 
         if (status & 0x20)
-                snd_opl3_interrupt(oplcard->synth);
-
-        if ((status & 0x10) && oplcard->rmidi != NULL)
-                snd_mpu401_uart_interrupt(irq, oplcard->rmidi->private_data, regs);
+                snd_opl3_interrupt(chip->synth);
+
+        if ((status & 0x10) && chip->rmidi != NULL)
+                snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs);
 
         if (status & 0x07)      /* TI,CI,PI */
-                snd_cs4231_interrupt(irq, oplcard->cs4231, regs);
-
-        if (status & 0x40) {
+                snd_cs4231_interrupt(irq, chip->cs4231, regs);
+
+        if (status & 0x40) { /* hardware volume change */
                 /* reading from Master Lch register at 0x07 clears this bit */
-                snd_opl3sa_read(oplcard->port, 0x08);
-                snd_opl3sa_read(oplcard->port, 0x07);
-                snd_ctl_notify(oplcard->card, SNDRV_CTL_EVENT_MASK_VALUE, &oplcard->master_switch->id);
-                snd_ctl_notify(oplcard->card, SNDRV_CTL_EVENT_MASK_VALUE, &oplcard->master_volume->id);
+                snd_opl3sa2_read(chip, OPL3SA2_MASTER_RIGHT);
+                snd_opl3sa2_read(chip, OPL3SA2_MASTER_LEFT);
+                if (chip->master_switch && chip->master_volume) {
+                        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_switch->id);
+                        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_volume->id);
+                }
         }
 }
 
 #ifdef TARGET_OS2
-#define OPL3SA_SINGLE(xname, xindex, reg, shift, mask, invert) \
+#define OPL3SA2_SINGLE(xname, xindex, reg, shift, mask, invert) \
 { SNDRV_CTL_ELEM_IFACE_MIXER, 0, 0, xname, xindex, \
-  0, 0, snd_opl3sa_info_single, \
-  snd_opl3sa_get_single, snd_opl3sa_put_single, \
+  0, 0, snd_opl3sa2_info_single, \
+  snd_opl3sa2_get_single, snd_opl3sa2_put_single, \
   reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 #else
-#define OPL3SA_SINGLE(xname, xindex, reg, shift, mask, invert) \
+#define OPL3SA2_SINGLE(xname, xindex, reg, shift, mask, invert) \
 { iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_opl3sa_info_single, \
-  get: snd_opl3sa_get_single, put: snd_opl3sa_put_single, \
+  info: snd_opl3sa2_info_single, \
+  get: snd_opl3sa2_get_single, put: snd_opl3sa2_put_single, \
   private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
 #endif
 
-static int snd_opl3sa_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_opl3sa2_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
         int mask = (kcontrol->private_value >> 16) & 0xff;
@@ -318 +381 @@
 }
 
-int snd_opl3sa_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        struct snd_opl3sa *oplcard = (struct snd_opl3sa *)_snd_kcontrol_chip(kcontrol);
+int snd_opl3sa2_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        opl3sa2_t *chip = snd_kcontrol_chip(kcontrol);
         unsigned long flags;
         int reg = kcontrol->private_value & 0xff;
@@ -327 +390 @@
         int invert = (kcontrol->private_value >> 24) & 0xff;
 
-        spin_lock_irqsave(&oplcard->reg_lock, flags);
-        ucontrol->value.integer.value[0] = (oplcard->ctlregs[reg] >> shift) & mask;
-        spin_unlock_irqrestore(&oplcard->reg_lock, flags);
+        spin_lock_irqsave(&chip->reg_lock, flags);
+        ucontrol->value.integer.value[0] = (chip->ctlregs[reg] >> shift) & mask;
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
         if (invert)
                 ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
@@ -335 +398 @@
 }
 
-int snd_opl3sa_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        struct snd_opl3sa *oplcard = (struct snd_opl3sa *)_snd_kcontrol_chip(kcontrol);
+int snd_opl3sa2_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        opl3sa2_t *chip = snd_kcontrol_chip(kcontrol);
         unsigned long flags;
         int reg = kcontrol->private_value & 0xff;
@@ -350 +413 @@
                 val = mask - val;
         val <<= shift;
-        spin_lock_irqsave(&oplcard->reg_lock, flags);
-        oval = oplcard->ctlregs[reg];
+        spin_lock_irqsave(&chip->reg_lock, flags);
+        oval = chip->ctlregs[reg];
         val = (oval & ~(mask << shift)) | val;
         change = val != oval;
-        snd_opl3sa_write(oplcard->port, reg, oplcard->ctlregs[reg] = val);
-        spin_unlock_irqrestore(&oplcard->reg_lock, flags);
+        __snd_opl3sa2_write(chip, reg, val);
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
         return change;
 }
 
 #ifdef TARGET_OS2
-#define OPL3SA_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
+#define OPL3SA2_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
 { SNDRV_CTL_ELEM_IFACE_MIXER, 0, 0, xname, xindex, \
-  0, 0, snd_opl3sa_info_double, \
-  snd_opl3sa_get_double, snd_opl3sa_put_double, \
+  0, 0, snd_opl3sa2_info_double, \
+  snd_opl3sa2_get_double, snd_opl3sa2_put_double, \
   left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
 
 #else
-#define OPL3SA_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
+#define OPL3SA2_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
 { iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_opl3sa_info_double, \
-  get: snd_opl3sa_get_double, put: snd_opl3sa_put_double, \
+  info: snd_opl3sa2_info_double, \
+  get: snd_opl3sa2_get_double, put: snd_opl3sa2_put_double, \
   private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
 #endif
 
-int snd_opl3sa_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+int snd_opl3sa2_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
         int mask = (kcontrol->private_value >> 24) & 0xff;
@@ -385 +448 @@
 }
 
-int snd_opl3sa_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        struct snd_opl3sa *oplcard = (struct snd_opl3sa *)_snd_kcontrol_chip(kcontrol);
+int snd_opl3sa2_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        opl3sa2_t *chip = snd_kcontrol_chip(kcontrol);
         unsigned long flags;
         int left_reg = kcontrol->private_value & 0xff;
@@ -396 +459 @@
         int invert = (kcontrol->private_value >> 22) & 1;
         
-        spin_lock_irqsave(&oplcard->reg_lock, flags);
-        ucontrol->value.integer.value[0] = (oplcard->ctlregs[left_reg] >> shift_left) & mask;
-        ucontrol->value.integer.value[1] = (oplcard->ctlregs[right_reg] >> shift_right) & mask;
-        spin_unlock_irqrestore(&oplcard->reg_lock, flags);
+        spin_lock_irqsave(&chip->reg_lock, flags);
+        ucontrol->value.integer.value[0] = (chip->ctlregs[left_reg] >> shift_left) & mask;
+        ucontrol->value.integer.value[1] = (chip->ctlregs[right_reg] >> shift_right) & mask;
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
         if (invert) {
                 ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
@@ -407 +470 @@
 }
 
-int snd_opl3sa_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        struct snd_opl3sa *oplcard = (struct snd_opl3sa *)_snd_kcontrol_chip(kcontrol);
+int snd_opl3sa2_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        opl3sa2_t *chip = snd_kcontrol_chip(kcontrol);
         unsigned long flags;
         int left_reg = kcontrol->private_value & 0xff;
@@ -428 +491 @@
         val1 <<= shift_left;
         val2 <<= shift_right;
-        spin_lock_irqsave(&oplcard->reg_lock, flags);
+        spin_lock_irqsave(&chip->reg_lock, flags);
         if (left_reg != right_reg) {
-                oval1 = oplcard->ctlregs[left_reg];
-                oval2 = oplcard->ctlregs[right_reg];
+                oval1 = chip->ctlregs[left_reg];
+                oval2 = chip->ctlregs[right_reg];
                 val1 = (oval1 & ~(mask << shift_left)) | val1;
                 val2 = (oval2 & ~(mask << shift_right)) | val2;
                 change = val1 != oval1 || val2 != oval2;
-                snd_opl3sa_write(oplcard->port, left_reg, oplcard->ctlregs[left_reg] = val1);
-                snd_opl3sa_write(oplcard->port, right_reg, oplcard->ctlregs[right_reg] = val2);
+                __snd_opl3sa2_write(chip, left_reg, val1);
+                __snd_opl3sa2_write(chip, right_reg, val2);
         } else {
-                oval1 = oplcard->ctlregs[left_reg];
+                oval1 = chip->ctlregs[left_reg];
                 val1 = (oval1 & ~((mask << shift_left) | (mask << shift_right))) | val1 | val2;
                 change = val1 != oval1;
-                snd_opl3sa_write(oplcard->port, left_reg, oplcard->ctlregs[left_reg] = val1);
-        }
-        spin_unlock_irqrestore(&oplcard->reg_lock, flags);
+                __snd_opl3sa2_write(chip, left_reg, val1);
+        }
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
         return change;
 }
 
-#define OPL3SA_CONTROLS (sizeof(snd_opl3sa_controls)/sizeof(snd_kcontrol_new_t))
-
-static snd_kcontrol_new_t snd_opl3sa_controls[] = {
-OPL3SA_DOUBLE("Master Playback Switch", 0, 0x07, 0x08, 7, 7, 1, 1),
-OPL3SA_DOUBLE("Master Playback Volume", 0, 0x07, 0x08, 0, 0, 15, 1),
-OPL3SA_SINGLE("Mic Playback Switch", 0, 0x09, 7, 1, 1),
-OPL3SA_SINGLE("Mic Playback Volume", 0, 0x09, 0, 31, 1)
+#define OPL3SA2_CONTROLS (sizeof(snd_opl3sa2_controls)/sizeof(snd_kcontrol_new_t))
+
+static snd_kcontrol_new_t snd_opl3sa2_controls[] = {
+OPL3SA2_DOUBLE("Master Playback Switch", 0, 0x07, 0x08, 7, 7, 1, 1),
+OPL3SA2_DOUBLE("Master Playback Volume", 0, 0x07, 0x08, 0, 0, 15, 1),
+OPL3SA2_SINGLE("Mic Playback Switch", 0, 0x09, 7, 1, 1),
+OPL3SA2_SINGLE("Mic Playback Volume", 0, 0x09, 0, 31, 1)
 };
 
-#define OPL3SA_TONE_CONTROLS (sizeof(snd_opl3sa_tone_controls)/sizeof(snd_kcontrol_new_t))
-
-static snd_kcontrol_new_t snd_opl3sa_tone_controls[] = {
-OPL3SA_DOUBLE("3D Control - Wide", 0, 0x14, 0x14, 4, 0, 7, 0),
-OPL3SA_DOUBLE("Tone Control - Bass", 0, 0x15, 0x15, 4, 0, 7, 0),
-OPL3SA_DOUBLE("Tone Control - Treble", 0, 0x16, 0x16, 4, 0, 7, 0)
+#define OPL3SA2_TONE_CONTROLS (sizeof(snd_opl3sa2_tone_controls)/sizeof(snd_kcontrol_new_t))
+
+static snd_kcontrol_new_t snd_opl3sa2_tone_controls[] = {
+OPL3SA2_DOUBLE("3D Control - Wide", 0, 0x14, 0x14, 4, 0, 7, 0),
+OPL3SA2_DOUBLE("Tone Control - Bass", 0, 0x15, 0x15, 4, 0, 7, 0),
+OPL3SA2_DOUBLE("Tone Control - Treble", 0, 0x16, 0x16, 4, 0, 7, 0)
 };
 
-static void snd_opl3sa_master_free(snd_kcontrol_t *kcontrol)
-{
-        struct snd_opl3sa *oplcard = (struct snd_opl3sa *)_snd_kcontrol_chip(kcontrol);
-        
-        oplcard->master_switch = NULL;
-        oplcard->master_volume = NULL;
-}
-
-static int __init snd_opl3sa_mixer(struct snd_opl3sa *oplcard)
-{
-        snd_card_t *card = oplcard->card;
+static void snd_opl3sa2_master_free(snd_kcontrol_t *kcontrol)
+{
+        opl3sa2_t *chip = _snd_kcontrol_chip(kcontrol);
+        chip->master_switch = NULL;
+        chip->master_volume = NULL;
+}
+
+static int __init snd_opl3sa2_mixer(opl3sa2_t *chip)
+{
+        snd_card_t *card = chip->card;
         snd_ctl_elem_id_t id1, id2;
         snd_kcontrol_t *kctl;
@@ -501 +563 @@
                 return err;
         /* add OPL3SA2 controls */
-        for (idx = 0; idx < OPL3SA_CONTROLS; idx++) {
-                if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_opl3sa_controls[idx], oplcard))) < 0)
+        for (idx = 0; idx < OPL3SA2_CONTROLS; idx++) {
+                if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_opl3sa2_controls[idx], chip))) < 0)
                         return err;
                 switch (idx) {
-                case 0: oplcard->master_switch = kctl; kctl->private_free = snd_opl3sa_master_free; break;
-                case 1: oplcard->master_volume = kctl; kctl->private_free = snd_opl3sa_master_free; break;
+                case 0: chip->master_switch = kctl; kctl->private_free = snd_opl3sa2_master_free; break;
+                case 1: chip->master_volume = kctl; kctl->private_free = snd_opl3sa2_master_free; break;
                 }
         }
-        if (oplcard->version > 2) {
-                for (idx = 0; idx < OPL3SA_TONE_CONTROLS; idx++)
-                        if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_opl3sa_tone_controls[idx], oplcard))) < 0)
+        if (chip->version > 2) {
+                for (idx = 0; idx < OPL3SA2_TONE_CONTROLS; idx++)
+                        if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_opl3sa2_tone_controls[idx], chip))) < 0)
                                 return err;
         }
@@ -517 +579 @@
 }
 
-#ifdef __ISAPNP__
-static int __init snd_opl3sa_isapnp(int dev, struct snd_opl3sa *oplcard)
+/* Power Management support functions */
+#ifdef CONFIG_PM
+static void snd_opl3sa2_suspend(opl3sa2_t *chip)
+{
+        snd_card_t *card = chip->card;
+
+        snd_power_lock(card);
+        if (card->power_state == SNDRV_CTL_POWER_D3hot)
+                goto __skip;
+
+        /* FIXME: is this order ok? */
+        chip->cs4231_suspend(chip->cs4231);
+        snd_pcm_suspend_all(chip->cs4231->pcm);
+
+        /* power down */
+        snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+      __skip:
+        snd_power_unlock(card);
+}
+
+static void snd_opl3sa2_resume(opl3sa2_t *chip)
+{
+        snd_card_t *card = chip->card;
+        int i;
+
+        snd_power_lock(card);
+        if (card->power_state == SNDRV_CTL_POWER_D0)
+                goto __skip;
+
+        /* power up */
+        snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D0);
+
+        /* restore registers */
+        for (i = 2; i <= 0x0a; i++) {
+                if (i != OPL3SA2_IRQ_STATUS)
+                        snd_opl3sa2_write(chip, i, chip->ctlregs[i]);
+        }
+        if (chip->version > 2) {
+                for (i = 0x12; i <= 0x16; i++)
+                        snd_opl3sa2_write(chip, i, chip->ctlregs[i]);
+        }
+        /* restore cs4231 */
+        chip->cs4231_resume(chip->cs4231);
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+      __skip:
+        snd_power_unlock(card);
+}
+
+/* callback for control API */
+static int snd_opl3sa2_set_power_state(snd_card_t *card, unsigned int power_state)
+{
+        opl3sa2_t *chip = (opl3sa2_t *) card->pm_private_data;
+        switch (power_state) {
+        case SNDRV_CTL_POWER_D0:
+        case SNDRV_CTL_POWER_D1:
+        case SNDRV_CTL_POWER_D2:
+                snd_opl3sa2_resume(chip);
+                break;
+        case SNDRV_CTL_POWER_D3hot:
+        case SNDRV_CTL_POWER_D3cold:
+                snd_opl3sa2_suspend(chip);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int snd_opl3sa2_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
+{
+        opl3sa2_t *chip = snd_magic_cast(opl3sa2_t, dev->data, return 0);
+
+        switch (rqst) {
+        case PM_SUSPEND:
+                snd_opl3sa2_suspend(chip);
+                break;
+        case PM_RESUME:
+                snd_opl3sa2_resume(chip);
+                break;
+        }
+        return 0;
+}
+
+#endif /* CONFIG_PM */
+
+#ifdef __ISAPNP__
+static int __init snd_opl3sa2_isapnp(int dev, opl3sa2_t *chip)
 {
         const struct isapnp_card_id *id = snd_opl3sa2_isapnp_id[dev];
@@ -524 +674 @@
         struct isapnp_dev *pdev;
 
-        oplcard->dev = isapnp_find_dev(card, id->devs[0].vendor, id->devs[0].function, NULL);
-        if (oplcard->dev->active) {
-                oplcard->dev = NULL;
+        chip->dev = isapnp_find_dev(card, id->devs[0].vendor, id->devs[0].function, NULL);
+        if (chip->dev->active) {
+                chip->dev = NULL;
                 return -EBUSY;
         }
         /* PnP initialization */
-        pdev = oplcard->dev;
+        pdev = chip->dev;
         if (pdev->prepare(pdev)<0)
                 return -EAGAIN;
@@ -568 +718 @@
 }
 
-static void snd_opl3sa_deactivate(struct snd_opl3sa *oplcard)
-{
-        if (oplcard->dev) {
-                oplcard->dev->deactivate(oplcard->dev);
-                oplcard->dev = NULL;
+static void snd_opl3sa2_deactivate(opl3sa2_t *chip)
+{
+        if (chip->dev) {
+                chip->dev->deactivate(chip->dev);
+                chip->dev = NULL;
         }
 }
 #endif /* __ISAPNP__ */
 
-static void snd_card_opl3sa2_free(snd_card_t *card)
-{
-        struct snd_opl3sa *acard = (struct snd_opl3sa *)card->private_data;
-
-        if (acard) {
-#ifdef __ISAPNP__
-                snd_opl3sa_deactivate(acard);
-#endif
-                if (acard->irq >= 0)
-                        free_irq(acard->irq, (void *)acard);
-                if (acard->res_port)
-                        release_resource(acard->res_port);
-        }
-}
-
-static int __init snd_opl3sa_probe(int dev)
+static int snd_opl3sa2_free(opl3sa2_t *chip)
+{
+#ifdef __ISAPNP__
+        snd_opl3sa2_deactivate(chip);
+#endif
+#ifdef CONFIG_PM
+        if (chip->pm_dev)
+                pm_unregister(chip->pm_dev);
+#endif
+        if (chip->irq >= 0)
+                free_irq(chip->irq, (void *)chip);
+        if (chip->res_port) {
+                release_resource(chip->res_port);
+                kfree_nocheck(chip->res_port);
+        }
+        snd_magic_kfree(chip);
+        return 0;
+}
+
+static int snd_opl3sa2_dev_free(snd_device_t *device)
+{
+        opl3sa2_t *chip = snd_magic_cast(opl3sa2_t, device->device_data, return -ENXIO);
+        return snd_opl3sa2_free(chip);
+}
+
+static int __init snd_opl3sa2_probe(int dev)
 {
         int irq, dma1, dma2;
         snd_card_t *card;
-        struct snd_opl3sa *oplcard;
+        struct snd_opl3sa2 *chip;
         cs4231_t *cs4231;
         opl3_t *opl3;
+        static snd_device_ops_t ops = {
+                dev_free:       snd_opl3sa2_dev_free,
+        };
         int err;
 
@@ -623 +786 @@
         }
 #endif
-        card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
-                            sizeof(struct snd_opl3sa));
+        card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE, 0);
         if (card == NULL)
                 return -ENOMEM;
-        oplcard = (struct snd_opl3sa *)card->private_data;
-        oplcard->irq = -1;
-        card->private_free = snd_card_opl3sa2_free;
         strcpy(card->driver, "OPL3SA2");
         strcpy(card->shortname, "Yamaha OPL3-SA2");
-#ifdef __ISAPNP__
-        if (snd_isapnp[dev] && snd_opl3sa_isapnp(dev, oplcard) < 0) {
-                snd_card_free(card);
-                return -EBUSY;
-        }
-#endif
-        oplcard->ymode = snd_opl3sa3_ymode[dev] & 0x03 ; /* SL Added - initialise this card from supplied (or default) parameter*/ 
-        oplcard->card = card;
-        oplcard->port = snd_port[dev];
+        chip = snd_magic_kcalloc(opl3sa2_t, 0, GFP_KERNEL);
+        if (chip == NULL) {
+                err = -ENOMEM;
+                goto __error;
+        }
+        chip->irq = -1;
+        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
+                goto __error;
+#ifdef __ISAPNP__
+        if (snd_isapnp[dev] && (err = snd_opl3sa2_isapnp(dev, chip)) < 0)
+                goto __error;
+#endif
+        chip->ymode = snd_opl3sa3_ymode[dev] & 0x03 ; /* initialise this card from supplied (or default) parameter*/ 
+        chip->card = card;
+        chip->port = snd_port[dev];
         irq = snd_irq[dev];
         dma1 = snd_dma1[dev];
         dma2 = snd_dma2[dev];
         if (dma2 < 0)
-                oplcard->single_dma = 1;
-        if ((snd_opl3sa_detect(oplcard)) < 0) {
-                snd_card_free(card);
-                return -ENODEV;
-        }
-        if (request_irq(irq, snd_opl3sa_interrupt, SA_INTERRUPT, "OPL3-SA2/3", (void *)oplcard)) {
-                snd_card_free(card);
-                return -ENODEV;
-        }
-        oplcard->irq = irq;
+                chip->single_dma = 1;
+        if ((err = snd_opl3sa2_detect(chip)) < 0)
+                goto __error;
+        if (request_irq(irq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2/3", (void *)chip)) {
+                err = -ENODEV;
+                goto __error;
+        }
+        chip->irq = irq;
         if ((err = snd_cs4231_create(card,
                                      snd_wss_port[dev] + 4, -1,
@@ -662 +825 @@
                                      &cs4231)) < 0) {
                 snd_printd("Oops, WSS not detected at 0x%lx\n", snd_wss_port[dev] + 4);
-                snd_card_free(card);
-                return err;
-        }
-        oplcard->cs4231 = cs4231;
-        if ((err = snd_cs4231_pcm(cs4231, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_cs4231_mixer(cs4231)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_opl3sa_mixer(oplcard)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_cs4231_timer(cs4231, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+                goto __error;
+        }
+        chip->cs4231 = cs4231;
+        if ((err = snd_cs4231_pcm(cs4231, 0, NULL)) < 0)
+                goto __error;
+        if ((err = snd_cs4231_mixer(cs4231)) < 0)
+                goto __error;
+        if ((err = snd_opl3sa2_mixer(chip)) < 0)
+                goto __error;
+        if ((err = snd_cs4231_timer(cs4231, 0, NULL)) < 0)
+                goto __error;
         if (snd_fm_port[dev] >= 0x340 && snd_fm_port[dev] < 0x400) {
                 if ((err = snd_opl3_create(card, snd_fm_port[dev],
                                            snd_fm_port[dev] + 2,
-                                           OPL3_HW_OPL3, 0, &opl3)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
-                if ((err = snd_opl3_timer_new(opl3, 1, 2)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
-                if ((err = snd_opl3_hwdep_new(opl3, 0, 1, &oplcard->synth)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
+                                           OPL3_HW_OPL3, 0, &opl3)) < 0)
+                        goto __error;
+                if ((err = snd_opl3_timer_new(opl3, 1, 2)) < 0)
+                        goto __error;
+                if ((err = snd_opl3_hwdep_new(opl3, 0, 1, &chip->synth)) < 0)
+                        goto __error;
         }
         if (snd_midi_port[dev] >= 0x300 && snd_midi_port[dev] < 0x340) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2,
                                                snd_midi_port[dev], 0,
-                                               irq, 0, &oplcard->rmidi)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
-        }
+                                               irq, 0, &chip->rmidi)) < 0)
+                        goto __error;
+        }
+#ifdef CONFIG_PM
+        /* Power Management */
+        chip->pm_dev = pm_register(PM_ISA_DEV, 0, snd_opl3sa2_pm_callback);
+        if (chip->pm_dev) {
+                chip->pm_dev->data = chip;
+                /* remember callbacks for cs4231 - they are called inside
+                 * opl3sa2 pm callback
+                 */
+                chip->cs4231_suspend = chip->cs4231->suspend;
+                chip->cs4231_resume = chip->cs4231->resume;
+                /* now clear callbacks for cs4231 */
+                chip->cs4231->suspend = NULL;
+                chip->cs4231->resume = NULL;
+                /* set control api callback */
+                card->set_power_state = snd_opl3sa2_set_power_state;
+                card->pm_private_data = chip;
+        }
+#endif
+
         sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
-                card->shortname, oplcard->port, irq, dma1);
+                card->shortname, chip->port, irq, dma1);
         if (dma2 >= 0)
                 sprintf(card->longname + strlen(card->longname), "&%d", dma2);
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        snd_opl3sa_cards[dev] = card;
-        return 0;
+        if ((err = snd_card_register(card)) < 0)
+                goto __error;
+
+        snd_opl3sa2_cards[dev] = card;
+        return 0;
+
+ __error:
+        snd_card_free(card);
+        return err;
 }
 
@@ -731 +899 @@
                 snd_opl3sa2_isapnp_cards[dev] = card;
                 snd_opl3sa2_isapnp_id[dev] = id;
-                res = snd_opl3sa_probe(dev);
+                res = snd_opl3sa2_probe(dev);
                 if (res < 0)
                         return res;
@@ -752 +920 @@
                         continue;
 #endif
-                if (snd_opl3sa_probe(dev) >= 0)
+                if (snd_opl3sa2_probe(dev) >= 0)
                         cards++;
         }
@@ -760 +928 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("Yamaha OPL3-SA soundcard not found or device busy\n");
+                printk(KERN_ERR "Yamaha OPL3-SA soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -772 +940 @@
 
         for (idx = 0; idx < SNDRV_CARDS; idx++)
-                snd_card_free(snd_opl3sa_cards[idx]);
+                snd_card_free(snd_opl3sa2_cards[idx]);
 }
 
@@ -780 +948 @@
 #ifndef MODULE
 
-/* format is: snd-card-opl3sa2=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-opl3sa2=snd_enable,snd_index,snd_id,snd_isapnp,
                                snd_port,snd_sb_port,snd_wss_port,snd_fm_port,
                                snd_midi_port,snd_irq,snd_dma1,snd_dma2,
@@ -813 +981 @@
 }
 
-__setup("snd-card-opl3sa2=", alsa_card_opl3sa2_setup);
+__setup("snd-opl3sa2=", alsa_card_opl3sa2_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/opti9xx/opti92x-ad1848.c

@@ -20 +20 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
-#define SNDRV_MAIN_OBJECT_FILE
+
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #ifdef CS4231
 #include <sound/cs4231.h>
@@ -44 +55 @@
 
 EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
+MODULE_CLASSES("{sound}");
+MODULE_LICENSE("GPL");
 #ifdef OPTi93X
 MODULE_DESCRIPTION("OPTi93X");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{OPTi,82C931/3}}");
 #else   /* OPTi93X */
 #ifdef CS4231
 MODULE_DESCRIPTION("OPTi92X - CS4231");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{OPTi,82C924 (CS4231)},"
                 "{OPTi,82C925 (CS4231)}}");
 #else   /* CS4231 */
 MODULE_DESCRIPTION("OPTi92X - AD1848");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{OPTi,82C924 (AD1848)},"
-                "{OPTi,82C925 (AD1848)}}");
+                "{OPTi,82C925 (AD1848)},"
+                "{OAK,Mozart}}");
 #endif  /* CS4231 */
 #endif  /* OPTi93X */
@@ -1034 +1046 @@
                 ~(OPTi93X_PLAYBACK_ENABLE | OPTi93X_PLAYBACK_PIO));
 
-        snd_dma_program(chip->dma1, runtime->dma_area, size,
+        snd_dma_program(chip->dma1, runtime->dma_addr, size,
                 DMA_MODE_WRITE | DMA_AUTOINIT);
 
@@ -1067 +1079 @@
                 (unsigned char)~(OPTi93X_CAPTURE_ENABLE | OPTi93X_CAPTURE_PIO));
 
-        snd_dma_program(chip->dma2, runtime->dma_area, size,
+        snd_dma_program(chip->dma2, runtime->dma_addr, size,
                 DMA_MODE_READ | DMA_AUTOINIT);
 
@@ -1292 +1304 @@
 static int snd_opti93x_free(opti93x_t *chip)
 {
-        if (chip->res_port)
+        if (chip->res_port) {
                 release_resource(chip->res_port);
+                kfree_nocheck(chip->res_port);
+        }
         if (chip->dma1 >= 0) {
                 disable_dma(chip->dma1);
@@ -1458 +1472 @@
         strcpy(pcm->name, snd_opti93x_chip_id(codec));
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, codec->dma1 > 3 || codec->dma2 > 3 ? 128*1024 : 64*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, codec->dma1 > 3 || codec->dma2 > 3 ? 128*1024 : 64*1024);
 
         codec->pcm = pcm;
@@ -1716 +1730 @@
 
         snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+
         card = chip->card;
 
@@ -1991 +2006 @@
                 snd_card_opti9xx_deactivate(chip);
 #endif  /* __ISAPNP__ */
-                if (chip->res_mc_base)
+                if (chip->res_mc_base) {
                         release_resource(chip->res_mc_base);
+                        kfree_nocheck(chip->res_mc_base);
+                }
         }
 }
@@ -2249 +2266 @@
 #ifdef MODULE
 #ifdef OPTi93X
-                snd_printk("no OPTi 82C93x soundcard found\n");
-#else
-                snd_printk("no OPTi 82C92x soundcard found\n");
+                printk(KERN_ERR "no OPTi 82C93x soundcard found\n");
+#else
+                printk(KERN_ERR "no OPTi 82C92x soundcard found\n");
 #endif  /* OPTi93X */
 #endif
@@ -2270 +2287 @@
 #ifndef MODULE
 
-/* format is: snd-card-opti9xx=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-opti9xx=snd_enable,snd_index,snd_id,snd_isapnp,
                                snd_port,snd_mpu_port,snd_fm_port,
                                snd_irq,snd_mpu_irq,
@@ -2303 +2320 @@
 
 #if defined(OPTi93X)
-__setup("snd-card-opti93x=", alsa_card_opti9xx_setup);
+__setup("snd-opti93x=", alsa_card_opti9xx_setup);
 #elif defined(CS4231)
-__setup("snd-card-opti92x-cs4231=", alsa_card_opti9xx_setup);
-#else
-__setup("snd-card-opti92x-ad1848=", alsa_card_opti9xx_setup);
+__setup("snd-opti92x-cs4231=", alsa_card_opti9xx_setup);
+#else
+__setup("snd-opti92x-ad1848=", alsa_card_opti9xx_setup);
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/es968.c

@@ -18 +18 @@
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
 #include <sound/sb.h>
 
+#define chip_t sb_t
+
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
 MODULE_DESCRIPTION("ESS AudioDrive ES968");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{ESS,AudioDrive ES968}}");
@@ -34 +46 @@
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
 static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;    /* Pnp setup */
@@ -93 +105 @@
                                      struct pt_regs *regs)
 {
-    sb_t *chip = dev_id;
+        sb_t *chip = snd_magic_cast(sb_t, dev_id, return);
 
     if (chip->open & SB_OPEN_PCM) {
@@ -272 +284 @@
 #ifndef MODULE
 
-/* format is: snd-card-es968=snd_enable,snd_index,snd_id,
+/* format is: snd-es968=snd_enable,snd_index,snd_id,
  snd_port,snd_irq,snd_dma1 */
 
@@ -291 +303 @@
 }
 
-__setup("snd-card-es968=", alsa_card_es968_setup);
+__setup("snd-es968=", alsa_card_es968_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/sb16.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/sb16_csp.h>
@@ -34 +42 @@
 #include <sound/initval.h>
 
+#define chip_t sb_t
+
+#ifdef SNDRV_SBAWE
+#define PFX "sbawe: "
+#else
+#define PFX "sb16: "
+#endif
+
+#ifndef SNDRV_SBAWE
 EXPORT_NO_SYMBOLS;
+#endif
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_LICENSE("GPL");
+MODULE_CLASSES("{sound}");
 #ifndef SNDRV_SBAWE
 MODULE_DESCRIPTION("Sound Blaster 16");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Creative Labs,SB 16},"
                "{Creative Labs,SB Vibra16S},"
@@ -45 +66 @@
 #else
 MODULE_DESCRIPTION("Sound Blaster AWE");
-MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Creative Labs,SB AWE 32},"
                "{Creative Labs,SB AWE 64},"
@@ -55 +75 @@
 #endif
 
-#if defined(SNDRV_SBAWE) && defined(CONFIG_SND_SEQUENCER) && defined(CONFIG_SND_SYNTH_EMU8000)
+#if defined(SNDRV_SBAWE) && (defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE))
 #define SNDRV_SBAWE_EMU8000
 #endif
@@ -61 +81 @@
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 #ifdef __ISAPNP__
 #ifdef TARGET_OS2
@@ -139 +159 @@
 MODULE_PARM(snd_mic_agc, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(snd_mic_agc, "Mic Auto-Gain-Control switch.");
-MODULE_PARM_SYNTAX(snd_mic_agcm, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
+MODULE_PARM_SYNTAX(snd_mic_agc, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
 #ifdef CONFIG_SND_SB16_CSP
 MODULE_PARM(snd_csp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
@@ -212 +232 @@
     ISAPNP_SB16('C','T','L',0x002b,0x0031),
     /* Sound Blaster 16 PnP */
-    ISAPNP_SB16('C','T','L',0x002c,0x0031),
+        ISAPNP_SB16('C','T','L',0x002c,0x0031), 
     /* Sound Blaster Vibra16S */
     ISAPNP_SB16('C','T','L',0x0051,0x0001),
@@ -264 +284 @@
     /* Sound Blaster AWE 64 PnP */
     ISAPNP_SBAWE('C','T','L',0x00e4,0x0045,0x0022),
+        /* Sound Blaster AWE 64 PnP */
+        ISAPNP_SBAWE('C','T','L',0x00e9,0x0045,0x0022),
     /* Sound Blaster 16 PnP (AWE) */
     ISAPNP_SBAWE('C','T','L',0x00ed,0x0041,0x0070),
@@ -295 +317 @@
         return -EBUSY;
     }
-#endif
+#endif  
     /* Audio initialization */
     pdev = acard->dev;
@@ -313 +335 @@
         isapnp_resource_change(&pdev->irq_resource[0], snd_irq[dev], 1);
     if (pdev->activate(pdev) < 0) {
-        snd_printk("isapnp configure failure (out of resources?)\n");
+                printk(KERN_ERR PFX "isapnp configure failure (out of resources?)\n");
         return -EBUSY;
     }
@@ -333 +355 @@
         return -EAGAIN;
     }
-    if (snd_awe_port[dev] != SNDRV_AUTO_PORT)
+        if (snd_awe_port[dev] != SNDRV_AUTO_PORT) {
         isapnp_resource_change(&pdev->resource[0], snd_awe_port[dev], 4);
+                isapnp_resource_change(&pdev->resource[1], snd_awe_port[dev] + 0x400, 4);
+                isapnp_resource_change(&pdev->resource[2], snd_awe_port[dev] + 0x800, 4);
+        }
     if (pdev->activate(pdev)<0) {
-        snd_printk("WaveTable isapnp configure failure (out of resources?)\n");
-        acard->dev->deactivate(acard->dev);
+                printk(KERN_ERR PFX "WaveTable isapnp configure failure (out of resources?)\n");
+                acard->dev->deactivate(acard->dev);             
         return -EBUSY;
     }
@@ -368 +393 @@
     if (acard == NULL)
         return;
-    if (acard->fm_res)
+        if (acard->fm_res) {
         release_resource(acard->fm_res);
+                kfree_nocheck(acard->fm_res);
+        }
 #ifdef __ISAPNP__
     snd_sb16_deactivate(acard);
@@ -386 +413 @@
     opl3_t *opl3;
     snd_hwdep_t *synth = NULL;
+#ifdef CONFIG_SND_SB16_CSP
     snd_hwdep_t *csp = NULL;
+#endif
     unsigned long flags;
     int err;
@@ -412 +441 @@
             if ((irq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
                 snd_card_free(card);
-                snd_printk("unable to find a free IRQ\n");
+                        printk(KERN_ERR PFX "unable to find a free IRQ\n");
                 return -EBUSY;
             }
@@ -419 +448 @@
             if ((dma8 = snd_legacy_find_free_dma(possible_dmas8)) < 0) {
                 snd_card_free(card);
-                snd_printk("unable to find a free 8-bit DMA\n");
+                        printk(KERN_ERR PFX "unable to find a free 8-bit DMA\n");
                 return -EBUSY;
             }
@@ -426 +455 @@
             if ((dma16 = snd_legacy_find_free_dma(possible_dmas16)) < 0) {
                 snd_card_free(card);
-                snd_printk("unable to find a free 16-bit DMA\n");
+                        printk(KERN_ERR PFX "unable to find a free 16-bit DMA\n");
                 return -EBUSY;
             }
@@ -485 +514 @@
                                 OPL3_HW_OPL3, snd_fm_port[dev] == snd_port[dev],
                                 &opl3) < 0) {
-                snd_printk("no OPL device at 0x%lx-0x%lx\n",
+                        printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
                            snd_fm_port[dev], snd_fm_port[dev] + 2);
             } else {
@@ -513 +542 @@
                 chip->hardware = SB_HW_16CSP;
             } else {
-                snd_printk("warning - CSP chip not detected on soundcard #%i\n", dev + 1);
+                        printk(KERN_INFO PFX "warning - CSP chip not detected on soundcard #%i\n", dev + 1);
             }
         }
@@ -521 +550 @@
             if (snd_emu8000_new(card, 1, snd_awe_port[dev],
                                 snd_seq_ports[dev], NULL) < 0) {
-                snd_printk("fatal error - EMU-8000 synthesizer not detected at 0x%lx\n", snd_awe_port[dev]);
+                        printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not detected at 0x%lx\n", snd_awe_port[dev]);
                 snd_card_free(card);
                 return -ENXIO;
@@ -535 +564 @@
         spin_unlock_irqrestore(&chip->mixer_lock, flags);
 
-        strcpy(card->driver,
+        strcpy(card->driver, 
 #ifdef SNDRV_SBAWE_EMU8000
                snd_awe_port[dev] > 0 ? "SB AWE" :
@@ -622 +651 @@
             }
 #ifdef MODULE
-            snd_printk("Sound Blaster 16+ soundcard #%i not found at 0x%lx or device busy\n", dev, snd_port[dev]);
-#endif
+                printk(KERN_ERR "Sound Blaster 16+ soundcard #%i not found at 0x%lx or device busy\n", dev, snd_port[dev]);
+#endif                  
         }
         /* legacy auto configured cards */
@@ -634 +663 @@
         if (!cards) {
 #ifdef MODULE
-            snd_printk("Sound Blaster 16 soundcard not found or device busy\n");
-#ifdef SNDRV_SBAWE_EMU8000
-            snd_printk("In case, if you have non-AWE card, try snd-card-sb16 module\n");
-#else
-            snd_printk("In case, if you have AWE card, try snd-card-sbawe module\n");
+                printk(KERN_ERR "Sound Blaster 16 soundcard not found or device busy\n");
+#ifdef SNDRV_SBAWE_EMU8000
+                printk(KERN_ERR "In case, if you have non-AWE card, try snd-card-sb16 module\n");
+#else
+                printk(KERN_ERR "In case, if you have AWE card, try snd-card-sbawe module\n");
 #endif
 #endif
@@ -659 +688 @@
 #ifndef MODULE
 
-        /* format is: snd-card-sb16=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-sb16=snd_enable,snd_index,snd_id,snd_isapnp,
          snd_port,snd_mpu_port,snd_fm_port,
          snd_irq,snd_dma8,snd_dma16,
@@ -683 +712 @@
                get_option(&str,&snd_dma8[nr_dev]) == 2 &&
                get_option(&str,&snd_dma16[nr_dev]) == 2 &&
-               get_option(&str,&snd_mic_agc[nr_dev]) == 2 &&
+               get_option(&str,&snd_mic_agc[nr_dev]) == 2
+#ifdef CONFIG_SND_SB16_CSP
+               &&
                get_option(&str,&snd_csp[nr_dev]) == 2
+#endif
 #ifdef SNDRV_SBAWE_EMU8000
                &&
@@ -704 +736 @@
 
 #ifndef SNDRV_SBAWE_EMU8000
-    __setup("snd-card-sb16=", alsa_card_sb16_setup);
-#else
-    __setup("snd-card-sbawe=", alsa_card_sb16_setup);
+__setup("snd-sb16=", alsa_card_sb16_setup);
+#else
+__setup("snd-sbawe=", alsa_card_sb16_setup);
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/sb16_csp.c

@@ -20 +20 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/info.h>
@@ -33 +36 @@
 MODULE_AUTHOR("Uros Bizjak <uros@kss-loka.si>");
 MODULE_DESCRIPTION("ALSA driver for SB16 Creative Signal Processor");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 
 #ifdef SNDRV_LITTLE_ENDIAN
 #define CSP_HDR_VALUE(a,b,c,d)  ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24))
-#define LE_SHORT(v)             (v)
-#define LE_INT(v)               (v)
 #else
-#include <byteswap.h>
 #define CSP_HDR_VALUE(a,b,c,d)  ((d) | ((c)<<8) | ((b)<<16) | ((a)<<24))
 #define LE_SHORT(v)             bswap_16(v)
 #define LE_INT(v)               bswap_32(v)
 #endif
+#define LE_SHORT(v)             le16_to_cpu(v)
+#define LE_INT(v)               le32_to_cpu(v)
 
 #define RIFF_HEADER     CSP_HDR_VALUE('R', 'I', 'F', 'F')
@@ -316 +319 @@
     if ((file_h.name != RIFF_HEADER) ||
         (LE_INT(file_h.len) >= SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE - sizeof(file_h))) {
-        snd_printd(__FUNCTION__ ": Invalid RIFF header\n");
+                snd_printd("%s: Invalid RIFF header\n", __FUNCTION__);
         return -EINVAL;
     }
@@ -325 +328 @@
         return -EFAULT;
     if (item_type != CSP__HEADER) {
-        snd_printd(__FUNCTION__ ": Invalid RIFF file type\n");
+                snd_printd("%s: Invalid RIFF file type\n", __FUNCTION__);
         return -EINVAL;
     }
@@ -380 +383 @@
 
             if (code_h.name != MAIN_HEADER) {
-                snd_printd(__FUNCTION__ ": Missing 'main' microcode\n");
+                                snd_printd("%s: Missing 'main' microcode\n", __FUNCTION__);
                 return -EINVAL;
             }
@@ -424 +427 @@
                 p->acc_format = p->acc_width = p->acc_rates = 0;
                 p->mode = 0;
-                snd_printd(__FUNCTION__ ": Unsupported CSP codec type: 0x%04x\n",
+                                snd_printd("%s: Unsupported CSP codec type: 0x%04x\n",
+                                           __FUNCTION__,
                            LE_SHORT(funcdesc_h.VOC_type));
                 return -EINVAL;
@@ -443 +447 @@
         }
     }
-    snd_printd(__FUNCTION__ ": Function #%d not found\n", info.func_req);
+        snd_printd("%s: Function #%d not found\n", __FUNCTION__, info.func_req);
     return -EINVAL;
 }
@@ -597 +601 @@
 {
     if (p->version < 0x10 || p->version > 0x1f) {
-        snd_printd(__FUNCTION__ ": Invalid CSP version: 0x%x\n", p->version);
+                snd_printd("%s: Invalid CSP version: 0x%x\n", __FUNCTION__, p->version);
         return 1;
     }
@@ -616 +620 @@
     snd_sbdsp_command(p->chip, 0x01);   /* CSP download command */
     if (snd_sbdsp_get_byte(p->chip)) {
-        snd_printd(__FUNCTION__ ": Download command failed\n");
+                snd_printd("%s: Download command failed\n", __FUNCTION__);
         goto __fail;
     }
@@ -661 +665 @@
         }
         if (status != 0x55) {
-            snd_printd(__FUNCTION__ ": Microcode initialization failed\n");
+                        snd_printd("%s: Microcode initialization failed\n", __FUNCTION__);
             goto __fail;
         }
@@ -776 +780 @@
 
     if (!(p->running & (SNDRV_SB_CSP_ST_LOADED | SNDRV_SB_CSP_ST_AUTO))) {
-        snd_printd(__FUNCTION__ ": Microcode not loaded\n");
+                snd_printd("%s: Microcode not loaded\n", __FUNCTION__);
         return -ENXIO;
     }
     if (p->running & SNDRV_SB_CSP_ST_RUNNING) {
-        snd_printd(__FUNCTION__ ": CSP already running\n");
+                snd_printd("%s: CSP already running\n", __FUNCTION__);
         return -EBUSY;
     }
     if (!(sample_width & p->acc_width)) {
-        snd_printd(__FUNCTION__ ": Unsupported PCM sample width\n");
+                snd_printd("%s: Unsupported PCM sample width\n", __FUNCTION__);
         return -EINVAL;
     }
     if (!(channels & p->acc_channels)) {
-        snd_printd(__FUNCTION__ ": Invalid number of channels\n");
+                snd_printd("%s: Invalid number of channels\n", __FUNCTION__);
         return -EINVAL;
     }
@@ -810 +814 @@
 
     if (set_codec_parameter(p->chip, 0x81, s_type)) {
-        snd_printd(__FUNCTION__ ": Set sample type command failed\n");
+                snd_printd("%s: Set sample type command failed\n", __FUNCTION__);
         goto __fail;
     }
     if (set_codec_parameter(p->chip, 0x80, 0x00)) {
-        snd_printd(__FUNCTION__ ": Codec start command failed\n");
+                snd_printd("%s: Codec start command failed\n", __FUNCTION__);
         goto __fail;
     }

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/sb16_main.c

@@ -24 +24 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/sb16_csp.h>
@@ -35 +39 @@
 #include <sound/control.h>
 #include <sound/info.h>
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_DESCRIPTION("Routines for control of 16-bit SoundBlaster cards and clones");
+MODULE_LICENSE("GPL");
+
+#define chip_t sb_t
 
 #ifdef CONFIG_SND_SB16_CSP
@@ -261 +271 @@
     size = chip->p_dma_size = snd_pcm_lib_buffer_bytes(substream);
     dma = (chip->mode & SB_MODE_PLAYBACK_8) ? chip->dma8 : chip->dma16;
-    snd_dma_program(dma, runtime->dma_area, size, DMA_MODE_WRITE | DMA_AUTOINIT);
+        snd_dma_program(dma, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
 
     count = snd_pcm_lib_period_bytes(substream);
@@ -328 +338 @@
     size = chip->c_dma_size = snd_pcm_lib_buffer_bytes(substream);
     dma = (chip->mode & SB_MODE_CAPTURE_8) ? chip->dma8 : chip->dma16;
-    snd_dma_program(dma, runtime->dma_area, size, DMA_MODE_READ | DMA_AUTOINIT);
+        snd_dma_program(dma, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
 
     count = snd_pcm_lib_period_bytes(substream);
@@ -932 +942 @@
     snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip));
 
-    snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, 128*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, 128*1024);
 
     if (rpcm)

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/sb8.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/opl3.h>
@@ -28 +30 @@
 #include <sound/initval.h>
 
+#define chip_t sb_t
+
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Sound Blaster 1.0/2.0/Pro");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Creative Labs,SB 1.0/SB 2.0/SB Pro}}");
@@ -82 +89 @@
     if (acard == NULL)
         return;
-    if (acard->fm_res)
+        if (acard->fm_res) {
         release_resource(acard->fm_res);
+                kfree_nocheck(acard->fm_res);
+        }
 }
 
@@ -136 +145 @@
                                    OPL3_HW_AUTO, 1,
                                    &opl3)) < 0) {
-            snd_printk("no OPL device at 0x%lx\n", chip->port + 8);
+                        printk(KERN_ERR "sb8: no OPL device at 0x%lx\n", chip->port + 8);
         }
     } else {
@@ -142 +151 @@
                                    OPL3_HW_AUTO, 1,
                                    &opl3)) < 0) {
-            snd_printk("no OPL device at 0x%lx-0x%lx\n",
+                        printk(KERN_ERR "sb8: no OPL device at 0x%lx-0x%lx\n",
                        chip->port, chip->port + 2);
         }
@@ -203 +212 @@
     if (!cards) {
 #ifdef MODULE
-        snd_printk("Sound Blaster soundcard not found or device busy\n");
+                printk(KERN_ERR "Sound Blaster soundcard not found or device busy\n");
 #endif
         return -ENODEV;
@@ -223 +232 @@
 #ifndef MODULE
 
-/* format is: snd-card-sb8=snd_enable,snd_index,snd_id,
+/* format is: snd-sb8=snd_enable,snd_index,snd_id,
  snd_port,snd_irq,snd_dma8 */
 
@@ -242 +251 @@
 }
 
-__setup("snd-card-sb8=", alsa_card_sb8_setup);
+__setup("snd-sb8=", alsa_card_sb8_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/sb8_main.c

@@ -19 +19 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  * --
@@ -31 +31 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/sb.h>
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Uros Bizjak <uros@kss-loka.si>");
+MODULE_DESCRIPTION("Routines for control of 8-bit SoundBlaster cards and clones");
+MODULE_LICENSE("GPL");
+
+#define chip_t sb_t
 
 #define SB8_CLOCK       1000000
@@ -172 +182 @@
         snd_sbdsp_command(chip, SB_DSP_DMA8_EXIT);
         runtime->dma_area[0] = 0x80;
-        snd_dma_program(chip->dma8, runtime->dma_area, 1, DMA_MODE_WRITE);
+                snd_dma_program(chip->dma8, runtime->dma_addr, 1, DMA_MODE_WRITE);
         /* force interrupt */
         chip->mode = SB_MODE_HALT;
@@ -199 +209 @@
     }
     spin_unlock_irqrestore(&chip->reg_lock, flags);
-    snd_dma_program(chip->dma8, runtime->dma_area,
+        snd_dma_program(chip->dma8, runtime->dma_addr,
                     size, DMA_MODE_WRITE | DMA_AUTOINIT);
     return 0;
@@ -311 +321 @@
     }
     spin_unlock_irqrestore(&chip->reg_lock, flags);
-    snd_dma_program(chip->dma8, runtime->dma_area,
+        snd_dma_program(chip->dma8, runtime->dma_addr,
                     size, DMA_MODE_READ | DMA_AUTOINIT);
     return 0;
@@ -622 +632 @@
     snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb8_capture_ops);
 
-    snd_pcm_lib_preallocate_pages_for_all(pcm, 64*1024, 64*1024, GFP_KERNEL|GFP_DMA);
+        snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, 64*1024);
 
     if (rpcm)

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/sb_common.c

@@ -17 +17 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/initval.h>
@@ -28 +33 @@
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("ALSA lowlevel driver for Sound Blaster cards");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 
@@ -172 +178 @@
     if (chip->irq >= 0)
         free_irq(chip->irq, (void *) chip);
+#ifdef CONFIG_ISA
     if (chip->dma8 >= 0) {
         disable_dma(chip->dma8);
@@ -180 +187 @@
         free_dma(chip->dma16);
     }
-    kfree(chip);
+#endif
+        kfree(chip);
     return 0;
 }
@@ -241 +249 @@
     }
 
+#ifdef CONFIG_ISA
     if (dma8 >= 0 && request_dma(dma8, "SoundBlaster - 8bit")) {
         snd_sbdsp_free(chip);
@@ -251 +260 @@
     }
     chip->dma16 = dma16;
+#endif
 
 __skip_allocation:

GPL/branches/alsa-resync1/alsa-kernel/isa/sgalaxy.c

@@ -18 +18 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/ad1848.h>
@@ -32 +36 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Christopher Butler <chrisb@sandy.force9.co.uk>");
 MODULE_DESCRIPTION("Aztech Sound Galaxy");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Aztech Systems,Sound Galaxy}}");
@@ -117 +124 @@
         if ((tmp = inb(port + 3)) == 0xff)
         {
-                snd_printdd("I/O address dead (0x%lx)\n", tmp);
+                snd_printdd("I/O address dead (0x%lx)\n", port);
                 return 0;
         }
@@ -299 +306 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("Sound Galaxy soundcard not found or device busy\n");
+                printk(KERN_ERR "Sound Galaxy soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -320 +327 @@
 #ifndef MODULE
 
-/* format is: snd-card-sgalaxy=snd_enable,snd_index,snd_id,
+/* format is: snd-sgalaxy=snd_enable,snd_index,snd_id,
                                snd_sbport,snd_wssport,
                                snd_irq,snd_dma1 */
@@ -341 +348 @@
 }
 
-__setup("snd-card-sgalaxy=", alsa_card_sgalaxy_setup);
+__setup("snd-sgalaxy=", alsa_card_sgalaxy_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/isa/wavefront/wavefront.c

@@ -17 +17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#ifndef LINUX_ISAPNP_H
+#include <linux/isapnp.h>
+#define isapnp_card pci_bus
+#define isapnp_dev pci_dev
+#endif
+#include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -30 +37 @@
 
 EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("Paul Barton-Davis <pbd@op.net>");
 MODULE_DESCRIPTION("Turtle Beach Wavefront");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Turtle Beach,Maui/Tropez/Tropez+}}");
@@ -45 +54 @@
 static int snd_ics2115_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;    /* 2,9,11,12,15 */
 static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;          /* PnP setup */
-static long snd_control_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static long snd_wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;         /* PnP setup */
 static int snd_dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;       /* 0,1,3,5,6,7 */
 static int snd_dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;       /* 0,1,3,5,6,7 */
-
-MODULE_AUTHOR("Paul Barton-Davis <pbd@op.net>");
+static int snd_use_cs4232_midi[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0}; 
+
 MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_SYNTAX(snd_index, "Index value for WaveFront soundcard.");
@@ -91 +98 @@
 MODULE_PARM_DESC(snd_fm_port, "FM port #.");
 MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_wss_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_wss_port, "Windows Sound System port #.");
-MODULE_PARM_SYNTAX(snd_wss_port, SNDRV_PORT12_DESC);
+MODULE_PARM(snd_use_cs4232_midi, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(snd_use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)");
+MODULE_PARM_SYNTAX(snd_use_cs4232_midi, SNDRV_ENABLED ",allows use of CS4323 MPU-401 interface");
 
 static snd_card_t *snd_wavefront_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
@@ -132 +139 @@
         /* Check for each logical device. */
 
-        /* "windows sound system" has id 0 */
+        /* CS4232 chip (aka "windows sound system") is logical device 0 */
 
         acard->wss = isapnp_find_dev(card, id->devs[0].vendor, id->devs[0].function, NULL);
@@ -140 +147 @@
         }
 
-        /* control interface has id 1 */
-
-        acard->ctrl = isapnp_find_dev(card, id->devs[1].vendor, id->devs[1].function, NULL);
-        if (acard->ctrl->active) {
-                acard->wss = acard->ctrl = NULL;
-                return -EBUSY;
-        }
-
-        /* synth has id 3 */
+        /* there is a game port at logical device 1, but we ignore it completely */
+
+        /* the control interface is logical device 2, but we ignore it
+           completely. in fact, nobody even seems to know what it
+           does.
+        */
+
+        /* Only configure the CS4232 MIDI interface if its been
+           specifically requested. It is logical device 3.
+        */
+
+        if (snd_use_cs4232_midi[dev]) {
+                acard->mpu = isapnp_find_dev(card, id->devs[2].vendor, id->devs[2].function, NULL);
+                if (acard->mpu->active) {
+                        acard->wss = acard->synth = acard->mpu = NULL;
+                        return -EBUSY;
+                }
+        }
+
+        /* The ICS2115 synth is logical device 4 */
 
         acard->synth = isapnp_find_dev(card, id->devs[3].vendor, id->devs[3].function, NULL);
         if (acard->synth->active) {
-                acard->wss = acard->ctrl = acard->synth = NULL;
+                acard->wss = acard->synth = NULL;
                 return -EBUSY;
-        }
-
-        /* Only configure the CS4232 MIDI interface is its been
-           requested. It has id 2.
-        */
-
-        if (snd_cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {
-                acard->mpu = isapnp_find_dev(card, id->devs[2].vendor, id->devs[2].function, NULL);
-                if (acard->mpu->active) {
-                        acard->wss = acard->ctrl = acard->synth = acard->mpu = NULL;
-                        return -EBUSY;
-                }
         }
 
@@ -174 +180 @@
         if ((tmp = pdev->prepare (pdev)) < 0) {
                 if (tmp == -EBUSY) {
-                        snd_printk ("ISA PnP configuration appears to have been "
-                                    "done. Restart the isa-pnp module.\n");
+                        snd_printk ("ISA PnP configuration appears to have "
+                                    "been done. Restart the isapnp module.\n");
                         return 0;
                 }
-                                    
                 snd_printk ("isapnp WSS preparation failed\n");
                 return -EAGAIN;
         }
+
+        /* An interesting note from the Tropez+ FAQ:
+
+           Q. [Ports] Why is the base address of the WSS I/O ports off by 4?
+
+           A. WSS I/O requires a block of 8 I/O addresses ("ports"). Of these, the first
+           4 are used to identify and configure the board. With the advent of PnP,
+           these first 4 addresses have become obsolete, and software applications
+           only use the last 4 addresses to control the codec chip. Therefore, the
+           base address setting "skips past" the 4 unused addresses.
+
+        */
 
         if (snd_cs4232_pcm_port[dev] != SNDRV_AUTO_PORT)
@@ -187 +204 @@
         if (snd_fm_port[dev] != SNDRV_AUTO_PORT)
                 isapnp_resource_change(&pdev->resource[1], snd_fm_port[dev], 4);
-        if (snd_wss_port[dev] != SNDRV_AUTO_PORT)
-                isapnp_resource_change(&pdev->resource[2], snd_wss_port[dev], 4);
-
-        if (snd_ics2115_port[dev] != SNDRV_AUTO_PORT)
-                isapnp_resource_change(&pdev->resource[3], snd_ics2115_port[dev], 8);
-        if (snd_ics2115_irq[dev] != SNDRV_AUTO_IRQ)
-                isapnp_resource_change(&pdev->irq_resource[3], snd_ics2115_irq[dev], 1);
-
         if (snd_dma1[dev] != SNDRV_AUTO_DMA)
                 isapnp_resource_change(&pdev->dma_resource[0], snd_dma1[dev], 1);
         if (snd_dma2[dev] != SNDRV_AUTO_DMA)
                 isapnp_resource_change(&pdev->dma_resource[1], snd_dma2[dev], 1);
-
         if (snd_cs4232_pcm_irq[dev] != SNDRV_AUTO_IRQ)
                 isapnp_resource_change(&pdev->irq_resource[0], snd_cs4232_pcm_irq[dev], 1);
@@ -210 +218 @@
         snd_cs4232_pcm_port[dev] = pdev->resource[0].start;
         snd_fm_port[dev] = pdev->resource[1].start;
-        snd_wss_port[dev] = pdev->resource[2].start;
-
-        snd_ics2115_port[dev] = pdev->resource[3].start;
-        snd_ics2115_irq[dev] = pdev->irq_resource[3].start;
-
         snd_dma1[dev] = pdev->dma_resource[0].start;
-        snd_dma2[dev] = pdev->dma_resource[1].start == 4 ? -1 : pdev->dma_resource[1].start;
-
+        snd_dma2[dev] = pdev->dma_resource[1].start;
         snd_cs4232_pcm_irq[dev] = pdev->irq_resource[0].start;
 
-        snd_printk ("CS4232: port=0x%lx, fm port=0x%lx, wss port=0x%lx\n"
-                    "CS4232: dma1=%i, dma2=%i, irq=%i\n"
-                    "ICS2115: port=0x%lx, irq=%i\n", 
-                    snd_cs4232_pcm_port[dev], snd_fm_port[dev], snd_wss_port[dev],
-                    snd_dma1[dev], snd_dma2[dev], snd_cs4232_pcm_irq[dev],
-                    snd_ics2115_port[dev], 
-                    snd_ics2115_irq[dev]);
-        
-        /* CTRL initialization */
-
-        if (snd_control_port[dev] != SNDRV_AUTO_PORT) {
-
-                pdev = acard->ctrl;
-
-                if (pdev->prepare(pdev)<0) {
+        /* Synth initialization */
+
+                pdev = acard->synth;
+
+        if ((tmp = pdev->prepare(pdev))<0) {
+                if (tmp == -EBUSY) {
+                        snd_printk ("ISA PnP configuration appears to have "
+                                    "been done. Restart the isapnp module.\n");
+                }
                         acard->wss->deactivate(acard->wss);
-                        snd_printk ("isapnp CTRL preparation failed\n");
-                        return -EAGAIN;
-                }
-                
-                if (snd_control_port[dev] != SNDRV_AUTO_PORT)
-                        isapnp_resource_change(&pdev->resource[0], snd_control_port[dev], 8);
-                
-                if (pdev->activate(pdev)<0) {
-                        snd_printk("isapnp CTRL activation failed\n");
-                        acard->wss->deactivate(acard->wss);
-                        return -EBUSY;
-                }
-                
-                snd_control_port[dev] = pdev->resource[0].start;
-                snd_printk ("isapnp CTRL: control port=0x%lx\n", 
-                            snd_control_port[dev]);
-        }
-
-        /* Synth initialization */
-
-        if (snd_ics2115_port[dev] != SNDRV_AUTO_PORT) {
-
-                pdev = acard->synth;
-
-                if (pdev->prepare(pdev)<0) {
-                        acard->wss->deactivate(acard->wss);
-                        if (acard->ctrl)
-                                acard->ctrl->deactivate(acard->ctrl);
                         snd_printk ("ICS2115 synth preparation failed\n");
                         return -EAGAIN;
                 }
+        if (snd_ics2115_port[dev] != SNDRV_AUTO_PORT) {
+                isapnp_resource_change(&pdev->resource[0], snd_ics2115_port[dev], 16);
+        }
                 
-                isapnp_resource_change(&pdev->resource[0], snd_ics2115_port[dev], 8);
-                if (snd_ics2115_irq[dev] != SNDRV_AUTO_IRQ) 
+        if (snd_ics2115_port[dev] != SNDRV_AUTO_IRQ) {
                         isapnp_resource_change(&pdev->irq_resource[0], snd_ics2115_irq[dev], 1);
+        }
 
                 if (pdev->activate(pdev)<0) {
-                        snd_printk("synth configuration failed\n");
+                snd_printk("isapnp activation for ICS2115 failed\n");
                         acard->wss->deactivate(acard->wss);
-                        if (acard->ctrl)
-                                acard->ctrl->deactivate(acard->ctrl);
                         return -EBUSY;
                 }
@@ -282 +251 @@
                 snd_ics2115_port[dev] = pdev->resource[0].start;
                 snd_ics2115_irq[dev] = pdev->irq_resource[0].start;
-        }
 
         /* CS4232 MPU initialization. Configure this only if
@@ -289 +257 @@
         */
 
-        if (snd_cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {
+        if (snd_use_cs4232_midi[dev]) {
 
                 pdev = acard->mpu;
@@ -295 +263 @@
                 if (pdev->prepare(pdev)<0) {
                         acard->wss->deactivate(acard->wss);
-                        if (acard->ctrl)
-                                acard->ctrl->deactivate(acard->ctrl);
                         if (acard->synth)
                                 acard->synth->deactivate(acard->synth);
@@ -320 +286 @@
                             snd_cs4232_mpu_irq[dev]);
         }
+
+        snd_printdd ("CS4232: pcm port=0x%lx, fm port=0x%lx, dma1=%i, dma2=%i, irq=%i\nICS2115: port=0x%lx, irq=%i\n", 
+                    snd_cs4232_pcm_port[dev], 
+                    snd_fm_port[dev],
+                    snd_dma1[dev], 
+                    snd_dma2[dev], 
+                    snd_cs4232_pcm_irq[dev],
+                    snd_ics2115_port[dev], 
+                    snd_ics2115_irq[dev]);
 
         return 0;
@@ -469 +444 @@
                 snd_wavefront_deactivate(acard);
 #endif
-                if (acard->wavefront.res_base != NULL)
+                if (acard->wavefront.res_base != NULL) {
                         release_resource(acard->wavefront.res_base);
+                        kfree_nocheck(acard->wavefront.res_base);
+                }
                 if (acard->wavefront.irq > 0)
                         free_irq(acard->wavefront.irq, (void *)acard);
@@ -526 +503 @@
 #ifdef __ISAPNP__
         if (snd_isapnp[dev] && snd_wavefront_isapnp (dev, acard) < 0) {
-                if (snd_cs4232_pcm_port[dev] == SNDRV_AUTO_PORT ||
-                    snd_control_port[dev] == SNDRV_AUTO_PORT) {
+                if (snd_cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
                         snd_printk ("isapnp detection failed\n");
                         snd_card_free (card);
@@ -539 +515 @@
         if ((err = snd_cs4231_create (card,
                                       snd_cs4232_pcm_port[dev],
-                                      snd_control_port[dev],
+                                      -1,
                                       snd_cs4232_pcm_irq[dev],
                                       snd_dma1[dev],
@@ -765 +741 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk ("No cards found or devices busy\n");
+                printk (KERN_ERR "No WaveFront cards found or devices busy\n");
 #endif
                 return -ENODEV;
@@ -785 +761 @@
 #ifndef MODULE
 
-/* format is: snd-card-wavefront=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-wavefront=snd_enable,snd_index,snd_id,snd_isapnp,
                                  snd_cs4232_pcm_port,snd_cs4232_pcm_irq,
                                  snd_cs4232_mpu_port,snd_cs4232_mpu_irq,
                                  snd_ics2115_port,snd_ics2115_irq,
-                                 snd_fm_port,snd_control_port,snd_wss_port,
-                                 snd_dma1,snd_dma2 */
+                            snd_fm_port,
+                            snd_dma1,snd_dma2,
+                            snd_use_cs4232_midi */
 
 static int __init alsa_card_wavefront_setup(char *str)
@@ -809 +786 @@
                get_option(&str,&snd_ics2115_irq[nr_dev]) == 2 &&
                get_option(&str,(int *)&snd_fm_port[nr_dev]) == 2 &&
-               get_option(&str,(int *)&snd_control_port[nr_dev]) == 2 &&
-               get_option(&str,(int *)&snd_wss_port[nr_dev]) == 2 &&
                get_option(&str,&snd_dma1[nr_dev]) == 2 &&
-               get_option(&str,&snd_dma2[nr_dev]) == 2);
+               get_option(&str,&snd_dma2[nr_dev]) == 2 &&
+               get_option(&str,&snd_use_cs4232_midi[nr_dev]) == 2);
         nr_dev++;
         return 1;
 }
 
-__setup("snd-card-wavefront=", alsa_card_wavefront_setup);
+__setup("snd-wavefront=", alsa_card_wavefront_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/pci/ali5451/ali5451.c

@@ -27 +27 @@
 
 #define __SNDRV_OSS_COMPAT__
-#define SNDRV_MAIN_OBJECT_FILE
-
-#include "sound/driver.h"
-#include "sound/pcm.h"
-#include "sound/info.h"
-#include "sound/ac97_codec.h"
-#include "sound/mpu401.h"
+
+#include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/info.h>
+#include <sound/ac97_codec.h>
+#include <sound/mpu401.h>
 #define SNDRV_GET_ID
-#include "sound/initval.h"
+#include <sound/initval.h>
 
 MODULE_AUTHOR("Matt Wu <Matt_Wu@acersoftech.com.cn>");
@@ -2323 +2328 @@
     if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-        //              snd_printk("ALi pci audio not found or device busy.\n");
+//              snd_printk(KERN_ERR "ALi pci audio not found or device busy.\n");
 #endif
         return err;

GPL/branches/alsa-resync1/alsa-kernel/pci/als4000.c

@@ -731 +731 @@
                                    &chip->rmidi)) < 0) {
         snd_card_free(card);
-        snd_printk("no MPU-401device at 0x%lx ?\n", gcr+0x30);
+                printk(KERN_ERR "als4000: no MPU-401device at 0x%lx ?\n", gcr+0x30);
         return err;
     }
@@ -746 +746 @@
     if (snd_opl3_create(card, gcr+0x10, gcr+0x12,
                         OPL3_HW_AUTO, 1, &opl3) < 0) {
-        snd_printk("no OPL device at 0x%lx-0x%lx ?\n",
+                printk(KERN_ERR "als4000: no OPL device at 0x%lx-0x%lx ?\n",
                    gcr+0x10, gcr+0x12 );
     } else {
@@ -797 +797 @@
     if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-        //              snd_printk("no ALS4000 based soundcards found or device busy\n");
+//              snd_printk(KERN_ERR "no ALS4000 based soundcards found or device busy\n");
 #endif
         return err;

GPL/branches/alsa-resync1/alsa-kernel/pci/emu10k1/emu10k1_main.c

@@ -39 +39 @@
 #include <sound/core.h>
 #include <sound/emu10k1.h>
-#include <sound/firmware.h>
+#include <linux/firmware.h>
 #include "p16v.h"
 #include "tina2.h"
@@ -597 +597 @@
     return 0;
 }
+
 
 static int snd_emu1010_load_firmware(struct snd_emu10k1 * emu, const char * filename)
@@ -1020 +1021 @@
     return 0;
 }
-
 
 /*

GPL/branches/alsa-resync1/alsa-kernel/pci/es1968.c

@@ -1606 +1606 @@
     es->substream = substream;
     es->mode = ESM_MODE_PLAY;
+        INIT_LIST_HEAD(&es->list);
 
     runtime->private_data = es;
@@ -1657 +1658 @@
     es->substream = substream;
     es->mode = ESM_MODE_CAPTURE;
+        INIT_LIST_HEAD(&es->list);
 
     /* get mixbuffer */
@@ -1717 +1719 @@
     return 0;
 }
+
 static snd_pcm_ops_t snd_es1968_playback_ops = {
     /*  open:     */    snd_es1968_playback_open,
@@ -2005 +2008 @@
 
     if (event & ESM_SOUND_IRQ) {
-        struct list_head *p;
+                struct list_head *p, *n;
         spin_lock(&chip->substream_lock);
-        list_for_each(p, &chip->substream_list) {
+                /* we need to use list_for_each_safe here since the substream
+                 * can be deleted in period_elapsed().
+                 */
+                list_for_each_safe(p, n, &chip->substream_list) {
             esschan_t *es = list_entry(p, esschan_t, list);
             if (es->running)
@@ -2841 +2847 @@
     if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-        //              snd_printk("ESS Maestro soundcard not found or device busy\n");
+//              snd_printk(KERN_ERR "ESS Maestro soundcard not found or device busy\n");
 #endif
         return err;

GPL/branches/alsa-resync1/alsa-kernel/pci/hda/patch_analog.c

@@ -2619 +2619 @@
         if (is_rev2(codec))
                 snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n");
-
+//paul
+                snd_printk(KERN_INFO "patch_analog: Vendor Id: 0x%x\n", codec->vendor_id);
+                snd_printk(KERN_INFO "patch_analog: Subsystem Id: 0x%x\n", codec->subsystem_id);
+                snd_printk(KERN_INFO "patch_analog: Revision Id: 0x%x\n", codec->revision_id);
+                snd_printk(KERN_INFO "patch_analog: Model Name: %s\n", codec->bus->modelname);
+//endpaul
         board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST,
                                                   ad1988_models, NULL);
@@ -2638 +2643 @@
                 }
         }
-
+//paul
+        snd_printk(KERN_INFO "patch_analog: board_config: %d\n", board_config);
+        board_config = AD1988_3STACK_DIG;
+        snd_printk(KERN_INFO "patch_analog: kludged board_config: %d\n", board_config);
+//endpaul
         switch (board_config) {
         case AD1988_6STACK:

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */      
@@ -22 +22 @@
 /*
   NOTES:
-  - spdif nonaudio consumer mode does not work (at least with my 
+  - spdif nonaudio consumer mode does not work (at least with my
     Sony STR-DB830)
 */
 
-#define SNDRV_MAIN_OBJECT_FILE
-
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/mpu401.h>
+#include <sound/i2c.h>
+#include <sound/cs8427.h>
 #include <sound/info.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
 
+#include <sound/asoundef.h>
+
+#define SND_CS8403
+#define SND_CS8404
+#include <sound/cs8403.h>
+
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("ICEnsemble ICE1712 (Envy24)");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Hoontech SoundTrack DSP 24},"
@@ -49 +64 @@
                 "{TerraTec,EWS 88MT},"
                 "{TerraTec,EWS 88D},"
+                "{TerraTec,DMX 6Fire},"
                 "{ICEnsemble,Generic ICE1712},"
                 "{ICEnsemble,Generic Envy24}}");
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;          /* Enable this card */
+static int snd_omni[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 0};       /* Delta44 & 66 Omni I/O support */
 
 MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
@@ -66 +82 @@
 MODULE_PARM_DESC(snd_enable, "Enable ICE1712 soundcard.");
 MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(snd_omni, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(snd_omni, "Enable Midiman M-Audio Delta Omni I/O support.");
+MODULE_PARM_SYNTAX(snd_omni, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
 
 #ifndef PCI_VENDOR_ID_ICE
@@ -83 +102 @@
 #define ICE1712_SUBDEVICE_EWS88MT       0x3b151511
 #define ICE1712_SUBDEVICE_EWS88D        0x3b152b11
+#define ICE1712_SUBDEVICE_DMX6FIRE      0x3b153811
 
 /*
@@ -256 +276 @@
 #define ICE1712_CFG_SPDIF_OUT   0x01    /* S/PDIF output is present */
 
-/* MidiMan Delta GPIO definitions */
-
-#define ICE1712_DELTA_DFS       0x01    /* fast/slow sample rate mode */
+/*
+ *  MidiMan M-Audio Delta GPIO definitions
+ */
+
+/* MidiMan M-Audio Delta1010 */
+#define ICE1712_DELTA_DFS 0x01          /* fast/slow sample rate mode */
                                         /* (>48kHz must be 1) */
-                                        /* all cards */
 #define ICE1712_DELTA_SPDIF_IN_STAT 0x02
                                         /* S/PDIF input status */
@@ -275 +297 @@
                                         /* all except Delta44 */
                                         /* look to CS8404A datasheet */
+/* MidiMan M-Audio DeltaDiO */
+/* 0x01 = DFS */
+/* 0x02 = SPDIF_IN_STAT */
+/* 0x04 = SPDIF_OUT_STAT_CLOCK */
+/* 0x08 = SPDIF_OUT_STAT_DATA */
 #define ICE1712_DELTA_SPDIF_INPUT_SELECT 0x10
                                         /* coaxial (0), optical (1) */
                                         /* S/PDIF input select*/
-                                        /* DeltaDiO only */
+
+/* MidiMan M-Audio Delta1010 */
+/* 0x01 = DFS */
+/* 0x02 = SPDIF_IN_STAT */
+/* 0x04 = SPDIF_OUT_STAT_CLOCK */
+/* 0x08 = SPDIF_OUT_STAT_DATA */
 #define ICE1712_DELTA_WORD_CLOCK_SELECT 0x10
                                         /* 1 - clock are taken from S/PDIF input */
                                         /* 0 - clock are taken from Word Clock input */
-                                        /* Delta1010 only (affected SPMCLKIN pin of Envy24) */
+                                        /* affected SPMCLKIN pin of Envy24 */
+#define ICE1712_DELTA_WORD_CLOCK_STATUS 0x20
+                                        /* 0 = valid word clock signal is present */
+
+/* MidiMan M-Audio Delta66 */
+/* 0x01 = DFS */
+/* 0x02 = SPDIF_IN_STAT */
+/* 0x04 = SPDIF_OUT_STAT_CLOCK */
+/* 0x08 = SPDIF_OUT_STAT_DATA */
 #define ICE1712_DELTA_CODEC_SERIAL_DATA 0x10
                                         /* AKM4524 serial data */
-                                        /* Delta66 and Delta44 */
-#define ICE1712_DELTA_WORD_CLOCK_STATUS 0x20
-                                        /* 0 = valid word clock signal is present */
-                                        /* Delta1010 only */
 #define ICE1712_DELTA_CODEC_SERIAL_CLOCK 0x20
                                         /* AKM4524 serial clock */
                                         /* (writting on rising edge - 0->1 */
-                                        /* Delta66 and Delta44 */
 #define ICE1712_DELTA_CODEC_CHIP_A      0x40
 #define ICE1712_DELTA_CODEC_CHIP_B      0x80
                                         /* 1 - select chip A or B */
-                                        /* Delta66 and Delta44 */
-
-/* M-Audio Audiophile definitions */
+
+/* MidiMan M-Audio Delta44 */
 /* 0x01 = DFS */
-#define ICE1712_DELTA_AP_CCLK   0x02    /* AudioPhile only */
-                                        /* SPI clock */
+/* 0x10 = CODEC_SERIAL_DATA */
+/* 0x20 = CODEC_SERIAL_CLOCK */
+/* 0x40 = CODEC_CHIP_A */
+/* 0x80 = CODEC_CHIP_B */
+
+/* MidiMan M-Audio Audiophile definitions */
+/* 0x01 = DFS */
+#define ICE1712_DELTA_AP_CCLK   0x02    /* SPI clock */
                                         /* (clocking on rising edge - 0->1) */
-#define ICE1712_DELTA_AP_DIN    0x04    /* AudioPhile only - data input */
-#define ICE1712_DELTA_AP_DOUT   0x08    /* AudioPhile only - data output */
-#define ICE1712_DELTA_AP_CS_DIGITAL 0x10 /* AudioPhile only - CS8427 chip select */
+#define ICE1712_DELTA_AP_DIN    0x04    /* data input */
+#define ICE1712_DELTA_AP_DOUT   0x08    /* data output */
+#define ICE1712_DELTA_AP_CS_DIGITAL 0x10 /* CS8427 chip select */
                                         /* low signal = select */
-#define ICE1712_DELTA_AP_CS_CODEC 0x20  /* AudioPhile only - AK4528 chip select */
+#define ICE1712_DELTA_AP_CS_CODEC 0x20  /* AK4528 chip select */
                                         /* low signal = select */
 
@@ -353 +393 @@
 /* TerraTec EWS 88MT/D configuration definitions */
 /* RW, SDA snd SCLK are identical with EWX24/96 */
-
 #define ICE1712_EWS88_CS8414_RATE       0x07    /* CS8414 sample rate: gpio 0-2 */
 #define ICE1712_EWS88_RW                0x08    /* read/write switch for i2c; high = write  */
@@ -362 +401 @@
 
 /* i2c address */
-#define ICE1712_EWS88MT_CS8404_ADDR     0x40
-#define ICE1712_EWS88MT_INPUT_ADDR      0x46
-#define ICE1712_EWS88MT_OUTPUT_ADDR     0x48
+#define ICE1712_EWS88MT_CS8404_ADDR     (0x40>>1)
+#define ICE1712_EWS88MT_INPUT_ADDR      (0x46>>1)
+#define ICE1712_EWS88MT_OUTPUT_ADDR     (0x48>>1)
 #define ICE1712_EWS88MT_OUTPUT_SENSE    0x40    /* mask */
-#define ICE1712_EWS88D_PCF_ADDR         0x40
+#define ICE1712_EWS88D_PCF_ADDR         (0x40>>1)
+
+/* TerraTec DMX 6Fire configuration definitions */
+#define ICE1712_6FIRE_AK4524_CS_MASK    0x07    /* AK4524 chip select #1-#3 */
+#define ICE1712_6FIRE_RW                0x08    /* read/write switch for i2c; high = write  */
+#define ICE1712_6FIRE_SERIAL_DATA       0x10    /* i2c & ak4524 data */
+#define ICE1712_6FIRE_SERIAL_CLOCK      0x20    /* i2c & ak4524 clock */
+#define ICE1712_6FIRE_TX2               0x40    /* MIDI2 */
+#define ICE1712_6FIRE_RX2               0x80    /* MIDI2 */
+
+#define ICE1712_6FIRE_CS8427_ADDR       (0x22>>1) /* ?? */
 
 /*
@@ -381 +430 @@
 
 typedef struct _snd_ice1712 ice1712_t;
-
-typedef struct {
-        void (*write)(ice1712_t *ice, unsigned char reg, unsigned char data);
-        unsigned char (*read)(ice1712_t *ice, unsigned char reg);
-        void (*write_bytes)(ice1712_t *ice, unsigned char reg, int bytes, unsigned char *data);
-        void (*read_bytes)(ice1712_t *ice, unsigned char reg, int bytes, unsigned char *data);
-} ice1712_cs8427_ops_t;
 
 typedef struct {
@@ -453 +495 @@
 
         unsigned int pro_volumes[20];
-        int num_adcs;
-        int num_dacs;
+        int ak4528: 1,                  /* AK4524 or AK4528 */
+            omni: 1;                    /* Delta Omni I/O */
+        int num_adcs;                   /* AK4524 or AK4528 ADCs */
+        int num_dacs;                   /* AK4524 or AK4528 DACs */
+        int num_total_dacs;             /* total DACs */
         unsigned char ak4524_images[4][8];
+        unsigned char ak4524_ipga_gain[4][2];
         unsigned char hoontech_boxbits[4];
         unsigned int hoontech_config;
         unsigned short hoontech_boxconfig[4];
 
+        snd_i2c_bus_t *i2c;             /* I2C bus */
+        snd_i2c_device_t *cs8404;       /* CS8404A I2C device */
+        snd_i2c_device_t *cs8427;       /* CS8427 I2C device */
+        snd_i2c_device_t *pcf8574[2];   /* PCF8574 Output/Input (EWS88MT) */
+        snd_i2c_device_t *pcf8575;      /* PCF8575 (EWS88D) */
+        
         unsigned char cs8403_spdif_bits;
         unsigned char cs8403_spdif_stream_bits;
         snd_kcontrol_t *spdif_stream_ctl;
-
-        unsigned char cs8427_spdif_status[5];
-        unsigned char cs8427_spdif_stream_status[5];
-        ice1712_cs8427_ops_t *cs8427_ops;
 
         unsigned char gpio_direction, gpio_write_mask;
@@ -651 +699 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_mixer_digmix_route_ac97 = {
+static snd_kcontrol_new_t snd_ice1712_mixer_digmix_route_ac97 __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -670 +718 @@
 /*
  */
+
 static void snd_ice1712_delta_cs8403_spdif_write(ice1712_t *ice, unsigned char bits)
 {
@@ -694 +743 @@
 }
 
-static void snd_ice1712_decode_cs8403_spdif_bits(snd_aes_iec958_t *diga,
-                                                 unsigned char bits)
-{
-        if (bits & 0x01) {      /* consumer */
-                if (!(bits & 0x02))
-                        diga->status[0] |= IEC958_AES0_NONAUDIO;
-                if (!(bits & 0x08))
-                        diga->status[0] |= IEC958_AES0_CON_NOT_COPYRIGHT;
-                switch (bits & 0x10) {
-                case 0x10: diga->status[0] |= IEC958_AES0_CON_EMPHASIS_NONE; break;
-                case 0x00: diga->status[0] |= IEC958_AES0_CON_EMPHASIS_5015; break;
-                }
-                if (!(bits & 0x80))
-                        diga->status[1] |= IEC958_AES1_CON_ORIGINAL;
-                switch (bits & 0x60) {
-                case 0x00: diga->status[1] |= IEC958_AES1_CON_MAGNETIC_ID; break;
-                case 0x20: diga->status[1] |= IEC958_AES1_CON_DIGDIGCONV_ID; break;
-                case 0x40: diga->status[1] |= IEC958_AES1_CON_LASEROPT_ID; break;
-                case 0x60: diga->status[1] |= IEC958_AES1_CON_GENERAL; break;
-                }
-                switch (bits & 0x06) {
-                case 0x00: diga->status[3] |= IEC958_AES3_CON_FS_44100; break;
-                case 0x02: diga->status[3] |= IEC958_AES3_CON_FS_48000; break;
-                case 0x04: diga->status[3] |= IEC958_AES3_CON_FS_32000; break;
-                }
-        } else {
-                diga->status[0] = IEC958_AES0_PROFESSIONAL;
-                switch (bits & 0x18) {
-                case 0x00: diga->status[0] |= IEC958_AES0_PRO_FS_32000; break;
-                case 0x10: diga->status[0] |= IEC958_AES0_PRO_FS_44100; break;
-                case 0x08: diga->status[0] |= IEC958_AES0_PRO_FS_48000; break;
-                case 0x18: diga->status[0] |= IEC958_AES0_PRO_FS_NOTID; break;
-                }
-                switch (bits & 0x60) {
-                case 0x20: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_NONE; break;
-                case 0x40: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_5015; break;
-                case 0x00: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_CCITT; break;
-                case 0x60: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_NOTID; break;
-                }
-                if (bits & 0x80)
-                        diga->status[1] |= IEC958_AES1_PRO_MODE_STEREOPHONIC;
-        }
-}
-
-static unsigned char snd_ice1712_encode_cs8403_spdif_bits(snd_aes_iec958_t *diga)
-{
-        unsigned char bits;
-
-        if (!(diga->status[0] & IEC958_AES0_PROFESSIONAL)) {
-                bits = 0x01;    /* consumer mode */
-                if (diga->status[0] & IEC958_AES0_NONAUDIO)
-                        bits &= ~0x02;
-                else
-                        bits |= 0x02;
-                if (diga->status[0] & IEC958_AES0_CON_NOT_COPYRIGHT)
-                        bits &= ~0x08;
-                else
-                        bits |= 0x08;
-                switch (diga->status[0] & IEC958_AES0_CON_EMPHASIS) {
-                default:
-                case IEC958_AES0_CON_EMPHASIS_NONE: bits |= 0x10; break;
-                case IEC958_AES0_CON_EMPHASIS_5015: bits |= 0x00; break;
-                }
-                if (diga->status[1] & IEC958_AES1_CON_ORIGINAL)
-                        bits &= ~0x80;
-                else
-                        bits |= 0x80;
-                if ((diga->status[1] & IEC958_AES1_CON_CATEGORY) == IEC958_AES1_CON_GENERAL)
-                        bits |= 0x60;
-                else {
-                        switch(diga->status[1] & IEC958_AES1_CON_MAGNETIC_MASK) {
-                        case IEC958_AES1_CON_MAGNETIC_ID:
-                                bits |= 0x00; break;
-                        case IEC958_AES1_CON_DIGDIGCONV_ID:
-                                bits |= 0x20; break;
-                        default:
-                        case IEC958_AES1_CON_LASEROPT_ID:
-                                bits |= 0x40; break;
-                        }
-                }
-                switch (diga->status[3] & IEC958_AES3_CON_FS) {
-                default:
-                case IEC958_AES3_CON_FS_44100: bits |= 0x00; break;
-                case IEC958_AES3_CON_FS_48000: bits |= 0x02; break;
-                case IEC958_AES3_CON_FS_32000: bits |= 0x04; break;
-                }
-        } else {
-                bits = 0x00;    /* professional mode */
-                if (diga->status[0] & IEC958_AES0_NONAUDIO)
-                        bits &= ~0x02;
-                else
-                        bits |= 0x02;
-                /* CHECKME: I'm not sure about the bit order in val here */
-                switch (diga->status[0] & IEC958_AES0_PRO_FS) {
-                case IEC958_AES0_PRO_FS_32000:  bits |= 0x00; break;
-                case IEC958_AES0_PRO_FS_44100:  bits |= 0x10; break;    /* 44.1kHz */
-                case IEC958_AES0_PRO_FS_48000:  bits |= 0x08; break;    /* 48kHz */
-                default:
-                case IEC958_AES0_PRO_FS_NOTID: bits |= 0x18; break;
-                }
-                switch (diga->status[0] & IEC958_AES0_PRO_EMPHASIS) {
-                case IEC958_AES0_PRO_EMPHASIS_NONE: bits |= 0x20; break;
-                case IEC958_AES0_PRO_EMPHASIS_5015: bits |= 0x40; break;
-                case IEC958_AES0_PRO_EMPHASIS_CCITT: bits |= 0x00; break;
-                default:
-                case IEC958_AES0_PRO_EMPHASIS_NOTID: bits |= 0x60; break;
-                }
-                switch (diga->status[1] & IEC958_AES1_PRO_MODE) {
-                case IEC958_AES1_PRO_MODE_TWO:
-                case IEC958_AES1_PRO_MODE_STEREOPHONIC: bits |= 0x00; break;
-                default: bits |= 0x80; break;
-                }
-        }
-        return bits;
-}
-
 
 /*
@@ -841 +774 @@
 
 /*
- * CS8427 via SPI mode (for Audiophile)
+ * CS8427 via SPI mode (for Audiophile), emulated I2C
  */
 
@@ -899 +832 @@
 }
 
-/* write a register */
-static void snd_ice1712_ap_cs8427_write(ice1712_t *ice, unsigned char reg, unsigned char data)
-{
+/* sequential write */
+static int ap_cs8427_sendbytes(snd_i2c_device_t *device, unsigned char *bytes, int count)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, device->bus->private_data, return -EIO);
+        int res = count;
         unsigned char tmp;
+
         down(&ice->gpio_mutex);
         tmp = ap_cs8427_codec_select(ice);
-        ap_cs8427_write_byte(ice, 0x20, tmp); /* address + write mode */
-        ap_cs8427_write_byte(ice, reg, tmp);
-        ap_cs8427_write_byte(ice, data, tmp);
+        ap_cs8427_write_byte(ice, (device->addr << 1) | 0, tmp); /* address + write mode */
+        while (count-- > 0)
+                ap_cs8427_write_byte(ice, *bytes++, tmp);
         ap_cs8427_codec_deassert(ice, tmp);
         up(&ice->gpio_mutex);
-}
-
-/* read a register */
-static unsigned char snd_ice1712_ap_cs8427_read(ice1712_t *ice, unsigned char reg)
-{
-        unsigned char tmp, data;
+        return res;
+}
+
+/* sequential read */
+static int ap_cs8427_readbytes(snd_i2c_device_t *device, unsigned char *bytes, int count)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, device->bus->private_data, return -EIO);
+        int res = count;
+        unsigned char tmp;
 
         down(&ice->gpio_mutex);
         tmp = ap_cs8427_codec_select(ice);
-        ap_cs8427_write_byte(ice, 0x20, tmp); /* address + write mode */
-        ap_cs8427_write_byte(ice, reg, tmp);
-        ap_cs8427_codec_deassert(ice, tmp);
-        udelay(5);
-        tmp = ap_cs8427_codec_select(ice);
-        ap_cs8427_write_byte(ice, 0x21, tmp); /* address + read mode */
-        data = ap_cs8427_read_byte(ice, tmp);
+        ap_cs8427_write_byte(ice, (device->addr << 1) | 1, tmp); /* address + read mode */
+        while (count-- > 0)
+                *bytes++ = ap_cs8427_read_byte(ice, tmp);
         ap_cs8427_codec_deassert(ice, tmp);
         up(&ice->gpio_mutex);
-        return data;
-}
-
-/* sequential write */
-static void snd_ice1712_ap_cs8427_write_bytes(ice1712_t *ice, unsigned char reg, int bytes, unsigned char *data)
-{
-#if 1
-        unsigned char tmp;
-        down(&ice->gpio_mutex);
-        tmp = ap_cs8427_codec_select(ice);
-        ap_cs8427_write_byte(ice, 0x20, tmp); /* address + write mode */
-        ap_cs8427_write_byte(ice, reg | 0x80, tmp); /* incremental mode */
-        while (bytes-- > 0)
-                ap_cs8427_write_byte(ice, *data++, tmp);
-        ap_cs8427_codec_deassert(ice, tmp);
-        up(&ice->gpio_mutex);
-#else
-        while (bytes-- > 0)
-                snd_ice1712_ap_cs8427_write(ice, reg++, *data++);
-#endif
-}
-
-/* sequential read */
-static void snd_ice1712_ap_cs8427_read_bytes(ice1712_t *ice, unsigned char reg, int bytes, unsigned char *data)
-{
-#if 0 // is this working?  -- ti
-        unsigned char tmp;
-        
-        down(&ice->gpio_mutex);
-        tmp = ap_cs8427_codec_select(ice);
-        ap_cs8427_write_byte(ice, 0x20, tmp); /* address + write mode */
-        ap_cs8427_write_byte(ice, reg | 0x80, tmp); /* incremental mode */
-        ap_cs8427_codec_deassert(ice, tmp);
-        udelay(5);
-        tmp = ap_cs8427_codec_select(ice);
-        ap_cs8427_write_byte(ice, 0x21, tmp); /* address + read mode */
-        while (bytes-- > 0)
-                *data++ = ap_cs8427_read_byte(ice, tmp);
-        ap_cs8427_codec_deassert(ice, tmp);
-        up(&ice->gpio_mutex);
-#else
-        while (bytes-- > 0)
-                *data++ = snd_ice1712_ap_cs8427_read(ice, reg++); 
-#endif
+        return res;
+}
+
+static int ap_cs8427_probeaddr(snd_i2c_bus_t *bus, unsigned short addr)
+{
+        if (addr == 0x10)
+                return 1;
+        return -ENOENT;
 }
 
 #ifdef TARGET_OS2
 static ice1712_cs8427_ops_t snd_ice1712_ap_cs8427_ops = {
-        snd_ice1712_ap_cs8427_write,
-        snd_ice1712_ap_cs8427_read,
-        snd_ice1712_ap_cs8427_write_bytes,
-        snd_ice1712_ap_cs8427_read_bytes
+        ap_cs8427_sendbytes,
+        ap_cs8427_readbytes,
+        ap_cs8427_probeaddr,
 };
 #else
-static ice1712_cs8427_ops_t snd_ice1712_ap_cs8427_ops = {
-        write: snd_ice1712_ap_cs8427_write,
-        read: snd_ice1712_ap_cs8427_read,
-        write_bytes: snd_ice1712_ap_cs8427_write_bytes,
-        read_bytes: snd_ice1712_ap_cs8427_read_bytes,
+static snd_i2c_ops_t ap_cs8427_i2c_ops = {
+        sendbytes: ap_cs8427_sendbytes,
+        readbytes: ap_cs8427_readbytes,
+        probeaddr: ap_cs8427_probeaddr,
 };
 #endif
-
 
 /*
@@ -996 +892 @@
 
 /* send SDA and SCL */
-static void ewx_i2c_set(ice1712_t *ice, int clk, int data)
-{
+static void ewx_i2c_setlines(snd_i2c_bus_t *bus, int clk, int data)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, bus->private_data, return);
         unsigned char tmp = 0;
         if (clk)
@@ -1007 +904 @@
 }
 
-/* send one bit */
-static void ewx_i2c_send(ice1712_t *ice, int data)
-{
-        ewx_i2c_set(ice, 0, data);
-        ewx_i2c_set(ice, 1, data);
-        ewx_i2c_set(ice, 0, data);
-}
-
-/* start i2c */
-static void ewx_i2c_start(ice1712_t *ice)
-{
-        ewx_i2c_set(ice, 0, 1);
-        ewx_i2c_set(ice, 1, 1);
-        ewx_i2c_set(ice, 1, 0);
-        ewx_i2c_set(ice, 0, 0);
-}
-
-/* stop i2c */
-static void ewx_i2c_stop(ice1712_t *ice)
-{
-        ewx_i2c_set(ice, 0, 0);
-        ewx_i2c_set(ice, 1, 0);
-        ewx_i2c_set(ice, 1, 1);
-}
-
-/* send a byte and get ack */
-static void ewx_i2c_write(ice1712_t *ice, unsigned char val)
-{
-        int i;
-        for (i = 7; i >= 0; i--)
-                ewx_i2c_send(ice, val & (1 << i));
-        ewx_i2c_send(ice, 1); /* ack */
-}
-
-/* prepare for write and send i2c_start */
-static void ewx_i2c_write_prepare(ice1712_t *ice)
-{
-        /* set RW high */
-        unsigned char mask = ICE1712_EWX2496_RW;
-        if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_EWX2496)
-                mask |= ICE1712_EWX2496_AK4524_CS; /* CS high also */
-        snd_ice1712_gpio_write_bits(ice, mask, mask);
-        /* set direction both SDA and SCL write */
-        ice->gpio_direction |= ICE1712_EWX2496_SERIAL_CLOCK|ICE1712_EWX2496_SERIAL_DATA;
-        snd_ice1712_write(ice, ICE1712_IREG_GPIO_DIRECTION, ice->gpio_direction);
-        snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~(ICE1712_EWX2496_SERIAL_CLOCK|ICE1712_EWX2496_SERIAL_DATA));
-                          
-        ewx_i2c_start(ice);
-}
-
-/* read a bit from serial data;
-   this changes write mask
-   SDA direction must be set to low
-*/
-static int ewx_i2c_read_bit(ice1712_t *ice)
-{
-        int data;
+static int ewx_i2c_getclock(snd_i2c_bus_t *bus)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, bus->private_data, return -EIO);
+        return snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA) & ICE1712_EWX2496_SERIAL_CLOCK ? 1 : 0;
+}
+
+static int ewx_i2c_getdata(snd_i2c_bus_t *bus, int ack)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, bus->private_data, return -EIO);
+        int bit;
         /* set RW pin to low */
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~ICE1712_EWX2496_RW);
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, 0);
-        data = (snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA) & ICE1712_EWX2496_SERIAL_DATA) ? 1 : 0;
+        if (ack)
+                udelay(5);
+        bit = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA) & ICE1712_EWX2496_SERIAL_DATA ? 1 : 0;
         /* set RW pin to high */
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, ICE1712_EWX2496_RW);
-        return data;
-}
-
-static void ewx_i2c_read_prepare(ice1712_t *ice)
-{
-        /* set SCL - write, SDA - read */
-        ice->gpio_direction |= ICE1712_EWX2496_SERIAL_CLOCK;
-        ice->gpio_direction &= ~ICE1712_EWX2496_SERIAL_DATA;
+        /* reset write mask */
+        snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~ICE1712_EWX2496_SERIAL_CLOCK);
+        return bit;
+}
+
+static void ewx_i2c_start(snd_i2c_bus_t *bus)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, bus->private_data, return);
+        unsigned char mask;
+
+        save_gpio_status(ice, (unsigned char *)&bus->private_value);
+        /* set RW high */
+        mask = ICE1712_EWX2496_RW;
+        switch (ice->eeprom.subvendor) {
+        case ICE1712_SUBDEVICE_EWX2496:
+                mask |= ICE1712_EWX2496_AK4524_CS; /* CS high also */
+                break;
+        case ICE1712_SUBDEVICE_DMX6FIRE:
+                mask |= ICE1712_6FIRE_AK4524_CS_MASK; /* CS high also */
+                break;
+        }
+        snd_ice1712_gpio_write_bits(ice, mask, mask);
+}
+
+static void ewx_i2c_stop(snd_i2c_bus_t *bus)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, bus->private_data, return);
+        restore_gpio_status(ice, (unsigned char *)&bus->private_value);
+}
+
+static void ewx_i2c_direction(snd_i2c_bus_t *bus, int clock, int data)
+{
+        ice1712_t *ice = snd_magic_cast(ice1712_t, bus->private_data, return);
+        unsigned char mask = 0;
+
+        if (clock)
+                mask |= ICE1712_EWX2496_SERIAL_CLOCK; /* write SCL */
+        if (data)
+                mask |= ICE1712_EWX2496_SERIAL_DATA; /* write SDA */
+        ice->gpio_direction &= ~(ICE1712_EWX2496_SERIAL_CLOCK|ICE1712_EWX2496_SERIAL_DATA);
+        ice->gpio_direction |= mask;
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_DIRECTION, ice->gpio_direction);
-        /* set write mask only to SCL */
-        snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~ICE1712_EWX2496_SERIAL_CLOCK);
-}
-
-static void ewx_i2c_read_post(ice1712_t *ice)
-{
-        /* reset direction both SDA and SCL to write */
-        ice->gpio_direction |= ICE1712_EWX2496_SERIAL_CLOCK|ICE1712_EWX2496_SERIAL_DATA;
-        snd_ice1712_write(ice, ICE1712_IREG_GPIO_DIRECTION, ice->gpio_direction);
-        snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~(ICE1712_EWX2496_SERIAL_CLOCK|ICE1712_EWX2496_SERIAL_DATA));
-}
-
-/* read a byte (and ack bit) */
-static unsigned char ewx_i2c_read(ice1712_t *ice)
-{
-        int i;
-        unsigned char data = 0;
-
-        for (i = 7; i >= 0; i--) {
-                ewx_i2c_set(ice, 1, 0);
-                data |= ewx_i2c_read_bit(ice) << i;
-                /* reset write mask */
-                snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,
-                                  ~ICE1712_EWX2496_SERIAL_CLOCK);
-                ewx_i2c_set(ice, 0, 0);
-        }
-        /* reset write mask */
-        ewx_i2c_read_post(ice);
-        ewx_i2c_send(ice, 1); /* ack */
-        return data;
-}
-
-
-/*
- * CS8427 on EWX 24/96; Address 0x20
- */
-/* write a register */
-static void snd_ice1712_ewx_cs8427_write(ice1712_t *ice, unsigned char reg, unsigned char data)
-{
-        unsigned char saved[2];
-
-        save_gpio_status(ice, saved);
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, 0x20);  /* address + write */
-        ewx_i2c_write(ice, reg); /* MAP */
-        ewx_i2c_write(ice, data);
-        ewx_i2c_stop(ice);
-        restore_gpio_status(ice, saved);
-}
-
-/* sequential write */
-static void snd_ice1712_ewx_cs8427_write_bytes(ice1712_t *ice, unsigned char reg, int bytes, unsigned char *data)
-{
-        unsigned char saved[2];
-
-        save_gpio_status(ice, saved);
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, 0x20);  /* address + write */
-        ewx_i2c_write(ice, reg | 0x80); /* MAP incremental mode */
-        while (bytes-- > 0)
-                ewx_i2c_write(ice, *data++);
-        ewx_i2c_stop(ice);
-        restore_gpio_status(ice, saved);
-}
-
-/* read a register */
-static unsigned char snd_ice1712_ewx_cs8427_read(ice1712_t *ice, unsigned char reg)
-{
-        unsigned char saved[2];
-        unsigned char data;
-
-        save_gpio_status(ice, saved);
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, 0x20);  /* address + write */
-        ewx_i2c_write(ice, reg); /* MAP */
-        /* we set up the address first but without data */
-        ewx_i2c_stop(ice);
-
-        /* now read */
-        ewx_i2c_start(ice);
-        ewx_i2c_write(ice, 0x21);  /* address + read */
-        ewx_i2c_read_prepare(ice);
-        data = ewx_i2c_read(ice);
-        ewx_i2c_read_post(ice);
-        ewx_i2c_stop(ice);
-
-        restore_gpio_status(ice, saved);
-        return data;
-}
-
-/* sequential read  */
-static void snd_ice1712_ewx_cs8427_read_bytes(ice1712_t *ice, unsigned char reg, int bytes, unsigned char *data)
-{
-#if 0 // the sequential read seems not working (yet)..
-        unsigned char saved[2];
-
-        save_gpio_status(ice, saved);
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, 0x20);  /* address + write */
-        ewx_i2c_write(ice, reg | 0x80); /* MAP incremental mode */
-        /* we set up the address first but without data */
-        ewx_i2c_stop(ice);
-
-        /* now read */
-        ewx_i2c_start(ice);
-        ewx_i2c_write(ice, 0x21);  /* address + read */
-        ewx_i2c_read_prepare(ice);
-        while (bytes-- > 0)
-                *data++ = ewx_i2c_read(ice);
-        ewx_i2c_read_post(ice);
-        ewx_i2c_stop(ice);
-        restore_gpio_status(ice, saved);
-#else
-        while (bytes-- > 0)
-                *data++ = snd_ice1712_ewx_cs8427_read(ice, reg++); 
-#endif
+        snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~mask);
 }
 
 #ifdef TARGET_OS2
-static ice1712_cs8427_ops_t snd_ice1712_ewx_cs8427_ops = {
-        snd_ice1712_ewx_cs8427_write,
-        snd_ice1712_ewx_cs8427_read,
-        snd_ice1712_ewx_cs8427_write_bytes,
-        snd_ice1712_ewx_cs8427_read_bytes,
+static snd_i2c_bit_ops_t snd_ice1712_ewx_cs8427_bit_ops = {
+        ewx_i2c_start,
+        ewx_i2c_stop,
+        ewx_i2c_direction,
+        ewx_i2c_setlines,
+        ewx_i2c_getclock,
+        ewx_i2c_getdata,
 };
 #else
-static ice1712_cs8427_ops_t snd_ice1712_ewx_cs8427_ops = {
-        write: snd_ice1712_ewx_cs8427_write,
-        read: snd_ice1712_ewx_cs8427_read,
-        write_bytes: snd_ice1712_ewx_cs8427_write_bytes,
-        read_bytes: snd_ice1712_ewx_cs8427_read_bytes,
+static snd_i2c_bit_ops_t snd_ice1712_ewx_cs8427_bit_ops = {
+        start: ewx_i2c_start,
+        stop: ewx_i2c_stop,
+        direction: ewx_i2c_direction,
+        setlines: ewx_i2c_setlines,
+        getclock: ewx_i2c_getclock,
+        getdata: ewx_i2c_getdata,
 };
 #endif
 
-/*
- * PCF8574 on EWS88MT
- */
-static void snd_ice1712_ews88mt_pcf8574_write(ice1712_t *ice, unsigned char addr, unsigned char data)
-{
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, addr); /* address + write */
-        ewx_i2c_write(ice, data);
-        ewx_i2c_stop(ice);
-}
-
-static unsigned char snd_ice1712_ews88mt_pcf8574_read(ice1712_t *ice, unsigned char addr)
-{
-        unsigned char data;
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, addr | 0x01);  /* address + read */
-        ewx_i2c_read_prepare(ice);
-        data = ewx_i2c_read(ice);
-        ewx_i2c_read_post(ice);
-        ewx_i2c_stop(ice);
-        return data;
-}
-
 /* AK4524 chip select; address 0x48 bit 0-3 */
 static void snd_ice1712_ews88mt_chip_select(ice1712_t *ice, int chip_mask)
@@ -1242 +993 @@
 
         snd_assert(chip_mask >= 0 && chip_mask <= 0x0f, return);
-        data = snd_ice1712_ews88mt_pcf8574_read(ice, ICE1712_EWS88MT_OUTPUT_ADDR);
+        snd_i2c_lock(ice->i2c);
+        snd_runtime_check(snd_i2c_readbytes(ice->pcf8574[1], &data, 1) == 1, snd_i2c_unlock(ice->i2c); return);
         ndata = (data & 0xf0) | chip_mask;
         if (ndata != data)
-                snd_ice1712_ews88mt_pcf8574_write(ice, ICE1712_EWS88MT_OUTPUT_ADDR, ndata);
-}
-
-
-/*
- * PCF8575 on EWS88D (16bit)
- */
-static void snd_ice1712_ews88d_pcf8575_write(ice1712_t *ice, unsigned char addr, unsigned short data)
-{
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, addr); /* address + write */
-        ewx_i2c_write(ice, data & 0xff);
-        ewx_i2c_write(ice, (data >> 8) & 0xff);
-        ewx_i2c_stop(ice);
-}
-
-static unsigned short snd_ice1712_ews88d_pcf8575_read(ice1712_t *ice, unsigned char addr)
-{
-        unsigned short data;
-        ewx_i2c_write_prepare(ice);
-        ewx_i2c_write(ice, addr | 0x01);  /* address + read */
-        ewx_i2c_read_prepare(ice);
-        data = ewx_i2c_read(ice);
-        data |= (unsigned short)ewx_i2c_read(ice) << 8;
-        //printk("pcf: read = 0x%x\n", data);
-        ewx_i2c_read_post(ice);
-        ewx_i2c_stop(ice);
-        return data;
+                snd_runtime_check(snd_i2c_sendbytes(ice->pcf8574[1], &ndata, 1) == 1, snd_i2c_unlock(ice->i2c); return);
+        snd_i2c_unlock(ice->i2c);
 }
 
@@ -1286 +1012 @@
         unsigned int addrdata;
 
-        snd_assert(chip >=0 && chip < 4, return);
+        snd_assert(chip >= 0 && chip < 4, return);
+
         if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_EWS88MT) {
                 /* assert AK4524 CS */
@@ -1327 +1054 @@
                                   ~(data_mask | clk_mask |
                                     codecs_mask | ICE1712_EWS88_RW));
+                cif = 1; /* CIF high */
+                break;
+        case ICE1712_SUBDEVICE_DMX6FIRE:
+                data_mask = ICE1712_6FIRE_SERIAL_DATA;
+                clk_mask = ICE1712_6FIRE_SERIAL_CLOCK;
+                codecs_mask = (1 << chip) & ICE1712_6FIRE_AK4524_CS_MASK;
+                tmp |= ICE1712_6FIRE_RW; /* set rw bit high */
+                snd_ice1712_write(ice, ICE1712_IREG_GPIO_DIRECTION,
+                                  ice->gpio_direction | data_mask | clk_mask |
+                                  codecs_mask | ICE1712_6FIRE_RW);
+                snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,
+                                  ~(data_mask | clk_mask |
+                                    codecs_mask | ICE1712_6FIRE_RW));
                 cif = 1; /* CIF high */
                 break;
@@ -1360 +1100 @@
 
         if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_EWS88MT) {
+                restore_gpio_status(ice, saved);
                 //snd_ice1712_ews88mt_chip_select(ice, ~(1 << chip) & 0x0f);
                 udelay(1);
@@ -1373 +1114 @@
                 snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);
                 udelay(1);
-        }
-
+                restore_gpio_status(ice, saved);
+        }
+
+        if ((addr != 0x04 && addr != 0x05) || (data & 0x80) == 0)
         ice->ak4524_images[chip][addr] = data;
-        restore_gpio_status(ice, saved);
-}
-
-
-/*
- * decode/encode channel status bits from CS8404A on EWS88MT&D
- */
-static void snd_ice1712_ews_decode_cs8404_spdif_bits(snd_aes_iec958_t *diga,
-                                                     unsigned char bits)
-{
-        if (bits & 0x10) {      /* consumer */
-                if (!(bits & 0x20))
-                        diga->status[0] |= IEC958_AES0_CON_NOT_COPYRIGHT;
-                if (!(bits & 0x40))
-                        diga->status[0] |= IEC958_AES0_CON_EMPHASIS_5015;
-                if (!(bits & 0x80))
-                        diga->status[1] |= IEC958_AES1_CON_ORIGINAL;
-                switch (bits & 0x03) {
-                case 0x00: diga->status[1] |= IEC958_AES1_CON_DAT; break;
-                case 0x03: diga->status[1] |= IEC958_AES1_CON_GENERAL; break;
-                }
-                switch (bits & 0x06) {
-                case 0x02: diga->status[3] |= IEC958_AES3_CON_FS_32000; break;
-                case 0x04: diga->status[3] |= IEC958_AES3_CON_FS_48000; break;
-                case 0x06: diga->status[3] |= IEC958_AES3_CON_FS_44100; break;
-                }
-        } else {
-                diga->status[0] = IEC958_AES0_PROFESSIONAL;
-                if (!(bits & 0x04))
-                        diga->status[0] |= IEC958_AES0_NONAUDIO;
-                switch (bits & 0x60) {
-                case 0x00: diga->status[0] |= IEC958_AES0_PRO_FS_32000; break;
-                case 0x40: diga->status[0] |= IEC958_AES0_PRO_FS_44100; break;
-                case 0x20: diga->status[0] |= IEC958_AES0_PRO_FS_48000; break;
-                case 0x60: diga->status[0] |= IEC958_AES0_PRO_FS_NOTID; break;
-                }
-                switch (bits & 0x03) {
-                case 0x02: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_NONE; break;
-                case 0x01: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_5015; break;
-                case 0x00: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_CCITT; break;
-                case 0x03: diga->status[0] |= IEC958_AES0_PRO_EMPHASIS_NOTID; break;
-                }
-                if (!(bits & 0x80))
-                        diga->status[1] |= IEC958_AES1_PRO_MODE_STEREOPHONIC;
-        }
-}
-
-static unsigned char snd_ice1712_ews_encode_cs8404_spdif_bits(snd_aes_iec958_t *diga)
-{
-        unsigned char bits;
-
-        if (!(diga->status[0] & IEC958_AES0_PROFESSIONAL)) {
-                bits = 0x10;    /* consumer mode */
-                if (!(diga->status[0] & IEC958_AES0_CON_NOT_COPYRIGHT))
-                        bits |= 0x20;
-                if ((diga->status[0] & IEC958_AES0_CON_EMPHASIS) == IEC958_AES0_CON_EMPHASIS_NONE)
-                        bits |= 0x40;
-                if (!(diga->status[1] & IEC958_AES1_CON_ORIGINAL))
-                        bits |= 0x80;
-                if ((diga->status[1] & IEC958_AES1_CON_CATEGORY) == IEC958_AES1_CON_GENERAL)
-                        bits |= 0x03;
-                switch (diga->status[3] & IEC958_AES3_CON_FS) {
-                default:
-                case IEC958_AES3_CON_FS_44100: bits |= 0x06; break;
-                case IEC958_AES3_CON_FS_48000: bits |= 0x04; break;
-                case IEC958_AES3_CON_FS_32000: bits |= 0x02; break;
-                }
-        } else {
-                bits = 0x00;    /* professional mode */
-                if (!(diga->status[0] & IEC958_AES0_NONAUDIO))
-                        bits |= 0x04;
-                switch (diga->status[0] & IEC958_AES0_PRO_FS) {
-                case IEC958_AES0_PRO_FS_32000:  bits |= 0x00; break;
-                case IEC958_AES0_PRO_FS_44100:  bits |= 0x40; break;    /* 44.1kHz */
-                case IEC958_AES0_PRO_FS_48000:  bits |= 0x20; break;    /* 48kHz */
-                default:
-                case IEC958_AES0_PRO_FS_NOTID:  bits |= 0x00; break;
-                }
-                switch (diga->status[0] & IEC958_AES0_PRO_EMPHASIS) {
-                case IEC958_AES0_PRO_EMPHASIS_NONE: bits |= 0x02; break;
-                case IEC958_AES0_PRO_EMPHASIS_5015: bits |= 0x01; break;
-                case IEC958_AES0_PRO_EMPHASIS_CCITT: bits |= 0x00; break;
-                default:
-                case IEC958_AES0_PRO_EMPHASIS_NOTID: bits |= 0x03; break;
-                }
-                switch (diga->status[1] & IEC958_AES1_PRO_MODE) {
-                case IEC958_AES1_PRO_MODE_TWO:
-                case IEC958_AES1_PRO_MODE_STEREOPHONIC: bits |= 0x00; break;
-                default: bits |= 0x80; break;
-                }
-        }
-        return bits;
-}
-
-/* write on i2c address 0x40 */
+        else
+                ice->ak4524_ipga_gain[chip][addr-4] = data;
+}
+
+static void snd_ice1712_ak4524_reset(ice1712_t *ice, int state)
+{
+        int chip;
+        unsigned char reg;
+        
+        for (chip = 0; chip < ice->num_dacs/2; chip++) {
+                snd_ice1712_ak4524_write(ice, chip, 0x01, state ? 0x00 : 0x03);
+                if (state)
+                        continue;
+                for (reg = 0x04; reg < (ice->ak4528 ? 0x06 : 0x08); reg++)
+                        snd_ice1712_ak4524_write(ice, chip, reg, ice->ak4524_images[chip][reg]);
+                if (ice->ak4528)
+                        continue;
+                for (reg = 0x04; reg < 0x06; reg++)
+                        snd_ice1712_ak4524_write(ice, chip, reg, ice->ak4524_ipga_gain[chip][reg-4]);
+        }
+}
+
 static void snd_ice1712_ews_cs8404_spdif_write(ice1712_t *ice, unsigned char bits)
 {
-        unsigned short val, nval;
-
+        unsigned char bytes[2];
+
+        snd_i2c_lock(ice->i2c);
         switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_EWS88MT:
-                snd_ice1712_ews88mt_pcf8574_write(ice, ICE1712_EWS88MT_CS8404_ADDR, bits);
+                snd_runtime_check(snd_i2c_sendbytes(ice->cs8404, &bits, 1) == 1, snd_i2c_unlock(ice->i2c); return);
                 break;
         case ICE1712_SUBDEVICE_EWS88D:
-                val = snd_ice1712_ews88d_pcf8575_read(ice, ICE1712_EWS88D_PCF_ADDR);
-                nval = val & 0xff;
-                nval |= bits << 8;
-                if (val != nval)
-                        snd_ice1712_ews88d_pcf8575_write(ice, ICE1712_EWS88D_PCF_ADDR, nval);
-                break;
-        }
+                snd_runtime_check(snd_i2c_readbytes(ice->pcf8575, bytes, 2) == 2, snd_i2c_unlock(ice->i2c); return);
+                if (bits != bytes[1]) {
+                        bytes[1] = bits;
+                        snd_runtime_check(snd_i2c_readbytes(ice->pcf8575, bytes, 2) == 2, snd_i2c_unlock(ice->i2c); return);
+                }
+                break;
+        }
+        snd_i2c_unlock(ice->i2c);
 }
 
@@ -1496 +1168 @@
 static int snd_ice1712_cs8427_set_input_clock(ice1712_t *ice, int spdif_clock)
 {
+        unsigned char reg[2] = { 0x80 | 4, 0 };   /* CS8427 auto increment | register number 4 + data */
         unsigned char val, nval;
-        val = ice->cs8427_ops->read(ice, 4);
+        snd_i2c_lock(ice->i2c);
+        if (snd_i2c_sendbytes(ice->cs8427, reg, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        if (snd_i2c_readbytes(ice->cs8427, &val, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
         nval = val & 0xf0;
         if (spdif_clock)
@@ -1504 +1185 @@
                 nval |= 0x04;
         if (val != nval) {
-                ice->cs8427_ops->write(ice, 4, nval);
+                if (snd_i2c_sendbytes(ice->cs8427, reg, 2) != 2) {
+                        snd_i2c_unlock(ice->i2c);
+                        return -EREMOTE;
+                }
                 return 1;
         }
-        return 0;
-}
-
-#if 0 // we change clock selection automatically according to the ice1712 clock source
-static int snd_ice1712_cs8427_clock_select_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
-
-static int snd_ice1712_cs8427_clock_select_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-        int val;
-        val = ice->cs8427_ops->read(ice, 4);
-        ucontrol->value.integer.value[0] = (val & 0x01) ? 1 : 0;
-        return 0;
-}
-
-static int snd_ice1712_cs8427_clock_select_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-        return snd_ice1712_cs8427_set_input_clock(ice, ucontrol->value.integer.value[0]);
-}
-
-static snd_kcontrol_new_t snd_ice1712_cs8427_clock_select = {
-        iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-        name: "CS8427 Clock Select",
-        info: snd_ice1712_cs8427_clock_select_info,
-        get: snd_ice1712_cs8427_clock_select_get,
-        put: snd_ice1712_cs8427_clock_select_put,
-};
-#endif
-
-
-/*
- */
-static int snd_ice1712_cs8427_in_status_info(snd_kcontrol_t *kcontrol,
-                                             snd_ctl_elem_info_t *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 255;
-        return 0;
-}
-
-static int snd_ice1712_cs8427_in_status_get(snd_kcontrol_t *kcontrol,
-                                            snd_ctl_elem_value_t *ucontrol)
-{
-        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-        ucontrol->value.integer.value[0] = ice->cs8427_ops->read(ice, 15);
-        return 0;
-}
-
-static snd_kcontrol_new_t snd_ice1712_cs8427_in_status = {
-#ifdef TARGET_OS2
-        SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-        "IEC958 Input Status",0,
-        SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-        snd_ice1712_cs8427_in_status_info,
-        snd_ice1712_cs8427_in_status_get,0,0
-#else
-        iface: SNDRV_CTL_ELEM_IFACE_PCM,
-        info: snd_ice1712_cs8427_in_status_info,
-        name: "IEC958 Input Status",
-        access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-        get: snd_ice1712_cs8427_in_status_get,
-#endif
-};
-
+        snd_i2c_unlock(ice->i2c);
+        return 0;
+}
 
 /*
@@ -1624 +1237 @@
         case ICE1712_SUBDEVICE_DELTA44:
         case ICE1712_SUBDEVICE_AUDIOPHILE:
-                /* FIXME: we should put AK452x codecs to reset state
-                   when this bit is being changed */
                 spin_unlock_irqrestore(&ice->reg_lock, flags);
+                snd_ice1712_ak4524_reset(ice, 1);
                 down(&ice->gpio_mutex);
                 tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);
@@ -1636 +1248 @@
                 snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);
                 up(&ice->gpio_mutex);
+                snd_ice1712_ak4524_reset(ice, 0);
                 return;
         }
@@ -2197 +1810 @@
 #endif
 
-static void __exit snd_ice1712_pcm_free(snd_pcm_t *pcm)
+static void snd_ice1712_pcm_free(snd_pcm_t *pcm)
 {
         ice1712_t *ice = snd_magic_cast(ice1712_t, pcm->private_data, return);
@@ -2204 +1817 @@
 }
 
-static int __init snd_ice1712_pcm(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
+static int __devinit snd_ice1712_pcm(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -2229 +1842 @@
                 *rpcm = pcm;
 
-        printk("Consumer PCM code does not work well at the moment --jk\n");
-
-        return 0;
-}
-
-static void __exit snd_ice1712_pcm_free_ds(snd_pcm_t *pcm)
+        printk(KERN_WARNING "Consumer PCM code does not work well at the moment --jk\n");
+
+        return 0;
+}
+
+static void snd_ice1712_pcm_free_ds(snd_pcm_t *pcm)
 {
         ice1712_t *ice = snd_magic_cast(ice1712_t, pcm->private_data, return);
@@ -2241 +1854 @@
 }
 
-static int __init snd_ice1712_pcm_ds(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
+static int __devinit snd_ice1712_pcm_ds(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -2384 +1997 @@
 }
 
-static void snd_ice1712_cs8427_set_status(ice1712_t *ice, snd_pcm_runtime_t *runtime,
-                                          unsigned char *status)
-{
-        if (status[0] & IEC958_AES0_PROFESSIONAL) {
-                status[0] &= ~IEC958_AES0_PRO_FS;
-                switch (runtime->rate) {
-                case 32000: status[0] |= IEC958_AES0_PRO_FS_32000; break;
-                case 44100: status[0] |= IEC958_AES0_PRO_FS_44100; break;
-                case 48000: status[0] |= IEC958_AES0_PRO_FS_48000; break;
-                default: status[0] |= IEC958_AES0_PRO_FS_NOTID; break;
-                }
-        } else {
-                status[3] &= ~IEC958_AES3_CON_FS;
-                switch (runtime->rate) {
-                case 32000: status[3] |= IEC958_AES3_CON_FS_32000; break;
-                case 44100: status[3] |= IEC958_AES3_CON_FS_44100; break;
-                case 48000: status[3] |= IEC958_AES3_CON_FS_48000; break;
-                }
-        }
-}
-
 static int snd_ice1712_playback_pro_prepare(snd_pcm_substream_t * substream)
 {
@@ -2410 +2002 @@
         ice1712_t *ice = snd_pcm_substream_chip(substream);
         unsigned int tmp;
-        unsigned char tmpst[5];
         int change;
 
@@ -2442 +2033 @@
         case ICE1712_SUBDEVICE_EWX2496:
         case ICE1712_SUBDEVICE_AUDIOPHILE:
-                /* setup S/PDIF */
-                memcpy(tmpst, ice->cs8427_spdif_stream_status, 5);
-                snd_ice1712_cs8427_set_status(ice, substream->runtime, tmpst); 
-                change = memcmp(tmpst, ice->cs8427_spdif_stream_status, 5) != 0;
-                memcpy(ice->cs8427_spdif_stream_status, tmpst, 5);
-                spin_unlock_irqrestore(&ice->reg_lock, flags);
-                if (change) {
-                        snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &ice->spdif_stream_ctl->id);
-                        ice->cs8427_ops->write_bytes(ice, 32, 5, tmpst);
-                }
-                return 0;
+                snd_cs8427_iec958_pcm(ice->cs8427, substream->runtime->rate);
+                break;
         case ICE1712_SUBDEVICE_EWS88MT:
         case ICE1712_SUBDEVICE_EWS88D:
@@ -2609 +2191 @@
 
         ice->cs8403_spdif_stream_bits = ice->cs8403_spdif_bits;
-        memcpy(ice->cs8427_spdif_stream_status, ice->cs8427_spdif_status, 5);
-        if (ice->spdif_stream_ctl != NULL) {
-                ice->spdif_stream_ctl->access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-                snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                               SNDRV_CTL_EVENT_MASK_INFO, &ice->spdif_stream_ctl->id);
-        }
+        if (ice->cs8427)
+                snd_cs8427_iec958_active(ice->cs8427, 1);
 
         return 0;
@@ -2637 +2215 @@
 
         ice->playback_pro_substream = NULL;
-
-        if (ice->spdif_stream_ctl != NULL) {
-                ice->spdif_stream_ctl->access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-                snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                               SNDRV_CTL_EVENT_MASK_INFO, &ice->spdif_stream_ctl->id);
-        }
+        if (ice->cs8427)
+                snd_cs8427_iec958_active(ice->cs8427, 0);
 
         return 0;
@@ -2655 +2229 @@
 }
 
-static void __exit snd_ice1712_pcm_profi_free(snd_pcm_t *pcm)
+static void snd_ice1712_pcm_profi_free(snd_pcm_t *pcm)
 {
         ice1712_t *ice = snd_magic_cast(ice1712_t, pcm->private_data, return);
@@ -2708 +2282 @@
 #endif
 
-static int __init snd_ice1712_pcm_profi(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
+static int __devinit snd_ice1712_pcm_profi(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -2733 +2307 @@
                 *rpcm = pcm;
         
+        if (ice->cs8427) {
+                /* assign channels to iec958 */
+                err = snd_cs8427_iec958_build(ice->cs8427,
+                                              pcm->streams[0].substream,
+                                              pcm->streams[1].substream);
+                if (err < 0)
+                        return err;
+        }
+
         if ((err = snd_ice1712_build_pro_mixer(ice)) < 0)
                 return err;
@@ -2858 +2441 @@
         unsigned char nval = ucontrol->value.integer.value[0];
         int change = ice->ak4524_images[chip][addr] != nval;
+        if (change)
+                snd_ice1712_ak4524_write(ice, chip, addr, nval);
+        return change;
+}
+
+static int snd_ice1712_ak4524_ipga_gain_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 36;
+        return 0;
+}
+
+static int snd_ice1712_ak4524_ipga_gain_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int chip = kcontrol->private_value / 8;
+        int addr = kcontrol->private_value % 8;
+        ucontrol->value.integer.value[0] = ice->ak4524_ipga_gain[chip][addr-4] & 0x7f;
+        return 0;
+}
+
+static int snd_ice1712_ak4524_ipga_gain_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int chip = kcontrol->private_value / 8;
+        int addr = kcontrol->private_value % 8;
+        unsigned char nval = (ucontrol->value.integer.value[0] % 37) | 0x80;
+        int change = ice->ak4524_ipga_gain[chip][addr] != nval;
         if (change)
                 snd_ice1712_ak4524_write(ice, chip, addr, nval);
@@ -2960 +2573 @@
         }
         
-        return 0;
-}
-
-static void /*__init*/ snd_ice1712_ac97_init(ac97_t *ac97)
+        /* initialize volumes */
+        for (idx = 0; idx < 20; idx++) {
+                ice->pro_volumes[idx] = 0x80008000;     /* mute */
+                snd_ice1712_update_volume(ice, idx);
+        }
+        return 0;
+}
+
+static void snd_ice1712_ac97_init(ac97_t *ac97)
 {
         // ice1712_t *ice = snd_magic_cast(ice1712_t, ac97->private_data, return);
@@ -2971 +2589 @@
 }
 
-static void __exit snd_ice1712_mixer_free_ac97(ac97_t *ac97)
+static void snd_ice1712_mixer_free_ac97(ac97_t *ac97)
 {
         ice1712_t *ice = snd_magic_cast(ice1712_t, ac97->private_data, return);
@@ -2977 +2595 @@
 }
 
-static int __init snd_ice1712_ac97_mixer(ice1712_t * ice)
+static int __devinit snd_ice1712_ac97_mixer(ice1712_t * ice)
 {
         int err;
@@ -2989 +2607 @@
                 ac97.private_data = ice;
                 ac97.private_free = snd_ice1712_mixer_free_ac97;
-                if ((err = snd_ac97_mixer(ice->card, &ac97, &ice->ac97)) < 0)
+                if ((err = snd_ac97_mixer(ice->card, &ac97, &ice->ac97)) < 0) {
+                        printk(KERN_WARNING "ice1712: cannot initialize ac97 for consumer, skipped\n");
+                        // return err;
+                } else {
+                if ((err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97, ice))) < 0)
                         return err;
+                }
                 return 0;
         }
@@ -3003 +2626 @@
                 ac97.private_free = snd_ice1712_mixer_free_ac97;
                 if ((err = snd_ac97_mixer(ice->card, &ac97, &ice->ac97)) < 0)
-                        return err;
-                if ((err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97, ice))) < 0)
                         return err;
                 return 0;
@@ -3047 +2668 @@
 }
 
-static void __init snd_ice1712_proc_init(ice1712_t * ice)
+static void __devinit snd_ice1712_proc_init(ice1712_t * ice)
 {
         snd_info_entry_t *entry;
@@ -3092 +2713 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_eeprom = {
+static snd_kcontrol_new_t snd_ice1712_eeprom __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_CARD,0,0,
@@ -3126 +2747 @@
         case ICE1712_SUBDEVICE_DELTADIO2496:
         case ICE1712_SUBDEVICE_DELTA66:
-                snd_ice1712_decode_cs8403_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_bits);
-                break;
-        case ICE1712_SUBDEVICE_AUDIOPHILE:
-        case ICE1712_SUBDEVICE_EWX2496:
-                memcpy(ucontrol->value.iec958.status, ice->cs8427_spdif_status, 5);
+                snd_cs8403_decode_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_bits);
                 break;
         case ICE1712_SUBDEVICE_EWS88MT:
         case ICE1712_SUBDEVICE_EWS88D:
-                snd_ice1712_ews_decode_cs8404_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_bits);
+                snd_cs8404_decode_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_bits);
                 break;
         }
@@ -3152 +2769 @@
         case ICE1712_SUBDEVICE_DELTADIO2496:
         case ICE1712_SUBDEVICE_DELTA66:
-                val = snd_ice1712_encode_cs8403_spdif_bits(&ucontrol->value.iec958);
+                val = snd_cs8403_encode_spdif_bits(&ucontrol->value.iec958);
                 spin_lock_irqsave(&ice->reg_lock, flags);
                 change = ice->cs8403_spdif_bits != val;
@@ -3163 +2780 @@
                 }
                 break;
-        case ICE1712_SUBDEVICE_AUDIOPHILE:
-        case ICE1712_SUBDEVICE_EWX2496:
-                spin_lock_irqsave(&ice->reg_lock, flags);
-                change = memcmp(ucontrol->value.iec958.status, ice->cs8427_spdif_status, 5) != 0;
-                memcpy(ice->cs8427_spdif_status, ucontrol->value.iec958.status, 5);
-                if (change && ice->playback_pro_substream == NULL) {
-                        spin_unlock_irqrestore(&ice->reg_lock, flags);
-                        ice->cs8427_ops->write_bytes(ice, 32, 5, ice->cs8427_spdif_status);
-                } else
-                        spin_unlock_irqrestore(&ice->reg_lock, flags);
-                break;
         case ICE1712_SUBDEVICE_EWS88MT:
         case ICE1712_SUBDEVICE_EWS88D:
-                val = snd_ice1712_ews_encode_cs8404_spdif_bits(&ucontrol->value.iec958);
+                val = snd_cs8404_encode_spdif_bits(&ucontrol->value.iec958);
                 spin_lock_irqsave(&ice->reg_lock, flags);
                 change = ice->cs8403_spdif_bits != val;
@@ -3193 +2799 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_spdif_default =
+static snd_kcontrol_new_t snd_ice1712_spdif_default __devinitdata =
 {
 #ifdef TARGET_OS2
@@ -3277 +2883 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_spdif_maskc =
+static snd_kcontrol_new_t snd_ice1712_spdif_maskc __devinitdata =
 {
 #ifdef TARGET_OS2
@@ -3294 +2900 @@
 };
 
-static snd_kcontrol_new_t snd_ice1712_spdif_maskp =
+static snd_kcontrol_new_t snd_ice1712_spdif_maskp __devinitdata =
 {
 #ifdef TARGET_OS2
@@ -3327 +2933 @@
         case ICE1712_SUBDEVICE_DELTADIO2496:
         case ICE1712_SUBDEVICE_DELTA66:
-                snd_ice1712_decode_cs8403_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_stream_bits);
-                break;
-        case ICE1712_SUBDEVICE_AUDIOPHILE:
-        case ICE1712_SUBDEVICE_EWX2496:
-                //ice->cs8427_ops->read_bytes(ice, 32, 5, ucontrol->value.iec958.status);
-                memcpy(ucontrol->value.iec958.status, ice->cs8427_spdif_stream_status, 5);
+                snd_cs8403_decode_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_stream_bits);
                 break;
         case ICE1712_SUBDEVICE_EWS88MT:
         case ICE1712_SUBDEVICE_EWS88D:
-                snd_ice1712_ews_decode_cs8404_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_stream_bits);
+                snd_cs8404_decode_spdif_bits(&ucontrol->value.iec958, ice->cs8403_spdif_stream_bits);
                 break;
         }
@@ -3354 +2955 @@
         case ICE1712_SUBDEVICE_DELTADIO2496:
         case ICE1712_SUBDEVICE_DELTA66:
-                val = snd_ice1712_encode_cs8403_spdif_bits(&ucontrol->value.iec958);
+                val = snd_cs8403_encode_spdif_bits(&ucontrol->value.iec958);
                 spin_lock_irqsave(&ice->reg_lock, flags);
                 change = ice->cs8403_spdif_stream_bits != val;
@@ -3365 +2966 @@
                 }
                 break;
-        case ICE1712_SUBDEVICE_AUDIOPHILE:
-        case ICE1712_SUBDEVICE_EWX2496:
-                spin_lock_irqsave(&ice->reg_lock, flags);
-                change = memcmp(ice->cs8427_spdif_stream_status,
-                                ucontrol->value.iec958.status, 5) != 0;
-                if (change && ice->playback_pro_substream != NULL) {
-                        memcpy(ice->cs8427_spdif_stream_status,
-                               ucontrol->value.iec958.status, 5);
-                        spin_unlock_irqrestore(&ice->reg_lock, flags);
-                        ice->cs8427_ops->write_bytes(ice, 32, 5, ucontrol->value.iec958.status);
-                } else
-                        spin_unlock_irqrestore(&ice->reg_lock, flags);
-                break;
         case ICE1712_SUBDEVICE_EWS88MT:
         case ICE1712_SUBDEVICE_EWS88D:
-                val = snd_ice1712_ews_encode_cs8404_spdif_bits(&ucontrol->value.iec958);
+                val = snd_cs8404_encode_spdif_bits(&ucontrol->value.iec958);
                 spin_lock_irqsave(&ice->reg_lock, flags);
                 change = ice->cs8403_spdif_stream_bits != val;
@@ -3397 +2985 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_spdif_stream =
+static snd_kcontrol_new_t snd_ice1712_spdif_stream __devinitdata =
 {
 #ifdef TARGET_OS2
@@ -3417 +3005 @@
 
 #ifdef TARGET_OS2
-#define ICE1712_GPIO(xiface, xname, xindex, shift, xaccess) \
+#define ICE1712_GPIO(xiface, xname, xindex, mask, invert, xaccess) \
 { xiface, 0, 0, xname, 0, xaccess, snd_ice1712_gpio_info, \
   snd_ice1712_gpio_get, snd_ice1712_gpio_put, \
-  shift }
+        mask | (invert << 24) }
 #else
-#define ICE1712_GPIO(xiface, xname, xindex, shift, xaccess) \
+#define ICE1712_GPIO(xiface, xname, xindex, mask, invert, xaccess) \
 { iface: xiface, name: xname, access: xaccess, info: snd_ice1712_gpio_info, \
   get: snd_ice1712_gpio_get, put: snd_ice1712_gpio_put, \
-  private_value: shift }
+  private_value: mask | (invert << 24) }
 #endif
 
@@ -3441 +3029 @@
         ice1712_t *ice = snd_kcontrol_chip(kcontrol);
         unsigned char mask = kcontrol->private_value & 0xff;
+        int invert = (kcontrol->private_value & (1<<24)) ? 1 : 0;
         unsigned char saved[2];
         
         save_gpio_status(ice, saved);
-        ucontrol->value.integer.value[0] = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA) & mask ? 1 : 0;
+        ucontrol->value.integer.value[0] = (snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA) & mask ? 1 : 0) ^ invert;
         restore_gpio_status(ice, saved);
         return 0;
@@ -3453 +3042 @@
         ice1712_t *ice = snd_kcontrol_chip(kcontrol);
         unsigned char mask = kcontrol->private_value & 0xff;
+        int invert = (kcontrol->private_value & (1<<24)) ? mask : 0;
         unsigned char saved[2];
         int val, nval;
@@ -3458 +3048 @@
         if (kcontrol->private_value & (1 << 31))
                 return -EPERM;
-        nval = ucontrol->value.integer.value[0] ? mask : 0;
+        nval = (ucontrol->value.integer.value[0] ? mask : 0) ^ invert;
         save_gpio_status(ice, saved);
         val = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);
@@ -3467 +3057 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_delta1010_wordclock_select =
-ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 0);
-static snd_kcontrol_new_t snd_ice1712_delta1010_wordclock_status =
-ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
-static snd_kcontrol_new_t snd_ice1712_deltadio2496_spdif_in_select =
-ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0);
-static snd_kcontrol_new_t snd_ice1712_delta_spdif_in_status =
-ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
+static snd_kcontrol_new_t snd_ice1712_delta1010_wordclock_select __devinitdata =
+ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0);
+static snd_kcontrol_new_t snd_ice1712_delta1010_wordclock_status __devinitdata =
+ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
+static snd_kcontrol_new_t snd_ice1712_deltadio2496_spdif_in_select __devinitdata =
+ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0);
+static snd_kcontrol_new_t snd_ice1712_delta_spdif_in_status __devinitdata =
+ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_PCM, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
 
 static int snd_ice1712_pro_spdif_master_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -3509 +3099 @@
         spin_unlock_irqrestore(&ice->reg_lock, flags);
 
-        if (ice->cs8427_ops) {
+        if (ice->cs8427) {
                 /* change CS8427 clock source too */
                 snd_ice1712_cs8427_set_input_clock(ice, ucontrol->value.integer.value[0]);
@@ -3517 +3107 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_pro_spdif_master = {
+static snd_kcontrol_new_t snd_ice1712_pro_spdif_master __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3563 +3153 @@
         val >>= ((idx % 2) * 8) + ((idx / 2) * 2);
         val &= 3;
-        cval = inw(ICEMT(ice, ROUTE_CAPTURE));
+        cval = inl(ICEMT(ice, ROUTE_CAPTURE));
         cval >>= ((idx / 2) * 8) + ((idx % 2) * 4);
         if (val == 1 && idx < 2)
@@ -3585 +3175 @@
         /* update PSDOUT */
         if (ucontrol->value.enumerated.item[0] >= 11)
-                nval = idx < 2 ? 1 : 0;
+                nval = idx < 2 ? 1 : 0; /* dig mixer (or pcm) */
         else if (ucontrol->value.enumerated.item[0] >= 9)
-                nval = 3;
+                nval = 3; /* spdif in */
         else if (ucontrol->value.enumerated.item[0] >= 1)
-                nval = 2;
+                nval = 2; /* analog in */
         else
-                nval = 0;
+                nval = 0; /* pcm */
         shift = ((idx % 2) * 8) + ((idx / 2) * 2);
         val = old_val = inw(ICEMT(ice, ROUTE_PSDOUT03));
@@ -3599 +3189 @@
         if (change)
                 outw(val, ICEMT(ice, ROUTE_PSDOUT03));
-        if (nval < 2)
+        if (nval < 2) /* dig mixer of pcm */
                 return change;
 
         /* update CAPTURE */
-        val = old_val = inw(ICEMT(ice, ROUTE_CAPTURE));
+        val = old_val = inl(ICEMT(ice, ROUTE_CAPTURE));
         shift = ((idx / 2) * 8) + ((idx % 2) * 4);
-        if (nval == 2) {
+        if (nval == 2) { /* analog in */
                 nval = ucontrol->value.enumerated.item[0] - 1;
                 val &= ~(0x07 << shift);
                 val |= nval << shift;
-        } else {
+        } else { /* spdif in */
                 nval = (ucontrol->value.enumerated.item[0] - 9) << 3;
                 val &= ~(0x08 << shift);
@@ -3616 +3206 @@
         if (val != old_val) {
                 change = 1;
-                outw(val, ICEMT(ice, ROUTE_CAPTURE));
+                outl(val, ICEMT(ice, ROUTE_CAPTURE));
         }
         return change;
@@ -3676 +3266 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_mixer_pro_analog_route = {
+static snd_kcontrol_new_t snd_ice1712_mixer_pro_analog_route __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3692 +3282 @@
 };
 
-static snd_kcontrol_new_t snd_ice1712_mixer_pro_spdif_route = {
+static snd_kcontrol_new_t snd_ice1712_mixer_pro_spdif_route __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3742 +3332 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_mixer_pro_volume_rate = {
+static snd_kcontrol_new_t snd_ice1712_mixer_pro_volume_rate __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3782 +3372 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_mixer_pro_peak = {
+static snd_kcontrol_new_t snd_ice1712_mixer_pro_peak __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3846 +3436 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_ewx_input_sense = {
+static snd_kcontrol_new_t snd_ice1712_ewx_input_sense __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3864 +3454 @@
 };
 
-static snd_kcontrol_new_t snd_ice1712_ewx_output_sense = {
+static snd_kcontrol_new_t snd_ice1712_ewx_output_sense __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3890 +3480 @@
 {
         ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-        unsigned char saved[2];
         unsigned char data;
 
-        save_gpio_status(ice, saved);
-        data = snd_ice1712_ews88mt_pcf8574_read(ice, ICE1712_EWS88MT_OUTPUT_ADDR);
-        restore_gpio_status(ice, saved);
+        snd_i2c_lock(ice->i2c);
+        if (snd_i2c_readbytes(ice->pcf8574[1], &data, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        snd_i2c_unlock(ice->i2c);
         ucontrol->value.enumerated.item[0] = data & ICE1712_EWS88MT_OUTPUT_SENSE ? 1 : 0; /* high = -10dBV, low = +4dBu */
         return 0;
@@ -3904 +3496 @@
 {
         ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-        unsigned char saved[2];
         unsigned char data, ndata;
 
-        save_gpio_status(ice, saved);
-        data = snd_ice1712_ews88mt_pcf8574_read(ice, ICE1712_EWS88MT_OUTPUT_ADDR);
+        snd_i2c_lock(ice->i2c);
+        if (snd_i2c_readbytes(ice->pcf8574[1], &data, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
         ndata = (data & ~ICE1712_EWS88MT_OUTPUT_SENSE) | (ucontrol->value.enumerated.item[0] ? ICE1712_EWS88MT_OUTPUT_SENSE : 0);
-        if (ndata != data)
-                snd_ice1712_ews88mt_pcf8574_write(ice, ICE1712_EWS88MT_OUTPUT_ADDR, ndata);
-        restore_gpio_status(ice, saved);
+        if (ndata != data && snd_i2c_sendbytes(ice->pcf8574[1], &ndata, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        snd_i2c_unlock(ice->i2c);
         return ndata != data;
-
 }
 
@@ -3922 +3517 @@
         ice1712_t *ice = snd_kcontrol_chip(kcontrol);
         int channel = kcontrol->id.index;
-        unsigned char saved[2];
         unsigned char data;
 
         snd_assert(channel >= 0 && channel <= 7, return 0);
-        save_gpio_status(ice, saved);
-        data = snd_ice1712_ews88mt_pcf8574_read(ice, ICE1712_EWS88MT_INPUT_ADDR);
-        restore_gpio_status(ice, saved);
+        snd_i2c_lock(ice->i2c);
+        if (snd_i2c_readbytes(ice->pcf8574[0], &data, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
         /* reversed; high = +4dBu, low = -10dBV */
         ucontrol->value.enumerated.item[0] = data & (1 << channel) ? 0 : 1;
@@ -3939 +3535 @@
         ice1712_t *ice = snd_kcontrol_chip(kcontrol);
         int channel = kcontrol->id.index;
-        unsigned char saved[2];
         unsigned char data, ndata;
 
         snd_assert(channel >= 0 && channel <= 7, return 0);
-        save_gpio_status(ice, saved);
-        data = snd_ice1712_ews88mt_pcf8574_read(ice, ICE1712_EWS88MT_INPUT_ADDR);
+        snd_i2c_lock(ice->i2c);
+        if (snd_i2c_readbytes(ice->pcf8574[0], &data, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
         ndata = (data & ~(1 << channel)) | (ucontrol->value.enumerated.item[0] ? 0 : (1 << channel));
-        if (ndata != data)
-                snd_ice1712_ews88mt_pcf8574_write(ice, ICE1712_EWS88MT_INPUT_ADDR, ndata);
-        restore_gpio_status(ice, saved);
+        if (ndata != data && snd_i2c_sendbytes(ice->pcf8574[0], &ndata, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        snd_i2c_unlock(ice->i2c);
         return ndata != data;
 }
 
-static snd_kcontrol_new_t snd_ice1712_ews88mt_input_sense = {
+static snd_kcontrol_new_t snd_ice1712_ews88mt_input_sense __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -3968 +3568 @@
 };
 
-static snd_kcontrol_new_t snd_ice1712_ews88mt_output_sense = {
+static snd_kcontrol_new_t snd_ice1712_ews88mt_output_sense __devinitdata = {
 #ifdef TARGET_OS2
         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
@@ -4003 +3603 @@
         int shift = kcontrol->private_value & 0xff;
         int invert = (kcontrol->private_value >> 8) & 1;
-        unsigned short data;
+        unsigned char data[2];
         
-        data = snd_ice1712_ews88d_pcf8575_read(ice, ICE1712_EWS88D_PCF_ADDR);
-        //printk("pcf: read 0x%x\n", data);
-        data = (data >> shift) & 0x01;
+        snd_i2c_lock(ice->i2c);
+        if (snd_i2c_readbytes(ice->pcf8575, data, 2) != 2) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        snd_i2c_unlock(ice->i2c);
+        data[0] = (data[shift >> 3] >> (shift & 7)) & 0x01;
         if (invert)
-                data ^= 0x01;
-        ucontrol->value.integer.value[0] = data;
+                data[0] ^= 0x01;
+        ucontrol->value.integer.value[0] = data[0];
         return 0;
 }
@@ -4019 +3623 @@
         int shift = kcontrol->private_value & 0xff;
         int invert = (kcontrol->private_value >> 8) & 1;
-        unsigned short data, ndata;
+        unsigned char data[2], ndata[2];
         int change;
 
-        data = snd_ice1712_ews88d_pcf8575_read(ice, ICE1712_EWS88D_PCF_ADDR);
-        ndata = data & ~(1 << shift);
+        snd_i2c_lock(ice->i2c);
+        if (snd_i2c_readbytes(ice->pcf8575, data, 2) != 2) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        ndata[shift >> 3] = data[shift >> 3] & ~(1 << (shift & 7));
         if (invert) {
                 if (! ucontrol->value.integer.value[0])
-                        ndata |= (1 << shift);
+                        ndata[shift >> 3] |= (1 << (shift & 7));
         } else {
                 if (ucontrol->value.integer.value[0])
-                        ndata |= (1 << shift);
-        }
-        change = (data != ndata);
-        if (change) {
-                ndata &= 0xff;
-                ndata |= (unsigned short)ice->cs8403_spdif_stream_bits << 8;
-                snd_ice1712_ews88d_pcf8575_write(ice, ICE1712_EWS88D_PCF_ADDR, ndata);
-                //printk("pcf: write 0x%x\n", ndata);
-        }
+                        ndata[shift >> 3] |= (1 << (shift & 7));
+        }
+        change = (data[shift >> 3] != ndata[shift >> 3]);
+        if (change && snd_i2c_sendbytes(ice->pcf8575, data, 2) != 2) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        snd_i2c_unlock(ice->i2c);
         return change;
 }
 
 #ifdef TARGET_OS2
-#define EWS88D_CONTROL(xiface, xname, xindex, xshift, xinvert, xaccess) \
+#define EWS88D_CONTROL(xiface, xname, xshift, xinvert, xaccess) \
 { xiface,0,0,\
   xname, 0,\
@@ -4052 +3659 @@
 }
 #else
-#define EWS88D_CONTROL(xiface, xname, xindex, xshift, xinvert, xaccess) \
+#define EWS88D_CONTROL(xiface, xname, xshift, xinvert, xaccess) \
 { iface: xiface,\
   name: xname,\
@@ -4063 +3670 @@
 #endif
 
-static snd_kcontrol_new_t snd_ice1712_ews88d_spdif_in_opt =
-EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, 0, 1, 0); /* inverted */
-static snd_kcontrol_new_t snd_ice1712_ews88d_opt_out_adat =
-EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Output Optical", 0, 1, 0, 0);
-static snd_kcontrol_new_t snd_ice1712_ews88d_master_adat =
-EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT External Master Clock", 0, 2, 0, 0);
-static snd_kcontrol_new_t snd_ice1712_ews88d_adat_enable =
-EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "Enable ADAT", 0, 3, 0, 0);
-static snd_kcontrol_new_t snd_ice1712_ews88d_adat_through =
-EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Through", 0, 4, 1, 0);
+static snd_kcontrol_new_t snd_ice1712_ews88d_controls[] __devinitdata = {
+        EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, 1, 0), /* inverted */
+        EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Output Optical", 1, 0, 0),
+        EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT External Master Clock", 2, 0, 0),
+        EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "Enable ADAT", 3, 0, 0),
+        EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Through", 4, 1, 0),
+};
+
+
+/*
+ * DMX 6Fire controls
+ */
+
+#if 0 // XXX not working yet
+static int snd_ice1712_6fire_read_pca(ice1712_t *ice)
+{
+        unsigned char byte;
+        snd_i2c_lock(ice->i2c);
+        byte = 0; /* read port */
+        snd_i2c_sendbytes(ice->pcf8575, &byte, 1);
+        if (snd_i2c_readbytes(ice->pcf8575, &byte, 1) != 1) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        snd_i2c_unlock(ice->i2c);
+        return byte;
+}
+
+static int snd_ice1712_6fire_write_pca(ice1712_t *ice, unsigned char data)
+{
+        unsigned char bytes[2];
+        snd_i2c_lock(ice->i2c);
+        bytes[0] = 1; /* write port */
+        bytes[1] = data;
+        if (snd_i2c_sendbytes(ice->pcf8575, bytes, 2) != 2) {
+                snd_i2c_unlock(ice->i2c);
+                return -EREMOTE;
+        }
+        snd_i2c_unlock(ice->i2c);
+        return 0;
+}
+
+static int snd_ice1712_6fire_control_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_ice1712_6fire_control_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int shift = kcontrol->private_value & 0xff;
+        int invert = (kcontrol->private_value >> 8) & 1;
+        int data;
+        
+        if ((data = snd_ice1712_6fire_read_pca(ice)) < 0)
+                return data;
+        data = (data >> shift) & 1;
+        if (invert)
+                data ^= 1;
+        ucontrol->value.integer.value[0] = data;
+        return 0;
+}
+
+static int snd_ice1712_6fire_control_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int shift = kcontrol->private_value & 0xff;
+        int invert = (kcontrol->private_value >> 8) & 1;
+        int data, ndata;
+        
+        if ((data = snd_ice1712_6fire_read_pca(ice)) < 0)
+                return data;
+        ndata = data & ~(1 << shift);
+        if (ucontrol->value.integer.value[0])
+                ndata |= (1 << shift);
+        if (invert)
+                ndata ^= (1 << shift);
+        if (data != ndata) {
+                snd_ice1712_6fire_write_pca(ice, (unsigned char)ndata);
+                return 1;
+        }
+        return 0;
+}
+
+#define DMX6FIRE_CONTROL(xiface, xname, xshift, xinvert, xaccess) \
+{ iface: xiface,\
+  name: xname,\
+  access: xaccess,\
+  info: snd_ice1712_6fire_control_info,\
+  get: snd_ice1712_6fire_control_get,\
+  put: snd_ice1712_6fire_control_put,\
+  private_value: xshift | (xinvert << 8),\
+}
+
+static snd_kcontrol_new_t snd_ice1712_6fire_led __devinitdata =
+DMX6FIRE_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "Breakbox LED", 6, 0, 0);
+
+#endif // XXX not working yet
 
 
@@ -4079 +3778 @@
  */
 
-static unsigned char __init snd_ice1712_read_i2c(ice1712_t *ice,
+static unsigned char __devinit snd_ice1712_read_i2c(ice1712_t *ice,
                                                  unsigned char dev,
                                                  unsigned char addr)
@@ -4091 +3790 @@
 }
 
-static int __init snd_ice1712_read_eeprom(ice1712_t *ice)
+static int __devinit snd_ice1712_read_eeprom(ice1712_t *ice)
 {
         int dev = 0xa0;         /* EEPROM device address */
@@ -4137 +3836 @@
 }
 
-static void __init snd_ice1712_ak4524_init(ice1712_t *ice)
-{
-        static unsigned char inits[8] = {
-                0x07, /* 0: all power up */
-                0x03, /* 1: ADC/DAC reset */
-                0x60, /* 2: 24bit I2S */
-                0x19, /* 3: deemphasis off */
-                0x00, /* 4: ADC left muted */
-                0x00, /* 5: ADC right muted */
-                0x00, /* 6: DAC left muted */
-                0x00, /* 7: DAC right muted */
+static void __devinit snd_ice1712_ak4524_init(ice1712_t *ice)
+{
+        static unsigned char inits[] = {
+                0x00, 0x07, /* 0: all power up */
+                0x01, 0x00, /* 1: ADC/DAC reset */
+                0x02, 0x60, /* 2: 24bit I2S */
+                0x03, 0x19, /* 3: deemphasis off */
+                0x01, 0x03, /* 1: ADC/DAC enable */
+                0x04, 0x00, /* 4: ADC left muted */
+                0x05, 0x00, /* 5: ADC right muted */
+                0x04, 0x80, /* 4: ADC IPGA gain 0dB */
+                0x05, 0x80, /* 5: ADC IPGA gain 0dB */
+                0x06, 0x00, /* 6: DAC left muted */
+                0x07, 0x00, /* 7: DAC right muted */
+                0xff, 0xff
         };
-        int chip;
-        unsigned char reg;
-
-        for (chip = 0; chip < ice->num_dacs/2; chip++) {
-                for (reg = 0; reg < 8; ++reg)
-                        snd_ice1712_ak4524_write(ice, chip, reg, inits[reg]);
-        }
-}
-
-/* init CS8427 transciever */
-static void __init snd_ice1712_cs8427_init(ice1712_t *ice)
-{
-        static unsigned char initvals[] = {
-                /* RMCK to OMCK, no validity, disable mutes, TCBL=output */
-                0x80,
-                /* hold last valid audio sample, RMCK=256*Fs, normal stereo operation */
-                0x00,
-                /* output drivers normal operation, Tx<=serial, Rx=>serial */
-                0x0c,
-                /* Run off, CMCK=256*Fs, output time base = OMCK, input time base =
-                   covered input clock, recovered input clock source is Envy24 */
-                0x04,
-                /* Serial audio input port data format = I2S */
-                0x05, /* SIDEL=1, SILRPOL=1 */
-                /* Serial audio output port data format = I2S */
-                0x05,   /* SODEL=1, SOLRPOL=1 */
-        };
-        unsigned char buf[32];
-
-        /* verify CS8427 ID */
-        if (ice->cs8427_ops->read(ice, 127) != 0x71) {
-                snd_printk("unable to find CS8427 signature, initialization is not completed\n");
-                return;
-        }
-        /* turn off run bit while making changes to configuration */
-        ice->cs8427_ops->write(ice, 4, 0x00);
-        /* send initial values */
-        ice->cs8427_ops->write_bytes(ice, 1, 6, initvals);
-        /* Turn off CS8427 interrupt stuff that is not used in hardware */
-        memset(buf, 0, sizeof(buf));
-        /* from address 9 to 15 */
-        ice->cs8427_ops->write_bytes(ice, 9, 7, buf);
-        /* unmask the input PLL clock, V, confidence, biphase, parity status bits */
-        //buf[0] = 0x1f;
-        buf[0] = 0;
-        /* Registers 32-55 window to CS buffer
-           Inhibit D->E transfers from overwriting first 5 bytes of CS data.
-           Allow D->E transfers (all) of CS data.
-           Allow E->F transfer of CS data.
-           One byte mode; both A/B channels get same written CB data.
-           A channel info is output to chip's EMPH* pin. */
-        buf[1] = 0x10;
-        /* Use internal buffer to transmit User (U) data.
-           Chip's U pin is an output.
-           Transmit all O's for user data. */
-        //buf[2] = 0x10;
-        buf[2] = 0x00;
-        ice->cs8427_ops->write_bytes(ice, 17, 3, buf);
-        /* turn on run bit and rock'n'roll */
-        ice->cs8427_ops->write(ice, 4, initvals[3] | 0x40);
-        /* write default channel status bytes */
-        ice->cs8427_ops->write_bytes(ice, 32, 5, ice->cs8427_spdif_status);
-
-        /*
-         * add controls..
-         */
-        snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_cs8427_in_status, ice));
-#if 0
-        snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_cs8427_clock_select, ice));
-#endif
-}
-
-static void __init snd_ice1712_stdsp24_gpio_write(ice1712_t *ice, unsigned char byte)
+        int chip, idx;
+        unsigned char *ptr, reg, data;
+
+        for (chip = idx = 0; chip < ice->num_dacs/2; chip++) {
+                ptr = inits;
+                while (*ptr != 0xff) {
+                        reg = *ptr++;
+                        data = *ptr++;
+                        if (ice->ak4528) {
+                                if (reg > 5)
+                                        continue;
+                                if (reg >= 4 && (data & 0x80))
+                                        continue;
+                        }
+                        if (reg == 0x03 && ice->ak4528)
+                                data = 0x0d;    /* deemphasis off, turn LR highpass filters on */
+                        snd_ice1712_ak4524_write(ice, chip, reg, data);
+                }
+        }
+}
+
+static void __devinit snd_ice1712_stdsp24_gpio_write(ice1712_t *ice, unsigned char byte)
 {
         byte |= ICE1712_STDSP24_CLOCK_BIT;
@@ -4234 +3886 @@
 }
 
-static void __init snd_ice1712_stdsp24_darear(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_darear(ice1712_t *ice, int activate)
 {
         down(&ice->gpio_mutex);
@@ -4242 +3894 @@
 }
 
-static void __init snd_ice1712_stdsp24_mute(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_mute(ice1712_t *ice, int activate)
 {
         down(&ice->gpio_mutex);
@@ -4250 +3902 @@
 }
 
-static void __init snd_ice1712_stdsp24_insel(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_insel(ice1712_t *ice, int activate)
 {
         down(&ice->gpio_mutex);
@@ -4258 +3910 @@
 }
 
-static void __init snd_ice1712_stdsp24_box_channel(ice1712_t *ice, int box, int chn, int activate)
+static void __devinit snd_ice1712_stdsp24_box_channel(ice1712_t *ice, int box, int chn, int activate)
 {
         down(&ice->gpio_mutex);
@@ -4305 +3957 @@
 }
 
-static void __init snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int master, int slave)
+static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int master, int slave)
 {
         down(&ice->gpio_mutex);
@@ -4336 +3988 @@
 }
 
-static void __init snd_ice1712_stdsp24_init(ice1712_t *ice)
+static void __devinit snd_ice1712_stdsp24_init(ice1712_t *ice)
 {
         int box, chn;
@@ -4394 +4046 @@
 }
 
-static int __init snd_ice1712_chip_init(ice1712_t *ice)
-{
+static int __devinit snd_ice1712_chip_init(ice1712_t *ice)
+{
+        int err, has_i2c = 0;
+
         outb(ICE1712_RESET | ICE1712_NATIVE, ICEREG(ice, CONTROL));
         udelay(200);
@@ -4426 +4080 @@
         }
 
+        /* determine I2C, DACs and ADCs */
         switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_AUDIOPHILE:
+                ice->ak4528 = 1;
+                /* follow thru */
         case ICE1712_SUBDEVICE_EWX2496:
-                ice->num_adcs = ice->num_dacs = 2;
+                has_i2c = 1;
+                ice->num_adcs = ice->num_dacs = ice->num_total_dacs = 2;
                 break;  
         case ICE1712_SUBDEVICE_DELTA44:
         case ICE1712_SUBDEVICE_DELTA66:
-                ice->num_adcs = ice->num_dacs = 4;
+                ice->num_adcs = ice->num_dacs = ice->num_total_dacs = 4;
+                if (ice->omni)
+                        ice->num_total_dacs = 8;
                 break;
         case ICE1712_SUBDEVICE_EWS88MT:
-                ice->num_adcs = ice->num_dacs = 8;
-                break;
-        }
-
+                has_i2c = 1;
+                /* follow thru */
+        case ICE1712_SUBDEVICE_DELTA1010:
+                ice->num_adcs = ice->num_dacs = ice->num_total_dacs = 8;
+                break;
+        case ICE1712_SUBDEVICE_EWS88D:
+                has_i2c = 1;
+                break;
+        case ICE1712_SUBDEVICE_DMX6FIRE:
+                has_i2c = 1;
+                ice->num_adcs = ice->num_dacs = ice->num_total_dacs = 6;
+                break;
+        }
+
+        if (has_i2c) {
+                if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) {
+                        snd_printk("unable to create I2C bus\n");
+                        return err;
+                }
+                ice->i2c->private_data = ice;
+                switch (ice->eeprom.subvendor) {
+                case ICE1712_SUBDEVICE_AUDIOPHILE:
+                        ice->i2c->ops = &ap_cs8427_i2c_ops;
+                        break;
+                case ICE1712_SUBDEVICE_EWX2496:
+                case ICE1712_SUBDEVICE_EWS88MT:
+                case ICE1712_SUBDEVICE_EWS88D:
+                case ICE1712_SUBDEVICE_DMX6FIRE:
+                        ice->i2c->hw_ops.bit = &snd_ice1712_ewx_cs8427_bit_ops;
+                        break;
+                }
+                switch (ice->eeprom.subvendor) {
+                case ICE1712_SUBDEVICE_AUDIOPHILE:
+                case ICE1712_SUBDEVICE_EWX2496:
+                        if ((err = snd_cs8427_create(ice->i2c, CS8427_BASE_ADDR, &ice->cs8427)) < 0) {
+                                snd_printk("CS8427 initialization failed\n");
+                                return err;
+                        }
+                        break;
+                case ICE1712_SUBDEVICE_DMX6FIRE:
+#if 0 // XXX not working yet
+                        if ((err = snd_i2c_device_create(ice->i2c, "PCF9554", 0x40>>1, &ice->pcf8575)) < 0)
+                                return err;
+                        if ((err = snd_cs8427_create(ice->i2c, 0x11, &ice->cs8427)) < 0) {
+                                snd_printk("CS8427 initialization failed\n");
+                                return err;
+                        }
+#endif // XXX not working yet
+                        break;
+                case ICE1712_SUBDEVICE_EWS88MT:
+                        if ((err = snd_i2c_device_create(ice->i2c, "CS8404", ICE1712_EWS88MT_CS8404_ADDR, &ice->cs8404)) < 0)
+                                return err;
+                        if ((err = snd_i2c_device_create(ice->i2c, "PCF8574 (1st)", ICE1712_EWS88MT_INPUT_ADDR, &ice->pcf8574[0])) < 0)
+                                return err;
+                        if ((err = snd_i2c_device_create(ice->i2c, "PCF8574 (2nd)", ICE1712_EWS88MT_OUTPUT_ADDR, &ice->pcf8574[1])) < 0)
+                                return err;
+                        break;
+                case ICE1712_SUBDEVICE_EWS88D:
+                        if ((err = snd_i2c_device_create(ice->i2c, "PCF8575", ICE1712_EWS88D_PCF_ADDR, &ice->pcf8575)) < 0)
+                                return err;
+                        break;
+                }
+        }
+        /* second stage of initialization, analog parts and others */
         switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_DELTA66:
@@ -4446 +4166 @@
         case ICE1712_SUBDEVICE_EWX2496:
         case ICE1712_SUBDEVICE_EWS88MT:
+        case ICE1712_SUBDEVICE_DMX6FIRE:
                 snd_ice1712_ak4524_init(ice);
                 break;
@@ -4467 +4188 @@
                 snd_ice1712_delta_cs8403_spdif_write(ice, ice->cs8403_spdif_bits);
                 break;
+        }
+        switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_EWS88MT:
         case ICE1712_SUBDEVICE_EWS88D:
@@ -4488 +4211 @@
         if (err < 0)
                 return err;
-        for (idx = 0; idx < ice->num_dacs; idx++) {
+        for (idx = 0; idx < ice->num_total_dacs; idx++) {
                 kctl = snd_ctl_new1(&snd_ice1712_mixer_pro_analog_route, ice);
                 if (kctl == NULL)
@@ -4570 +4293 @@
         case ICE1712_SUBDEVICE_DELTA66:
         case ICE1712_SUBDEVICE_EWS88MT:
+        case ICE1712_SUBDEVICE_DMX6FIRE:
                 for (idx = 0; idx < ice->num_dacs; ++idx) {
                         snd_kcontrol_t ctl;
@@ -4580 +4304 @@
                         ctl.get = snd_ice1712_ak4524_volume_get;
                         ctl.put = snd_ice1712_ak4524_volume_put;
-                        ctl.private_value = (idx / 2) * 8 + (idx % 2) + 6; /* reigster 6 & 7 */
+                        if (ice->ak4528)
+                                ctl.private_value = (idx / 2) * 8 + (idx % 2) + 4; /* register 4 & 5 */
+                        else
+                                ctl.private_value = (idx / 2) * 8 + (idx % 2) + 6; /* register 6 & 7 */
                         ctl.private_data = ice;
                         if ((err = snd_ctl_add(ice->card, snd_ctl_new(&ctl))) < 0)
                                 return err;
                 }
-                for (idx = 0; idx < ice->num_adcs; ++idx) {
+                for (idx = 0; idx < ice->num_adcs && !ice->ak4528; ++idx) {
                         snd_kcontrol_t ctl;
                         memset(&ctl, 0, sizeof(ctl));
@@ -4595 +4322 @@
                         ctl.get = snd_ice1712_ak4524_volume_get;
                         ctl.put = snd_ice1712_ak4524_volume_put;
-                        ctl.private_value = (idx / 2) * 8 + (idx % 2) + 4; /* reigster 4 & 5 */
+                        ctl.private_value = (idx / 2) * 8 + (idx % 2) + 4; /* register 4 & 5 */
+                        ctl.private_data = ice;
+                        if ((err = snd_ctl_add(ice->card, snd_ctl_new(&ctl))) < 0)
+                                return err;
+                        memset(&ctl, 0, sizeof(ctl));
+                        strcpy(ctl.id.name, "IPGA Analog Capture Volume");
+                        ctl.id.index = idx;
+                        ctl.id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+                        ctl.info = snd_ice1712_ak4524_ipga_gain_info;
+                        ctl.access = SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE;
+                        ctl.get = snd_ice1712_ak4524_ipga_gain_get;
+                        ctl.put = snd_ice1712_ak4524_ipga_gain_put;
+                        ctl.private_value = (idx / 2) * 8 + (idx % 2) + 4; /* register 4 & 5 */
                         ctl.private_data = ice;
                         if ((err = snd_ctl_add(ice->card, snd_ctl_new(&ctl))) < 0)
@@ -4638 +4377 @@
                 break;
         case ICE1712_SUBDEVICE_EWS88D:
-                err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_ews88d_spdif_in_opt, ice));
+                for (idx = 0; idx < sizeof(snd_ice1712_ews88d_controls)/sizeof(snd_ice1712_ews88d_controls[0]); idx++) {
+                        err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_ews88d_controls[idx], ice));
                 if (err < 0)
                         return err;
-                err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_ews88d_opt_out_adat, ice));
+                }
+                break;
+        case ICE1712_SUBDEVICE_DMX6FIRE:
+#if 0 // XXX not working yet
+                err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_6fire_led, ice));
                 if (err < 0)
                         return err;
-                err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_ews88d_master_adat, ice));
-                if (err < 0)
-                        return err;
-                err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_ews88d_adat_enable, ice));
-                if (err < 0)
-                        return err;
-                err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_ews88d_adat_through, ice));
-                if (err < 0)
-                        return err;
-                break;
-        }
-
-        return 0;
-}
-
-static int __exit snd_ice1712_free(ice1712_t *ice)
+#endif
+                break;
+        }
+
+        return 0;
+}
+
+static int snd_ice1712_free(ice1712_t *ice)
 {
         if (ice->res_port == NULL)
@@ -4672 +4408 @@
         if (ice->irq)
                 free_irq(ice->irq, (void *) ice);
-        if (ice->res_port)
+        if (ice->res_port) {
                 release_resource(ice->res_port);
-        if (ice->res_ddma_port)
+                kfree_nocheck(ice->res_port);
+        }
+        if (ice->res_ddma_port) {
                 release_resource(ice->res_ddma_port);
-        if (ice->res_dmapath_port)
+                kfree_nocheck(ice->res_ddma_port);
+        }
+        if (ice->res_dmapath_port) {
                 release_resource(ice->res_dmapath_port);
-        if (ice->res_profi_port)
+                kfree_nocheck(ice->res_dmapath_port);
+        }
+        if (ice->res_profi_port) {
                 release_resource(ice->res_profi_port);
+                kfree_nocheck(ice->res_profi_port);
+        }
         snd_magic_kfree(ice);
         return 0;
 }
 
-static int __exit snd_ice1712_dev_free(snd_device_t *device)
+static int snd_ice1712_dev_free(snd_device_t *device)
 {
         ice1712_t *ice = snd_magic_cast(ice1712_t, device->device_data, return -ENXIO);
@@ -4690 +4434 @@
 }
 
-static int __init snd_ice1712_create(snd_card_t * card,
+static int __devinit snd_ice1712_create(snd_card_t * card,
                                      struct pci_dev *pci,
+                                     int omni,
                                      ice1712_t ** r_ice1712)
 {
@@ -4705 +4450 @@
         };
 #endif
+
         *r_ice1712 = NULL;
 
@@ -4720 +4466 @@
         if (ice == NULL)
                 return -ENOMEM;
+        ice->omni = omni ? 1 : 0;
         spin_lock_init(&ice->reg_lock);
         init_MUTEX(&ice->gpio_mutex);
@@ -4726 +4473 @@
                                          0x10 | /* no emphasis */
                                          0x20); /* PCM encoder/decoder */
-        ice->cs8427_spdif_status[0] = (SNDRV_PCM_DEFAULT_CON_SPDIF >> 0) & 0xff;
-        ice->cs8427_spdif_status[1] = (SNDRV_PCM_DEFAULT_CON_SPDIF >> 8) & 0xff;
-        ice->cs8427_spdif_status[2] = (SNDRV_PCM_DEFAULT_CON_SPDIF >> 16) & 0xff;
-        ice->cs8427_spdif_status[3] = (SNDRV_PCM_DEFAULT_CON_SPDIF >> 24) & 0xff;
-        memcpy(ice->cs8427_spdif_stream_status, ice->cs8427_spdif_status, 5);
         ice->card = card;
         ice->pci = pci;
@@ -4795 +4537 @@
 }
 
-static int __init snd_ice1712_probe(struct pci_dev *pci,
+static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                                     const struct pci_device_id *id)
 {
@@ -4803 +4545 @@
         int pcm_dev = 0, err;
 
-        for ( ; dev < SNDRV_CARDS; dev++) {
+        if (dev >= SNDRV_CARDS)
+                return -ENODEV;
                 if (!snd_enable[dev]) {
                         dev++;
                         return -ENOENT;
                 }
-                break;
-        }
-        if (dev >= SNDRV_CARDS)
-                return -ENODEV;
 
         card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE, 0);
@@ -4817 +4556 @@
                 return -ENOMEM;
 
-        if ((err = snd_ice1712_create(card, pci, &ice)) < 0) {
+        if ((err = snd_ice1712_create(card, pci, snd_omni[dev], &ice)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -4880 +4619 @@
                 strcpy(card->shortname, "TerraTec EWS 88D");
                 break;
+        case ICE1712_SUBDEVICE_DMX6FIRE:
+                strcpy(card->shortname, "TerraTec DMX 6Fire");
+                break;
         }
 
@@ -4907 +4649 @@
                 return err;
         }
-        PCI_SET_DRIVER_DATA(pci, card);
+        pci_set_drvdata(pci, card);
         dev++;
         return 0;
 }
 
-static void __exit snd_ice1712_remove(struct pci_dev *pci)
-{
-        snd_card_free(PCI_GET_DRIVER_DATA(pci));
-        PCI_SET_DRIVER_DATA(pci, NULL);
+static void __devexit snd_ice1712_remove(struct pci_dev *pci)
+{
+        snd_card_free(pci_get_drvdata(pci));
+        pci_set_drvdata(pci, NULL);
 }
 
@@ -4930 +4672 @@
         id_table: snd_ice1712_ids,
         probe: snd_ice1712_probe,
-        remove: snd_ice1712_remove,
+        remove: __devexit_p(snd_ice1712_remove),
 };
 #endif
@@ -4940 +4682 @@
         if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-                snd_printk("ICE1712 soundcard not found or device busy\n");
+                printk(KERN_ERR "ICE1712 soundcard not found or device busy\n");
 #endif
                 return err;
@@ -4957 +4699 @@
 #ifndef MODULE
 
-/* format is: snd-card-ice1712=snd_enable,snd_index,snd_id */
+/* format is: snd-ice1712=snd_enable,snd_index,snd_id */
 
 static int __init alsa_card_ice1712_setup(char *str)
@@ -4972 +4714 @@
 }
 
-__setup("snd-card-ice1712=", alsa_card_ice1712_setup);
+__setup("snd-ice1712=", alsa_card_ice1712_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/pci/maestro3.c

@@ -2924 +2924 @@
     if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-        //              snd_printk("Maestro3/Allegro soundcard not found or device busy\n");
+                //              snd_printk(KERN_ERR "Maestro3/Allegro soundcard not found or device busy\n");
 #endif
         return err;

GPL/branches/alsa-resync1/alsa-kernel/pci/rme96.c

@@ -20 +20 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */      
 
-#define SNDRV_MAIN_OBJECT_FILE
-
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
+#include <sound/asoundef.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -35 +39 @@
 /* note, two last pcis should be equal, it is not a bug */
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Anders Torger <torger@ludd.luth.se>");
 MODULE_DESCRIPTION("RME Digi96, Digi96/8, Digi96/8 PRO, Digi96/8 PST, "
                    "Digi96/8 PAD");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{RME,Digi96},"
@@ -240 +247 @@
         size_t capture_periodsize; /* in bytes, zero if not used */
 
+        snd_pcm_uframes_t playback_last_appl_ptr;
         size_t playback_ptr;
         size_t capture_ptr;
@@ -693 +701 @@
 }
 
-
-static int
-snd_rme96_playback_getrate(rme96_t *rme96)
-{
-        int rate;
-        
-        rate = ((rme96->wcreg >> RME96_WCR_BITPOS_FREQ_0) & 1) +
-                (((rme96->wcreg >> RME96_WCR_BITPOS_FREQ_1) & 1) << 1);
-        switch (rate) {
-        case 1:
-                rate = 32000;
-                break;
-        case 2:
-                rate = 44100;
-                break;
-        case 3:
-                rate = 48000;
-                break;
-        default:
-                return -1;
-        }
-        return (rme96->wcreg & RME96_WCR_DS) ? rate << 1 : rate;
-}
-
 static int
 snd_rme96_capture_getrate(rme96_t *rme96,
@@ -781 +765 @@
 
 static int
+snd_rme96_playback_getrate(rme96_t *rme96)
+{
+        int rate, dummy;
+
+        if (!(rme96->wcreg & RME96_WCR_MASTER) &&
+            (rate = snd_rme96_capture_getrate(rme96, &dummy)) > 0)
+        {
+            /* slave clock */
+            return rate;
+        }
+        rate = ((rme96->wcreg >> RME96_WCR_BITPOS_FREQ_0) & 1) +
+                (((rme96->wcreg >> RME96_WCR_BITPOS_FREQ_1) & 1) << 1);
+        switch (rate) {
+        case 1:
+                rate = 32000;
+                break;
+        case 2:
+                rate = 44100;
+                break;
+        case 3:
+                rate = 48000;
+                break;
+        default:
+                return -1;
+        }
+        return (rme96->wcreg & RME96_WCR_DS) ? rate << 1 : rate;
+}
+
+static int
 snd_rme96_playback_setrate(rme96_t *rme96,
                            int rate)
@@ -930 +943 @@
                 break;
         case RME96_INPUT_XLR:
-                if (rme96->pci->device != PCI_DEVICE_ID_DIGI96_8_PAD_OR_PST ||
-                    rme96->pci->device != PCI_DEVICE_ID_DIGI96_8_PRO ||
+                if ((rme96->pci->device != PCI_DEVICE_ID_DIGI96_8_PAD_OR_PST &&
+                     rme96->pci->device != PCI_DEVICE_ID_DIGI96_8_PRO) ||
                     (rme96->pci->device == PCI_DEVICE_ID_DIGI96_8_PAD_OR_PST &&
                      rme96->rev > 4))
@@ -1160 +1173 @@
                          int from_pause)
 {
-        snd_pcm_runtime_t *runtime = rme96->playback_substream->runtime;
-        
         if (!from_pause) {
                 writel(0, rme96->iobase + RME96_IO_RESET_PLAY_POS);
-                if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
-                        memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER,
-                                    runtime->dma_area,
-                                    rme96->playback_periodsize);
-                        rme96->playback_ptr = rme96->playback_periodsize;
-                }
+                rme96->playback_last_appl_ptr = 0;
+                rme96->playback_ptr = 0;
         }
 
@@ -1182 +1189 @@
         if (!from_pause) {
                 writel(0, rme96->iobase + RME96_IO_RESET_REC_POS);
+                rme96->capture_ptr = 0;
         }
 
@@ -1220 +1228 @@
 {
         rme96_t *rme96 = (rme96_t *)dev_id;
-        snd_pcm_runtime_t *runtime;
 
         rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER);
@@ -1232 +1239 @@
         if (rme96->rcreg & RME96_RCR_IRQ) {
                 /* playback */
-                runtime = rme96->playback_substream->runtime;
-                if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
-                        memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER +
-                                    rme96->playback_ptr,
-                                    runtime->dma_area + rme96->playback_ptr,
-                                    rme96->playback_periodsize);
-                        rme96->playback_ptr += rme96->playback_periodsize;
-                        if (rme96->playback_ptr == RME96_BUFFER_SIZE) {
-                                rme96->playback_ptr = 0;
-                        }
-                }
                 snd_pcm_period_elapsed(rme96->playback_substream);
                 writel(0, rme96->iobase + RME96_IO_CONFIRM_PLAY_IRQ);
@@ -1248 +1244 @@
         if (rme96->rcreg & RME96_RCR_IRQ_2) {
                 /* capture */
-                runtime = rme96->capture_substream->runtime;
-                if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
-                        memcpy_fromio(runtime->dma_area + rme96->capture_ptr,
-                                      rme96->iobase + RME96_IO_REC_BUFFER +
-                                      rme96->capture_ptr,
-                                      rme96->capture_periodsize);
-                        rme96->capture_ptr += rme96->capture_periodsize;
-                        if (rme96->capture_ptr == RME96_BUFFER_SIZE) {
-                                rme96->capture_ptr = 0;
-                        }
-                }
                 snd_pcm_period_elapsed(rme96->capture_substream);               
                 writel(0, rme96->iobase + RME96_IO_CONFIRM_REC_IRQ);
@@ -1295 +1280 @@
         writel(rme96->wcreg, rme96->iobase + RME96_IO_CONTROL_REGISTER);
         rme96->playback_substream = substream;
+        rme96->playback_last_appl_ptr = 0;
         rme96->playback_ptr = 0;
         spin_unlock_irqrestore(&rme96->lock, flags);
@@ -1354 +1340 @@
         writel(rme96->wcreg, rme96->iobase + RME96_IO_CONTROL_REGISTER);
         rme96->playback_substream = substream;
+        rme96->playback_last_appl_ptr = 0;
         rme96->playback_ptr = 0;
         spin_unlock_irqrestore(&rme96->lock, flags);
@@ -1547 +1534 @@
 {
         rme96_t *rme96 = _snd_pcm_substream_chip(substream);
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        snd_pcm_sframes_t diff;
+        size_t bytes;
+        
+        if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
+                diff = runtime->control->appl_ptr -
+                    rme96->playback_last_appl_ptr;
+                rme96->playback_last_appl_ptr = runtime->control->appl_ptr;
+                if (diff != 0 &&
+                    diff < -(snd_pcm_sframes_t)(runtime->boundary >> 1))
+                {
+                        diff += runtime->boundary;
+                }
+                bytes = diff << rme96->playback_frlog;
+                
+                if (bytes > RME96_BUFFER_SIZE - rme96->playback_ptr) {
+                        memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER +
+                                    rme96->playback_ptr,
+                                    runtime->dma_area + rme96->playback_ptr,
+                                    RME96_BUFFER_SIZE - rme96->playback_ptr);
+                        bytes -= RME96_BUFFER_SIZE - rme96->playback_ptr;
+                        if (bytes > RME96_BUFFER_SIZE) {
+                                bytes = RME96_BUFFER_SIZE;
+                        }
+                        memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER,
+                                    runtime->dma_area,
+                                    bytes);
+                        rme96->playback_ptr = bytes;
+                } else if (bytes != 0) {
+                        memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER +
+                                    rme96->playback_ptr,
+                                    runtime->dma_area + rme96->playback_ptr,
+                                    bytes);
+                        rme96->playback_ptr += bytes;
+                }
+        }
         return snd_rme96_playback_ptr(rme96);
 }
@@ -1554 +1577 @@
 {
         rme96_t *rme96 = _snd_pcm_substream_chip(substream);
-        return snd_rme96_capture_ptr(rme96);
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        snd_pcm_uframes_t frameptr;
+        size_t ptr;
+
+        frameptr = snd_rme96_capture_ptr(rme96);
+        if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
+                ptr = frameptr << rme96->capture_frlog;
+                if (ptr > rme96->capture_ptr) {
+                        memcpy_fromio(runtime->dma_area + rme96->capture_ptr,
+                                      rme96->iobase + RME96_IO_REC_BUFFER +
+                                      rme96->capture_ptr,
+                                      ptr - rme96->capture_ptr);
+                        rme96->capture_ptr += ptr - rme96->capture_ptr;
+                } else if (ptr < rme96->capture_ptr) {
+                        memcpy_fromio(runtime->dma_area + rme96->capture_ptr,
+                                      rme96->iobase + RME96_IO_REC_BUFFER +
+                                      rme96->capture_ptr,
+                                      RME96_BUFFER_SIZE - rme96->capture_ptr);
+                        memcpy_fromio(runtime->dma_area,
+                                      rme96->iobase + RME96_IO_REC_BUFFER,
+                                      ptr);
+                        rme96->capture_ptr = ptr;
+                }
+        }
+        return frameptr;
 }
 
@@ -1683 +1730 @@
         if (rme96->res_port != NULL) {
                 release_resource(rme96->res_port);
+                kfree_nocheck(rme96->res_port);
                 rme96->res_port = NULL;
         }
@@ -2614 +2662 @@
 }
 
-static int __init
+static int __devinit
 snd_rme96_probe(struct pci_dev *pci,
                 const struct pci_device_id *id)
@@ -2624 +2672 @@
         u8 val;
 
-        for ( ; dev < SNDRV_CARDS; dev++) {
+        if (dev >= SNDRV_CARDS) {
+                return -ENODEV;
+        }
                 if (!snd_enable[dev]) {
                         dev++;
                         return -ENOENT;
-                }
-                break;
-        }
-        if (dev >= SNDRV_CARDS) {
-                return -ENODEV;
         }
         if ((card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
@@ -2673 +2718 @@
                 return err;     
         }
-        PCI_SET_DRIVER_DATA(pci, card);
+        pci_set_drvdata(pci, card);
         dev++;
         return 0;
 }
 
-static void __exit snd_rme96_remove(struct pci_dev *pci)
-{
-        snd_card_free(PCI_GET_DRIVER_DATA(pci));
-        PCI_SET_DRIVER_DATA(pci, NULL);
+static void __devexit snd_rme96_remove(struct pci_dev *pci)
+{
+        snd_card_free(pci_get_drvdata(pci));
+        pci_set_drvdata(pci, NULL);
 }
 
@@ -2696 +2741 @@
         id_table: snd_rme96_ids,
         probe: snd_rme96_probe,
-        remove: snd_rme96_remove,
+        remove: __devexit_p(snd_rme96_remove),
 };
 #endif
@@ -2706 +2751 @@
         if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-//              snd_printk("No RME Digi96 cards found\n");
+//              snd_printk(KERN_ERR "No RME Digi96 cards found\n");
 #endif
                 return err;
@@ -2723 +2768 @@
 #ifndef MODULE
 
-/* format is: snd-card-rme96=snd_enable,snd_index,snd_id */
+/* format is: snd-rme96=snd_enable,snd_index,snd_id */
 
 static int __init alsa_card_rme96_setup(char *str)
@@ -2738 +2783 @@
 }
 
-__setup("snd-card-rme96=", alsa_card_rme96_setup);
+__setup("snd-rme96=", alsa_card_rme96_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/rme9652.c

@@ -17 +17 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/info.h>
+#include <sound/asoundef.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -31 +36 @@
 static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
 static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;      /* Enable this card */
+static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;  /* Enable this card */
+static int snd_precise_ptr[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 0 }; /* Enable precise pointer */
 
 EXPORT_NO_SYMBOLS;
@@ -43 +49 @@
 MODULE_PARM_DESC(snd_enable, "Enable/disable specific RME96{52,36} soundcards.");
 MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(snd_precise_ptr, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(snd_precise_ptr, "Enable precise pointer (doesn't work reliably).");
+MODULE_PARM_SYNTAX(snd_precise_ptr, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
 MODULE_AUTHOR("Paul Davis <pbd@op.net>, Winfried Ritsch");
 MODULE_DESCRIPTION("RME Digi9652/Digi9636");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{RME,Hammerfall},"
@@ -206 +216 @@
         unsigned long iobase;
 
+        int precise_ptr;
+
         u32 control_register;   /* cached value */
         u32 thru_bits;          /* thru 1=on, 0=off channel 1=Bit1... channel 26= Bit26 */
@@ -349 +361 @@
         rme9652->hw_offsetmask = 
                 (rme9652->period_bytes * 2 - 1) & RME9652_buf_pos;
-        rme9652->max_jitter = 16 + (rme9652->period_bytes <= 1024 ? 32 : 64);
-}
-
-static inline snd_pcm_uframes_t rme9652_hw_pointer(rme9652_t *rme9652)
+        rme9652->max_jitter = 80;
+}
+
+static snd_pcm_uframes_t rme9652_hw_pointer(rme9652_t *rme9652)
 {
         int status;
@@ -360 +372 @@
 
         status = rme9652_read(rme9652, RME9652_status_register);
+        if (!rme9652->precise_ptr)
+                return (status & RME9652_buffer_id) ? period_size : 0;
         offset = status & RME9652_buf_pos;
 
@@ -379 +393 @@
                 if (offset > rme9652->max_jitter) {
                         if (frag)
-                                printk("Unexpected hw_pointer position (bufid == 0): status: %x offset: %d\n", status, offset);
+                                printk(KERN_ERR "Unexpected hw_pointer position (bufid == 0): status: %x offset: %d\n", status, offset);
                 } else if (!frag)
                         return 0;
@@ -388 +402 @@
                 if (offset > period_size + rme9652->max_jitter) {
                         if (!frag)
-                                printk("Unexpected hw_pointer position (bufid == 1): status: %x offset: %d\n", status, offset);
+                                printk(KERN_ERR "Unexpected hw_pointer position (bufid == 1): status: %x offset: %d\n", status, offset);
                 } else if (frag)
                         return period_size;
@@ -1732 +1746 @@
         snd_iprintf(buffer, "IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n",
                     rme9652->irq, rme9652->port, rme9652->iobase);
+        snd_iprintf(buffer, "Control register: %x\n", rme9652->control_register);
 
         snd_iprintf(buffer, "\n");
@@ -1948 +1963 @@
         if (rme9652->iobase)
                 iounmap((void *) rme9652->iobase);
-        if (rme9652->res_port)
+        if (rme9652->res_port) {
                 release_resource(rme9652->res_port);
+                kfree_nocheck(rme9652->res_port);
+        }
         if (rme9652->irq >= 0)
                 free_irq(rme9652->irq, (void *)rme9652);
@@ -1985 +2002 @@
                 }
 
-                snd_printk("%s: no buffers available\n",
-                           rme9652->card_name);
+                printk(KERN_ERR "%s: no buffers available\n", rme9652->card_name);
                 return -ENOMEM;
         }
@@ -1999 +2015 @@
         /* Align to bus-space 64K boundary */
 
-        cb_bus = cb_addr;
-        cb_bus = (cb_bus + 0xFFFF) & ~0xFFFFl;
-
-        pb_bus = pb_addr;
-        pb_bus = (pb_bus + 0xFFFF) & ~0xFFFFl;
+        cb_bus = (cb_addr + 0xFFFF) & ~0xFFFFl;
+        pb_bus = (pb_addr + 0xFFFF) & ~0xFFFFl;
 
         /* Tell the card where it is */
@@ -2010 +2023 @@
         rme9652_write(rme9652, RME9652_play_buffer, pb_bus);
 
-        rme9652->capture_buffer = bus_to_virt(cb_bus);
-        rme9652->playback_buffer = bus_to_virt(pb_bus);
+        rme9652->capture_buffer = cb + (cb_bus - cb_addr);
+        rme9652->playback_buffer = pb + (pb_bus - pb_addr);
 
         return 0;
@@ -2745 +2758 @@
 
 static int __init snd_rme9652_create(snd_card_t *card,
-                                     rme9652_t *rme9652)
+                                     rme9652_t *rme9652,
+                                     int precise_ptr)
 {
         struct pci_dev *pci = rme9652->pci;
@@ -2772 +2786 @@
         rme9652->irq = pci->irq;
 
-        rme9652->iobase = (unsigned long) ioremap(rme9652->port, RME9652_IO_EXTENT);
+        rme9652->iobase = (unsigned long) ioremap_nocache(rme9652->port, RME9652_IO_EXTENT);
         if (rme9652->iobase == 0) {
                 snd_printk("unable to remap region 0x%lx-0x%lx\n", rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1);
                 return -EBUSY;
         }
+
+        rme9652->precise_ptr = precise_ptr;
 
         /* Determine the h/w rev level of the card. This seems like
@@ -2871 +2887 @@
 }
 
-static int snd_rme9652_probe(struct pci_dev *pci,
+static int __devinit snd_rme9652_probe(struct pci_dev *pci,
                              const struct pci_device_id *id)
 {
@@ -2879 +2895 @@
         int err;
 
-        for (; dev < SNDRV_CARDS; dev++) {
+        if (dev >= SNDRV_CARDS)
+                return -ENODEV;
                 if (!snd_enable[dev]) {
                         dev++;
                         return -ENOENT;
                 }
-                break;
-        }
-
-        if (dev >= SNDRV_CARDS)
-                return -ENODEV;
 
         card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
@@ -2901 +2913 @@
         rme9652->pci = pci;
 
-        if ((err = snd_rme9652_create(card, rme9652)) < 0) {
+        if ((err = snd_rme9652_create(card, rme9652, snd_precise_ptr[dev])) < 0) {
                 snd_card_free(card);
                 return err;
@@ -2916 +2928 @@
                 return err;
         }
-        PCI_SET_DRIVER_DATA(pci, card);
+        pci_set_drvdata(pci, card);
         dev++;
         return 0;
 }
 
-static void __exit snd_rme9652_remove(struct pci_dev *pci)
-{
-        snd_card_free(PCI_GET_DRIVER_DATA(pci));
-        PCI_SET_DRIVER_DATA(pci, NULL);
+static void __devexit snd_rme9652_remove(struct pci_dev *pci)
+{
+        snd_card_free(pci_get_drvdata(pci));
+        pci_set_drvdata(pci, NULL);
 }
 
@@ -2939 +2951 @@
         id_table:snd_rme9652_ids,
         probe:snd_rme9652_probe,
-        remove:snd_rme9652_remove,
+        remove:__devexit_p(snd_rme9652_remove),
 };
 #endif
@@ -2947 +2959 @@
         if (pci_module_init(&driver) < 0) {
 #ifdef MODULE
-                snd_printk("RME Digi9652/Digi9636: no cards found\n");
+                printk(KERN_ERR "RME Digi9652/Digi9636: no cards found\n");
 #endif
                 return -ENODEV;
@@ -2965 +2977 @@
 #ifndef MODULE
 
-/* format is: snd-card-rme9652=snd_enable,snd_index,snd_id */
+/* format is: snd-rme9652=snd_enable,snd_index,snd_id */
 
 static int __init alsa_card_rme9652_setup(char *str)
@@ -2980 +2992 @@
 }
 
-__setup("snd-card-rme9652=", alsa_card_rme9652_setup);
+__setup("snd-rme9652=", alsa_card_rme9652_setup);
 
 #endif /* ifndef MODULE */

GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident.c

@@ -22 +22 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/trident.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
 
-EXPORT_NO_SYMBOLS;
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, <audio@tridentmicro.com>");
 MODULE_DESCRIPTION("Trident 4D-WaveDX/NX & SiS SI7018");
@@ -195 +196 @@
         if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-//              snd_printk("Trident 4DWave PCI soundcard not found or device busy\n");
+//              snd_printk(KERN_ERR "Trident 4DWave PCI soundcard not found or device busy\n");
 #endif
                 return err;
@@ -212 +213 @@
 #ifndef MODULE
 
-/* format is: snd-card-trident=snd_enable,snd_index,snd_id,
+/* format is: snd-trident=snd_enable,snd_index,snd_id,
                                snd_pcm_channels,snd_wavetable_size */
 

GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/ymfpci.c

@@ -20 +20 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/ymfpci.h>
 #include <sound/mpu401.h>
@@ -29 +31 @@
 
 EXPORT_NO_SYMBOLS;
+
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Yamaha DS-XG PCI");
@@ -290 +293 @@
         if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-//              snd_printk("Yamaha DS-XG PCI soundcard not found or device busy\n");
+//              snd_printk(KERN_ERR "Yamaha DS-XG PCI soundcard not found or device busy\n");
 #endif
                 return err;
@@ -307 +310 @@
 #ifndef MODULE
 
-/* format is: snd-card-ymfpci=snd_enable,snd_index,snd_id,
-                              snd_fm_port,snd_mpu_port,snd_mpu_irq */
+/* format is: snd-ymfpci=snd_enable,snd_index,snd_id,
+                         snd_fm_port,snd_mpu_port */
 
 static int __init alsa_card_ymfpci_setup(char *str)