Changeset 290

Timestamp:

Feb 16, 2008, 7:40:20 AM (17 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.2

Location:

GPL/branches/alsa-resync1/alsa-kernel

Files:

• core/control.c (modified) (1 diff)
• core/pcm_lib.c (modified) (1 diff)
• core/sound.c (modified) (6 diffs)
• drivers/serial-u16550.c (modified) (1 diff)
• include/sound/adriver.h (modified) (4 diffs)
• include/sound/compat_22.h (modified) (1 diff)
• include/sound/config.h (modified) (1 diff)
• include/sound/core.h (modified) (2 diffs)
• include/sound/emu8000.h (modified) (1 diff)
• include/sound/pcm.h (modified) (1 diff)
• include/sound/version.h (modified) (1 diff)
• isa/ad1816a/ad1816a.c (modified) (3 diffs)
• isa/ad1816a/ad1816a_lib.c (modified) (3 diffs)
• isa/ad1848/ad1848_lib.c (modified) (2 diffs)
• isa/als100.c (modified) (3 diffs)
• isa/azt2320.c (modified) (3 diffs)
• isa/cmi8330.c (modified) (1 diff)
• isa/cs423x/cs4231.c (modified) (2 diffs)
• isa/cs423x/cs4231_lib.c (modified) (5 diffs)
• isa/cs423x/cs4236.c (modified) (3 diffs)
• isa/dt019x.c (modified) (3 diffs)
• isa/es1688/es1688.c (modified) (2 diffs)
• isa/es1688/es1688_lib.c (modified) (2 diffs)
• isa/es18xx.c (modified) (4 diffs)
• isa/gus/gus_main.c (modified) (3 diffs)
• isa/gus/interwave.c (modified) (2 diffs)
• isa/opl3sa2.c (modified) (3 diffs)
• isa/opti9xx/opti92x-ad1848.c (modified) (6 diffs)
• isa/sb/emu8000.c (modified) (3 diffs)
• isa/sb/emu8000_callback.c (modified) (2 diffs)
• isa/sb/emu8000_local.h (modified) (1 diff)
• isa/sb/emu8000_patch.c (modified) (2 diffs)
• isa/sb/emu8000_synth.c (modified) (1 diff)
• isa/sb/es968.c (modified) (1 diff)
• isa/sb/sb16.c (modified) (6 diffs)
• isa/sb/sb_common.c (modified) (4 diffs)
• isa/sgalaxy.c (modified) (1 diff)
• isa/wavefront/wavefront.c (modified) (2 diffs)
• pci/ac97/ac97_patch.c (modified) (2 diffs)
• pci/ali5451/ali5451.c (modified) (1 diff)
• pci/als4000.c (modified) (3 diffs)
• pci/cmipci.c (modified) (4 diffs)
• pci/cs4281.c (modified) (1 diff)
• pci/emu10k1/memory.c (modified) (1 diff)
• pci/es1968.c (modified) (3 diffs)
• pci/ice1712/ak4xxx.c (modified) (1 diff)
• pci/ice1712/ice1712.c (modified) (2 diffs)
• pci/ice1712/ice1724.c (modified) (2 diffs)
• pci/intel8x0.c (modified) (6 diffs)
• pci/korg1212/korg1212.c (modified) (1 diff)
• pci/maestro3.c (modified) (2 diffs)
• pci/rme96.c (modified) (1 diff)
• pci/rme9652/hdsp.c (modified) (2 diffs)
• pci/rme9652/rme9652.c (modified) (1 diff)
• pci/sonicvibes.c (modified) (4 diffs)
• pci/trident/trident_main.c (modified) (2 diffs)
• pci/ymfpci/ymfpci.c (modified) (1 diff)

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

@@ -43 +43 @@
 
 #define snd_kctl_ioctl(n) list_entry(n, snd_kctl_ioctl_t, list)
-
-/* find id without lock */
-static snd_kcontrol_t *_ctl_find_id(snd_card_t * card, snd_ctl_elem_id_t *id);
 
 static DECLARE_RWSEM(snd_ioctl_rwsem);

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

@@ -182 +182 @@
         else
             xrun(substream);
+#ifdef CONFIG_SND_DEBUG
+                if (substream->pstr->xrun_debug) {
+                        snd_printd(KERN_DEBUG "XRUN: pcmC%dD%d%c\n",
+                                   substream->pcm->card->number,
+                                   substream->pcm->device,
+                                   substream->stream ? 'c' : 'p');
+                        dump_stack();
+                }
+#endif
         return -EPIPE;
     }

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

@@ -41 +41 @@
 int snd_major;
 static int cards_limit = 1;
-#ifdef CONFIG_DEVFS_FS
 static int device_mode = S_IFCHR | S_IRUGO | S_IWUGO;
-#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -73 +71 @@
 static DECLARE_MUTEX(sound_mutex);
 
-#ifdef CONFIG_DEVFS_FS
 extern struct class_simple *sound_class;
-#endif
+
 
 #ifdef CONFIG_KMOD
@@ -240 +237 @@
     }
     list_add_tail(&preg->list, &snd_minors_hash[SNDRV_MINOR_CARD(minor)]);
-#ifdef CONFIG_DEVFS_FS
+#ifndef TARGET_OS2
     if (strncmp(name, "controlC", 8) || card->number >= cards_limit) {
         devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, "snd/%s", name);
@@ -276 +273 @@
         return -EINVAL;
     }
-#ifdef CONFIG_DEVFS_FS
-    if (strncmp(name, "controlC", 8) || card->number >= cards_limit) {
+#ifndef TARGET_OS2
+        if (strncmp(mptr->name, "controlC", 8) || card->number >= cards_limit) { /* created in sound.c */
         devfs_remove("snd/%s", mptr->name);
         class_simple_device_remove(MKDEV(major, minor));
@@ -347 +344 @@
 static int __init alsa_sound_init(void)
 {
-#ifdef CONFIG_DEVFS_FS
     short controlnum;
-#endif
 #ifdef CONFIG_SND_OSSEMUL
     int err;
@@ -391 +386 @@
     snd_info_minor_register();
 #endif
-#ifdef CONFIG_DEVFS_FS
+#ifndef TARGET_OS2
     for (controlnum = 0; controlnum < cards_limit; controlnum++) {
         devfs_mk_cdev(MKDEV(major, controlnum<<5), S_IFCHR | device_mode, "snd/controlC%d", controlnum);

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

@@ -357 +357 @@
 
         uart->res_base = request_region(io_base, 8, "Serial MIDI");
-        if (uart->res_base == NULL)
+        if (uart->res_base == NULL) {
+                snd_printk(KERN_ERR "u16550: can't grab port 0x%lx\n", io_base);
                 return -EBUSY;
+        }
 
     ok = 1;                     /* uart detected unless one of the following tests should fail */

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

@@ -87 +87 @@
 #include <asm/page.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 3)
-#define pci_set_dma_mask(pci, mask) pci->dma_mask = mask
+#define pci_set_dma_mask(pci, mask) (pci->dma_mask = mask, 0)
 #endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7)
@@ -157 +157 @@
 #endif
 
-#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
-#ifdef TARGET_OS2
-#include "isapnp.h"
-#else /* !TARGET_OS2 */
-#include <linux/isapnp.h>
-#endif /* !TARGET_OS2 */
-#ifndef CONFIG_PNP
-#define CONFIG_PNP
-#endif
-#if (defined(CONFIG_ISAPNP_KERNEL) && defined(ALSA_BUILD)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 30) && !defined(ALSA_BUILD))
-#define isapnp_dev pci_dev
-#define isapnp_card pci_bus
-#endif
-#undef __ISAPNP__
-#define __ISAPNP__
-#else
+/* isapnp support for 2.2 kernels */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
+#undef CONFIG_ISAPNP
+#ifdef CONFIG_SND_ISAPNP
+#define CONFIG_ISAPNP
+#endif
+#endif
+
+/* support of pnp compatible layer for 2.2/2.4 kernels */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
 #undef CONFIG_PNP
+#ifdef CONFIG_SND_PNP
+#define CONFIG_PNP
 #endif
 #endif
@@ -288 +283 @@
 
 #ifndef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
-#define pci_set_consistent_dma_mask(p,x) pci_set_dma_mask(p,x)
+#define pci_set_consistent_dma_mask(p,x) 0 /* success */
+#endif
+
+/* sysfs */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
+struct class_simple;
+static inline void class_simple_device_add(struct class_simple *class, int devnum, ...) { return; }
+static inline void class_simple_device_remove(int devnum) { return; }
 #endif
 
@@ -298 +300 @@
 #define ssleep(x) msleep((unsigned int)(x) * 1000)
 #endif
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#define snd_card_set_dev(card,dev) /* no struct device */
 #endif
 

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

@@ -506 +506 @@
         { restore_flags(flags); }
 
-#ifndef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
-#define pci_set_consistent_dma_mask(p,x) pci_set_dma_mask(p,x)
-#endif
-
 struct completion {
         unsigned int done;

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

@@ -175 +175 @@
 #endif
 
-#ifndef snd_card_set_dev
-#define snd_card_set_dev(card,devptr) ((card)->dev = (devptr))
-#endif
-
 /* for easier backward-porting */
 #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)

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

@@ -310 +310 @@
 int snd_card_file_remove(struct snd_card *card, struct file *file);
 
+#ifndef snd_card_set_dev
+#define snd_card_set_dev(card,devptr) ((card)->dev = (devptr))
+#endif
+
 /* device.c */
 
@@ -333 +337 @@
 int snd_task_name(struct task_struct *task, char *name, size_t size);
 #ifdef CONFIG_SND_VERBOSE_PRINTK
-void snd_verbose_printk(const char *file, int line, const char *format, ...);
+void snd_verbose_printk(const char *file, int line, const char *format, ...)
+     __attribute__ ((format (printf, 3, 4)));
 #endif
 #if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK)
-void snd_verbose_printd(const char *file, int line, const char *format, ...);
+void snd_verbose_printd(const char *file, int line, const char *format, ...)
+     __attribute__ ((format (printf, 3, 4)));
 #endif
 

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

@@ -114 +114 @@
 void snd_emu8000_update_reverb_mode(emu8000_t *emu);
 void snd_emu8000_update_equalizer(emu8000_t *emu);
-int snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void *buf, long len);
-int snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void *buf, long len);
+int snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void __user *buf, long len);
+int snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void __user *buf, long len);
 
 #endif /* __SOUND_EMU8000_H */

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

@@ -411 +411 @@
         struct snd_info_entry *proc_xrun_debug_entry;
 #endif
+#ifdef CONFIG_SND_DEBUG
+        unsigned int xrun_debug: 1;
+        snd_info_entry_t *proc_xrun_debug_entry;
+#endif
 };
 

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

@@ -1 +1 @@
 /* include/version.h.  Generated by configure.  */
-#define CONFIG_SND_VERSION "1.0.1"
+#define CONFIG_SND_VERSION "1.0.2"
 #define CONFIG_SND_DATE ""

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

@@ -211 +211 @@
                 return error;
         }
+        snd_card_set_dev(card, &pcard->card->dev);
 
         if ((error = snd_ad1816a_create(card, port[dev],
@@ -220 +221 @@
                 return error;
         }
+
+        strcpy(card->driver, "AD1816A");
+        strcpy(card->shortname, "ADI SoundPort AD1816A");
+        sprintf(card->longname, "%s, SS at 0x%lx, irq %d, dma %d&%d",
+                card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
 
         if ((error = snd_ad1816a_pcm(chip, 0, NULL)) < 0) {
@@ -255 +261 @@
         }
 
-        strcpy(card->driver, "AD1816A");
-        strcpy(card->shortname, "ADI SoundPort AD1816A");
-        sprintf(card->longname, "%s soundcard, SS at 0x%lx, irq %d, dma %d&%d",
-                card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
-
         if ((error = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -594 +594 @@
 
         if ((chip->res_port = request_region(port, 16, "AD1816A")) == NULL) {
+                snd_printk(KERN_ERR "ad1816a: can't grab port 0x%lx\n", port);
                 snd_ad1816a_free(chip);
                 return -EBUSY;
         }
         if (request_irq(irq, snd_ad1816a_interrupt, SA_INTERRUPT, "AD1816A", (void *) chip)) {
+                snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);
                 snd_ad1816a_free(chip);
                 return -EBUSY;
@@ -603 +605 @@
         chip->irq = irq;
         if (request_dma(dma1, "AD1816A - 1")) {
+                snd_printk(KERN_ERR "ad1816a: can't grab DMA1 %d\n", dma1);
                 snd_ad1816a_free(chip);
                 return -EBUSY;
@@ -608 +611 @@
         chip->dma1 = dma1;
         if (request_dma(dma2, "AD1816A - 2")) {
+                snd_printk(KERN_ERR "ad1816a: can't grab DMA2 %d\n", dma2);
                 snd_ad1816a_free(chip);
                 return -EBUSY;

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

@@ -953 +953 @@
         
         if ((chip->res_port = request_region(port, 4, "AD1848")) == NULL) {
+                snd_printk(KERN_ERR "ad1848: can't grab port 0x%lx\n", port);
                 snd_ad1848_free(chip);
                 return -EBUSY;
         }
         if (request_irq(irq, snd_ad1848_interrupt, SA_INTERRUPT, "AD1848", (void *) chip)) {
+                snd_printk(KERN_ERR "ad1848: can't grab IRQ %d\n", irq);
                 snd_ad1848_free(chip);
                 return -EBUSY;
@@ -962 +964 @@
         chip->irq = irq;
         if (request_dma(dma, "AD1848")) {
+                snd_printk(KERN_ERR "ad1848: can't grab DMA %d\n", dma);
                 snd_ad1848_free(chip);
                 return -EBUSY;

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

@@ -229 +229 @@
                 return error;
         }
+        snd_card_set_dev(card, &pcard->card->dev);
 
         if ((error = snd_sbdsp_create(card, port[dev],
@@ -239 +240 @@
                 return error;
         }
+
+        strcpy(card->driver, "ALS100");
+        strcpy(card->shortname, "Avance Logic ALS100");
+        sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d",
+                card->shortname, chip->name, chip->port,
+                irq[dev], dma8[dev], dma16[dev]);
 
         if ((error = snd_sb16dsp_pcm(chip, 0, NULL)) < 0) {
@@ -276 +283 @@
         }
 
-        strcpy(card->driver, "ALS100");
-        strcpy(card->shortname, "Avance Logic ALS100");
-        sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d&%d",
-                card->shortname, chip->name, chip->port,
-                irq[dev], dma8[dev], dma16[dev]);
         if ((error = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -256 +256 @@
                 return error;
         }
+        snd_card_set_dev(card, &pcard->card->dev);
 
         if ((error = snd_card_azt2320_enable_wss(port[dev]))) {
@@ -270 +271 @@
                 return error;
         }
+
+        strcpy(card->driver, "AZT2320");
+        strcpy(card->shortname, "Aztech AZT2320");
+        sprintf(card->longname, "%s, WSS at 0x%lx, irq %i, dma %i&%i",
+                card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
 
         if ((error = snd_cs4231_pcm(chip, 0, NULL)) < 0) {
@@ -310 +316 @@
         }
 
-        strcpy(card->driver, "AZT2320");
-        strcpy(card->shortname, "Aztech AZT2320");
-        sprintf(card->longname, "%s soundcard, WSS at 0x%lx, irq %i, dma %i&%i",
-                card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
-
         if ((error = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -486 +486 @@
 
 #ifdef CONFIG_PNP
-        if (isapnp[dev] && (err = snd_cmi8330_pnp(dev, acard, pcard, pid)) < 0) {
+        if (isapnp[dev]) {
+                if ((err = snd_cmi8330_pnp(dev, acard, pcard, pid)) < 0) {
                 snd_printk("PnP detection failed\n");
                 snd_card_free(card);
                 return err;
+        }
+                snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif

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

@@ -118 +118 @@
                 return err;
         }
+
+        strcpy(card->driver, "CS4231");
+        strcpy(card->shortname, pcm->name);
+        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
+                pcm->name, chip->port, irq[dev], dma1[dev]);
+        if (dma2[dev] >= 0)
+                sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
+
         if ((err = snd_cs4231_mixer(chip)) < 0) {
                 snd_card_free(card);
@@ -137 +145 @@
                         printk(KERN_ERR "cs4231: MPU401 not detected\n");
         }
-        strcpy(card->driver, "CS4231");
-        strcpy(card->shortname, pcm->name);
-        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
-                pcm->name, chip->port, irq[dev], dma1[dev]);
-        if (dma2[dev] >= 0)
-                sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -1532 +1532 @@
 
         if ((chip->res_port = request_region(port, 4, "CS4231")) == NULL) {
+                snd_printk(KERN_ERR "cs4231: can't grab port 0x%lx\n", port);
                 snd_cs4231_free(chip);
                 return -EBUSY;
@@ -1537 +1538 @@
         chip->port = port;
         if ((long)cport >= 0 && (chip->res_cport = request_region(cport, 8, "CS4232 Control")) == NULL) {
+                snd_printk(KERN_ERR "cs4231: can't grab control port 0x%lx\n", cport);
                 snd_cs4231_free(chip);
                 return -ENODEV;
@@ -1542 +1544 @@
         chip->cport = cport;
         if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt, SA_INTERRUPT, "CS4231", (void *) chip)) {
+                snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq);
                 snd_cs4231_free(chip);
                 return -EBUSY;
@@ -1547 +1550 @@
         chip->irq = irq;
         if (!(hwshare & CS4231_HWSHARE_DMA1) && request_dma(dma1, "CS4231 - 1")) {
+                snd_printk(KERN_ERR "cs4231: can't grab DMA1 %d\n", dma1);
                 snd_cs4231_free(chip);
                 return -EBUSY;
@@ -1552 +1556 @@
         chip->dma1 = dma1;
         if (!(hwshare & CS4231_HWSHARE_DMA2) && dma1 != dma2 && dma2 >= 0 && request_dma(dma2, "CS4231 - 2")) {
+                snd_printk(KERN_ERR "cs4231: can't grab DMA2 %d\n", dma2);
                 snd_cs4231_free(chip);
                 return -EBUSY;

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

@@ -459 +459 @@
         card->private_free = snd_card_cs4236_free;
 #ifdef CONFIG_PNP
-        if (isapnp[dev] && (err = snd_card_cs4236_pnp(dev, acard, pcard, pid))<0) {
+        if (isapnp[dev]) {
+                if ((err = snd_card_cs4236_pnp(dev, acard, pcard, pid))<0) {
                 printk(KERN_ERR "isapnp detection failed and probing for " IDENT " is not supported\n");
                 snd_card_free(card);
                 return -ENXIO;
+        }
+                snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif
@@ -516 +519 @@
         }
 #endif
+        strcpy(card->driver, pcm->name);
+        strcpy(card->shortname, pcm->name);
+        sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i",
+                pcm->name,
+                chip->port,
+                irq[dev],
+                dma1[dev]);
+        if (dma2[dev] >= 0)
+                sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
 
         if ((err = snd_cs4231_timer(chip, 0, NULL)) < 0) {
@@ -544 +556 @@
                         printk(KERN_ERR IDENT ": MPU401 not detected\n");
         }
-        strcpy(card->driver, pcm->name);
-        strcpy(card->shortname, pcm->name);
-        sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i",
-                pcm->name,
-                chip->port,
-                irq[dev],
-                dma1[dev]);
-        if (dma2[dev] >= 0)
-                sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -211 +211 @@
         acard = (struct snd_card_dt019x *)card->private_data;
 
+        snd_card_set_dev(card, &pcard->card->dev);
         if ((error = snd_card_dt019x_pnp(dev, acard, pcard, pid))) {
                 snd_card_free(card);
@@ -226 +227 @@
                 return error;
         }
+
+        strcpy(card->driver, "DT-019X");
+        strcpy(card->shortname, "Diamond Tech. DT-019X");
+        sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d",
+                card->shortname, chip->name, chip->port,
+                irq[dev], dma8[dev]);
 
         if ((error = snd_sb16dsp_pcm(chip, 0, NULL)) < 0) {
@@ -268 +275 @@
         }
 
-        strcpy(card->driver, "DT-019X");
-        strcpy(card->shortname, "Diamond Tech. DT-019X");
-        sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d",
-                card->shortname, chip->name, chip->port,
-                irq[dev], dma8[dev]);
         if ((error = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -135 +135 @@
         }
 
+        strcpy(card->driver, "ES1688");
+        strcpy(card->shortname, pcm->name);
+        sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port, xirq, xdma);
+
         if ((snd_opl3_create(card, chip->port, chip->port + 2, OPL3_HW_OPL3, 0, &opl3)) < 0) {
                 printk(KERN_ERR "es1688: opl3 not detected at 0x%lx\n", chip->port);
@@ -154 +158 @@
                 }
         }
-        strcpy(card->driver, "ES1688");
-        strcpy(card->shortname, pcm->name);
-        sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port, xirq, xdma);
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -660 +660 @@
         
         if ((chip->res_port = request_region(port + 4, 12, "ES1688")) == NULL) {
+                snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4);
                 snd_es1688_free(chip);
                 return -EBUSY;
         }
         if (request_irq(irq, snd_es1688_interrupt, SA_INTERRUPT, "ES1688", (void *) chip)) {
+                snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
                 snd_es1688_free(chip);
                 return -EBUSY;
@@ -669 +671 @@
         chip->irq = irq;
         if (request_dma(dma8, "ES1688")) {
+                snd_printk(KERN_ERR "es1688: can't grab DMA8 %d\n", dma8);
                 snd_es1688_free(chip);
                 return -EBUSY;

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

@@ -1472 +1472 @@
                 chip->ctrl_port += inb(chip->port + 0x05);
 
-                if ((chip->res_ctrl_port = request_region(chip->ctrl_port, 8, "ES18xx - CTRL")) == NULL)
+                if ((chip->res_ctrl_port = request_region(chip->ctrl_port, 8, "ES18xx - CTRL")) == NULL) {
+                        snd_printk(KERN_ERR PFX "unable go grab port 0x%lx\n", chip->ctrl_port);
                         return -EBUSY;
+                }
 
                 return 0;
@@ -2064 +2066 @@
         acard = (struct snd_audiodrive *)card->private_data;
 #ifdef CONFIG_PNP
-        if (isapnp[dev] && (err = snd_audiodrive_pnp(dev, acard, pcard, pid)) < 0) {
+        if (isapnp[dev]) {
+                if ((err = snd_audiodrive_pnp(dev, acard, pcard, pid)) < 0) {
                 snd_card_free(card);
                 return err;
+        }
+                snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif
@@ -2104 +2109 @@
                 return err;
         }
+
+        sprintf(card->driver, "ES%x", chip->version);
+        sprintf(card->shortname, "ESS AudioDrive ES%x", chip->version);
+        if (xdma1 != xdma2)
+                sprintf(card->longname, "%s at 0x%lx, irq %d, dma1 %d, dma2 %d",
+                        card->shortname,
+                        chip->port,
+                        xirq, xdma1, xdma2);
+        else
+                sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
+                        card->shortname,
+                        chip->port,
+                        xirq, xdma1);
+
         if ((err = snd_es18xx_pcm(chip, 0, NULL)) < 0) {
                 snd_card_free(card);
@@ -2145 +2164 @@
         }
 #endif
-        sprintf(card->driver, "ES%x", chip->version);
-        sprintf(card->shortname, "ESS AudioDrive ES%x", chip->version);
-        if (xdma1 != xdma2)
-        sprintf(card->longname, "%s at 0x%lx, irq %d, dma1 %d, dma2 %d",
-                card->shortname,
-                chip->port,
-                xirq, xdma1, xdma2);
-        else
-                sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
-                        card->shortname,
-                        chip->port,
-                        xirq, xdma1);
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);

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

@@ -179 +179 @@
         /* allocate resources */
         if ((gus->gf1.res_port1 = request_region(port, 16, "GUS GF1 (Adlib/SB)")) == NULL) {
+                snd_printk(KERN_ERR "gus: can't grab SB port 0x%lx\n", port);
                 snd_gus_free(gus);
                 return -EBUSY;
         }
         if ((gus->gf1.res_port2 = request_region(port + 0x100, 12, "GUS GF1 (Synth)")) == NULL) {
+                snd_printk(KERN_ERR "gus: can't grab synth port 0x%lx\n", port + 0x100);
                 snd_gus_free(gus);
                 return -EBUSY;
         }
         if (irq >= 0 && request_irq(irq, snd_gus_interrupt, SA_INTERRUPT, "GUS GF1", (void *) gus)) {
+                snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
                 snd_gus_free(gus);
                 return -EBUSY;
@@ -192 +195 @@
         gus->gf1.irq = irq;
         if (request_dma(dma1, "GUS - 1")) {
+                snd_printk(KERN_ERR "gus: can't grab DMA1 %d\n", dma1);
                 snd_gus_free(gus);
                 return -EBUSY;
@@ -198 +202 @@
         if (dma2 >= 0 && dma1 != dma2) {
                 if (request_dma(dma2, "GUS - 2")) {
+                        snd_printk(KERN_ERR "gus: can't grab DMA2 %d\n", dma2);
                         snd_gus_free(gus);
                         return -EBUSY;

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

@@ -245 +245 @@
                 iwcard->i2c_res = request_region(port, 1, "InterWave (I2C bus)");
         }
-        if (iwcard->i2c_res == NULL)
+        if (iwcard->i2c_res == NULL) {
+                snd_printk(KERN_ERR "interwave: can't grab i2c bus port\n");
                 return -ENODEV;
+        }
 
         sprintf(name, "InterWave-%i", card->number);
@@ -712 +714 @@
         card->private_free = snd_interwave_free;
 #ifdef CONFIG_PNP
-        if (isapnp[dev] && snd_interwave_pnp(dev, iwcard, pcard, pid)) {
+        if (isapnp[dev]) {
+                if (snd_interwave_pnp(dev, iwcard, pcard, pid)) {
                 snd_card_free(card);
                 return -ENODEV;
+        }
+                snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif

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

@@ -245 +245 @@
         card = chip->card;
         port = chip->port;
-        if ((chip->res_port = request_region(port, 2, "OPL3-SA control")) == NULL)
+        if ((chip->res_port = request_region(port, 2, "OPL3-SA control")) == NULL) {
+                snd_printk(KERN_ERR "opl3sa2: can't grab port 0x%lx\n", port);
                 return -EBUSY;
+        }
         // snd_printk("REG 0A = 0x%x\n", snd_opl3sa2_read(chip, 0x0a));
         chip->version = 0;
@@ -726 +728 @@
                 goto __error;
 #ifdef CONFIG_PNP
-        if (isapnp[dev] && (err = snd_opl3sa2_pnp(dev, chip, pcard, pid)) < 0)
-                goto __error;
+        if (isapnp[dev]) {
+                if ((err = snd_opl3sa2_pnp(dev, chip, pcard, pid)) < 0)
+                goto __error;
+                snd_card_set_dev(card, &pcard->card->dev);
+        }
 #endif
         chip->ymode = opl3sa3_ymode[dev] & 0x03 ; /* initialise this card from supplied (or default) parameter*/ 
@@ -740 +745 @@
                 goto __error;
         if (request_irq(xirq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2/3", (void *)chip)) {
+                snd_printk(KERN_ERR "opl3sa2: can't grab IRQ %d\n", xirq);
                 err = -ENODEV;
                 goto __error;

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

@@ -1306 +1306 @@
 
         if ((codec->res_port = request_region(chip->wss_base + 4, 4, "OPTI93x CODEC")) == NULL) {
+                snd_printk(KERN_ERR "opti9xx: can't grab port 0x%lx\n", chip->wss_base + 4);
                 snd_opti93x_free(codec);
                 return -EBUSY;
         }
         if (request_dma(dma1, "OPTI93x - 1")) {
+                snd_printk(KERN_ERR "opti9xx: can't grab DMA1 %d\n", dma1);
                 snd_opti93x_free(codec);
                 return -EBUSY;
@@ -1315 +1317 @@
         codec->dma1 = chip->dma1;
         if (request_dma(dma2, "OPTI93x - 2")) {
+                snd_printk(KERN_ERR "opti9xx: can't grab DMA2 %d\n", dma2);
                 snd_opti93x_free(codec);
                 return -EBUSY;
@@ -1321 +1324 @@
 
         if (request_irq(chip->irq, snd_opti93x_interrupt, SA_INTERRUPT, DRIVER_NAME" - WSS", codec)) {
+                snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
           snd_opti93x_free(codec);
           return -EBUSY;
@@ -1970 +1974 @@
                 if (hw <= OPTi9XX_HW_82C930)
                         chip->mc_base -= 0x80;
+                snd_card_set_dev(card, &pcard->card->dev);
         } else {
 #endif  /* CONFIG_PNP */
@@ -2102 +2107 @@
         }
 #endif
+        strcpy(card->driver, chip->name);
+        sprintf(card->shortname, "OPTi %s", card->driver);
+#if defined(CS4231) || defined(OPTi93X)
+        sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d",
+                card->shortname, pcm->name, chip->wss_base + 4,
+                chip->irq, chip->dma1, chip->dma2);
+#else
+        sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d",
+                card->shortname, pcm->name, chip->wss_base + 4,
+                chip->irq, chip->dma1);
+#endif  /* CS4231 || OPTi93X */
 
         if (chip->mpu_port <= 0 || chip->mpu_port == SNDRV_AUTO_PORT)
@@ -2155 +2171 @@
         }
 
-        strcpy(card->driver, chip->name);
-        sprintf(card->shortname, "OPTi %s", card->driver);
-#if defined(CS4231) || defined(OPTi93X)
-        sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d&%d",
-                card->shortname, pcm->name, chip->wss_base + 4,
-                chip->irq, chip->dma1, chip->dma2);
-#else
-        sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d",
-                card->shortname, pcm->name, chip->wss_base + 4,
-                chip->irq, chip->dma1);
-#endif  /* CS4231 || OPTi93X */
         if ((error = snd_card_register(card))) {
                 snd_card_free(card);

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

@@ -656 +656 @@
 
 /*exported*/ int
-snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void *buf, long len)
+snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void __user *buf, long len)
 {
         soundfont_chorus_fx_t rec;
@@ -783 +783 @@
 
 /*exported*/ int
-snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void *buf, long len)
+snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void __user *buf, long len)
 {
         soundfont_reverb_fx_t rec;
@@ -1113 +1113 @@
             !(hw->res_port2 = request_region(hw->port2, 4, "Emu8000-2")) ||
             !(hw->res_port3 = request_region(hw->port3, 4, "Emu8000-3"))) {
+                snd_printk(KERN_ERR "sbawe: can't grab ports 0x%lx, 0x%lx, 0x%lx\n", hw->port1, hw->port2, hw->port3);
                 snd_emu8000_free(hw);
                 return -EBUSY;

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

@@ -37 +37 @@
 static int oss_ioctl(snd_emux_t *emu, int cmd, int p1, int p2);
 #endif
-static int load_fx(snd_emux_t *emu, int type, int mode, const void *buf, long len);
+static int load_fx(snd_emux_t *emu, int type, int mode, const void __user *buf, long len);
 
 static void set_pitch(emu8000_t *hw, snd_emux_voice_t *vp);
@@ -524 +524 @@
 
 static int
-load_fx(snd_emux_t *emu, int type, int mode, const void *buf, long len)
+load_fx(snd_emux_t *emu, int type, int mode, const void __user *buf, long len)
 {
         emu8000_t *hw;

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/emu8000_local.h

@@ -33 +33 @@
 
 /* emu8000_patch.c */
-int snd_emu8000_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr, const void *data, long count);
+int snd_emu8000_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr, const void __user *data, long count);
 int snd_emu8000_sample_free(snd_emux_t *rec, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr);
 void snd_emu8000_sample_reset(snd_emux_t *rec);

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

@@ -83 +83 @@
  */
 static unsigned short
-read_word(const void *buf, int offset, int mode)
+read_word(const void __user *buf, int offset, int mode)
 {
         unsigned short c;
@@ -147 +147 @@
 int
 snd_emu8000_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp,
-                       snd_util_memhdr_t *hdr, const void *data, long count)
+                       snd_util_memhdr_t *hdr, const void __user *data, long count)
 {
         int  i;

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

@@ -72 +72 @@
         emu->midi_devidx = 1;
         emu->linear_panning = 1;
+        emu->hwdep_idx = 2; /* FIXED */
 
         if (snd_emux_register(emu, dev->card, hw->index, "Emu8000") < 0) {

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

@@ -150 +150 @@
                 return error;
         }
+        snd_card_set_dev(card, &pcard->card->dev);
 
         if ((error = snd_sbdsp_create(card, port[dev],

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

@@ -82 +82 @@
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x220,0x240,0x260,0x280 */
-#ifdef TARGET_OS2
-static long mpu_port[SNDRV_CARDS] = {0x330, 0x300, -1,-1,-1,-1,-1,-1};
-#else
-static long mpu_port[SNDRV_CARDS] = {0x330, 0x300,[2 ... (SNDRV_CARDS - 1)] = -1};
-#endif
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x330,0x300 */
 static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
 #ifdef SNDRV_SBAWE_EMU8000
@@ -175 +171 @@
 
 static snd_card_t *snd_sb16_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+
+#ifdef CONFIG_PNP
 
 static struct pnp_card_device_id snd_sb16_pnpids[] = {
@@ -269 +267 @@
 MODULE_DEVICE_TABLE(pnp_card, snd_sb16_pnpids);
 
+#endif /* CONFIG_PNP */
+
 #ifdef SNDRV_SBAWE_EMU8000
 #define DRIVER_NAME     "snd-card-sbawe"
@@ -412 +412 @@
                         return err;
                 }
+                snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif
@@ -484 +485 @@
         }
 
-        if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
-            if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
-                                           chip->mpu_port, 0,
-                                               xirq, 0, &chip->rmidi)) < 0) {
-                snd_card_free(card);
-                return -ENXIO;
-            }
-                chip->rmidi_callback = snd_mpu401_uart_interrupt;
-        }
-
-#ifdef SNDRV_SBAWE_EMU8000
-        if (awe_port[dev] == SNDRV_AUTO_PORT)
-                awe_port[dev] = 0; /* disable */
-#endif
-
-        if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
-                if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,
-                                    OPL3_HW_OPL3,
-                                    fm_port[dev] == port[dev] || fm_port[dev] == 0x388,
-                                &opl3) < 0) {
-                        snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
-                                   fm_port[dev], fm_port[dev] + 2);
-            } else {
-#ifdef SNDRV_SBAWE_EMU8000
-                        int seqdev = awe_port[dev] > 0 ? 2 : 1;
-#else
-                int seqdev = 1;
-#endif
-                if ((err = snd_opl3_hwdep_new(opl3, 0, seqdev, &synth)) < 0) {
-                    snd_card_free(card);
-                    return -ENXIO;
-                }
-            }
-        }
-
-        if ((err = snd_sbmixer_new(chip)) < 0) {
-            snd_card_free(card);
-            return -ENXIO;
-        }
-
-#ifdef CONFIG_SND_SB16_CSP
-        /* CSP chip on SB16ASP/AWE32 */
-        if ((chip->hardware == SB_HW_16) && csp[dev]) {
-                snd_sb_csp_new(chip, synth != NULL ? 1 : 0, &xcsp);
-                if (xcsp) {
-                        chip->csp = xcsp->private_data;
-                chip->hardware = SB_HW_16CSP;
-            } else {
-                        snd_printk(KERN_INFO PFX "warning - CSP chip not detected on soundcard #%i\n", dev + 1);
-            }
-        }
-#endif
-#ifdef SNDRV_SBAWE_EMU8000
-        if (awe_port[dev] > 0) {
-                if (snd_emu8000_new(card, 1, awe_port[dev],
-                                    seq_ports[dev], NULL) < 0) {
-                        snd_printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not detected at 0x%lx\n", awe_port[dev]);
-                snd_card_free(card);
-                return -ENXIO;
-            }
-        }
-#endif
-
-        /* setup Mic AGC */
-        spin_lock_irqsave(&chip->mixer_lock, flags);
-        snd_sbmixer_write(chip, SB_DSP4_MIC_AGC,
-                          (snd_sbmixer_read(chip, SB_DSP4_MIC_AGC) & 0x01) |
-                (mic_agc[dev] ? 0x00 : 0x01));
-        spin_unlock_irqrestore(&chip->mixer_lock, flags);
-
-        strcpy(card->driver, 
+        strcpy(card->driver,
 #ifdef SNDRV_SBAWE_EMU8000
                         awe_port[dev] > 0 ? "SB AWE" :
@@ -569 +500 @@
             sprintf(card->longname + strlen(card->longname), "%s%d",
                         xdma8 >= 0 ? "&" : "", xdma16);
+
+        if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
+                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
+                                               chip->mpu_port, 0,
+                                               xirq, 0, &chip->rmidi)) < 0) {
+                        snd_card_free(card);
+                        return -ENXIO;
+                }
+                chip->rmidi_callback = snd_mpu401_uart_interrupt;
+        }
+
+#ifdef SNDRV_SBAWE_EMU8000
+        if (awe_port[dev] == SNDRV_AUTO_PORT)
+                awe_port[dev] = 0; /* disable */
+#endif
+
+        if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
+                if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,
+                                    OPL3_HW_OPL3,
+                                    acard->fm_res != NULL || fm_port[dev] == port[dev],
+                                    &opl3) < 0) {
+                        snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
+                                   fm_port[dev], fm_port[dev] + 2);
+                } else {
+#ifdef SNDRV_SBAWE_EMU8000
+                        int seqdev = awe_port[dev] > 0 ? 2 : 1;
+#else
+                        int seqdev = 1;
+#endif
+                        if ((err = snd_opl3_hwdep_new(opl3, 0, seqdev, &synth)) < 0) {
+                                snd_card_free(card);
+                                return -ENXIO;
+                        }
+                }
+        }
+
+        if ((err = snd_sbmixer_new(chip)) < 0) {
+                snd_card_free(card);
+                return -ENXIO;
+        }
+
+#ifdef CONFIG_SND_SB16_CSP
+        /* CSP chip on SB16ASP/AWE32 */
+        if ((chip->hardware == SB_HW_16) && csp[dev]) {
+                snd_sb_csp_new(chip, synth != NULL ? 1 : 0, &xcsp);
+                if (xcsp) {
+                        chip->csp = xcsp->private_data;
+                        chip->hardware = SB_HW_16CSP;
+                } else {
+                        snd_printk(KERN_INFO PFX "warning - CSP chip not detected on soundcard #%i\n", dev + 1);
+                }
+        }
+#endif
+#ifdef SNDRV_SBAWE_EMU8000
+        if (awe_port[dev] > 0) {
+                if (snd_emu8000_new(card, 1, awe_port[dev],
+                                    seq_ports[dev], NULL) < 0) {
+                        snd_printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not detected at 0x%lx\n", awe_port[dev]);
+                        snd_card_free(card);
+                        return -ENXIO;
+                }
+        }
+#endif
+
+        /* setup Mic AGC */
+        spin_lock_irqsave(&chip->mixer_lock, flags);
+        snd_sbmixer_write(chip, SB_DSP4_MIC_AGC,
+                (snd_sbmixer_read(chip, SB_DSP4_MIC_AGC) & 0x01) |
+                (mic_agc[dev] ? 0x00 : 0x01));
+        spin_unlock_irqrestore(&chip->mixer_lock, flags);
+
         if ((err = snd_card_register(card)) < 0) {
             snd_card_free(card);

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

@@ -236 +236 @@
                     SA_INTERRUPT | SA_SHIRQ : SA_INTERRUPT,
                     "SoundBlaster", (void *) chip)) {
+                snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
         snd_sbdsp_free(chip);
         return -EBUSY;
@@ -245 +246 @@
 
     if ((chip->res_port = request_region(port, 16, "SoundBlaster")) == NULL) {
+                snd_printk(KERN_ERR "sb: can't grab port 0x%lx\n", port);
         snd_sbdsp_free(chip);
         return -EBUSY;
@@ -251 +253 @@
 #ifdef CONFIG_ISA
     if (dma8 >= 0 && request_dma(dma8, "SoundBlaster - 8bit")) {
+                snd_printk(KERN_ERR "sb: can't grab DMA8 %d\n", dma8);
         snd_sbdsp_free(chip);
         return -EBUSY;
@@ -260 +263 @@
                         dma16 = -1;
                 } else if (request_dma(dma16, "SoundBlaster - 16bit")) {
+                        snd_printk(KERN_ERR "sb: can't grab DMA16 %d\n", dma16);
         snd_sbdsp_free(chip);
         return -EBUSY;

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

@@ -151 +151 @@
                 return -EINVAL;
 
-        if (request_irq(irq, snd_sgalaxy_dummy_interrupt, SA_INTERRUPT, "sgalaxy", NULL))
+        if (request_irq(irq, snd_sgalaxy_dummy_interrupt, SA_INTERRUPT, "sgalaxy", NULL)) {
+                snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq);
                 return -EIO;
+        }
 
         outb(tmp | 0x40, port);

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

@@ -450 +450 @@
 
 #ifdef CONFIG_PNP
-        if (isapnp[dev] && snd_wavefront_pnp (dev, acard, pcard, pid) < 0) {
+        if (isapnp[dev]) {
+                if (snd_wavefront_pnp (dev, acard, pcard, pid) < 0) {
                 if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
                         snd_printk ("isapnp detection failed\n");
@@ -456 +457 @@
                         return -ENODEV;
                 }
+        }
+                snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif /* CONFIG_PNP */

GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/ac97_patch.c

@@ -2161 +2161 @@
         unsigned short misc;
 
-        patch_ad1881(ac97);
         ac97->build_ops = &patch_ad1985_build_ops;
         misc = snd_ac97_read(ac97, AC97_AD_MISC);
@@ -2167 +2166 @@
         /* AD-compatible mode */
         /* Stereo mutes enabled */
+        /* in accordance with ADI driver: misc | 0x5c28 */
         snd_ac97_write_cache(ac97, AC97_AD_MISC, misc |
                              AC97_AD198X_LOSEL |

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

@@ -2116 +2116 @@
         return err;
     /* check, if we can restrict PCI DMA transfers to 31 bits */
-    if (!pci_dma_supported(pci, 0x7fffffff)) {
+        if (pci_set_dma_mask(pci, 0x7fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) {
         snd_printk("architecture does not support 31bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_dma_mask(pci, 0x7fffffff);
 
     if ((codec = kcalloc(1, sizeof(*codec), GFP_KERNEL)) == NULL)

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

@@ -626 +626 @@
     }
     /* check, if we can restrict PCI DMA transfers to 24 bits */
-    if (!pci_dma_supported(pci, 0x00ffffff)) {
+        if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
         snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_dma_mask(pci, 0x00ffffff);
 
     if ((err = pci_request_regions(pci, "ALS4000")) < 0)
@@ -686 +686 @@
     chip->pci = pci;
     chip->alt_port = gcr;
+        snd_card_set_dev(card, &pci->dev);
 
     snd_als4000_configure(chip);
+
+        strcpy(card->driver, "ALS4000");
+        strcpy(card->shortname, "Avance Logic ALS4000");
+        sprintf(card->longname, "%s at 0x%lx, irq %i",
+                card->shortname, chip->alt_port, chip->irq);
 
     if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000,
@@ -723 +729 @@
         }
 #endif
-    strcpy(card->driver, "ALS4000");
-    strcpy(card->shortname, "Avance Logic ALS4000");
-    sprintf(card->longname, "%s at 0x%lx, irq %i",
-            card->shortname, chip->alt_port, chip->irq);
 
     if ((err = snd_card_register(card)) < 0) {

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

@@ -1549 +1549 @@
     runtime->hw.channels_max = cm->max_channels;
     snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
+        cm->dig_pcm_status = cm->dig_status;
     return 0;
 }
@@ -3005 +3006 @@
         }
 #endif
+        snd_card_set_dev(card, &pci->dev);
+
     *rcmipci = cm;
     return 0;
@@ -3206 +3209 @@
 
 /* format is: snd-cmipci=enable,index,id,
-                         mpu_port,fm_port,soft_ac3,joystick */
+                         mpu_port,fm_port,soft_ac3,joystick_port */
 
 static int __init alsa_card_cmipci_setup(char *str)
@@ -3223 +3226 @@
 #endif
 #ifdef SUPPORT_JOYSTICK
-               && get_option(&str,&joystick[nr_dev]) == 2
+               && get_option(&str,&joystick_port[nr_dev]) == 2
 #endif
                );

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

@@ -1447 +1447 @@
     }
 
+        snd_card_set_dev(card, &pci->dev);
+
     *rchip = chip;
     return 0;

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

@@ -539 +539 @@
  * copy_from_user(blk + offset, data, size)
  */
-int snd_emu10k1_synth_copy_from_user(struct snd_emu10k1 *emu, snd_util_memblk_t *blk, int offset, const char *data, int size)
+int snd_emu10k1_synth_copy_from_user(struct snd_emu10k1 *emu, snd_util_memblk_t *blk, int offset, const char __user *data, int size)
 {
         int page, nextofs, end_offset, temp, temp1;

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

@@ -2573 +2573 @@
                                        es1968_t **chip_ret)
 {
-#ifdef TARGET_OS2
     static snd_device_ops_t ops = {
                 .dev_free =     snd_es1968_dev_free,
     };
-#else
-    static snd_device_ops_t ops = {
-    dev_free:       snd_es1968_dev_free,
-    };
-#endif
     es1968_t *chip;
     int i, err;
@@ -2591 +2585 @@
         return err;
     /* check, if we can restrict PCI DMA transfers to 28 bits */
-    if (!pci_dma_supported(pci, 0x0fffffff)) {
+        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
         snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_consistent_dma_mask(pci, 0x0fffffff);
 
     chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
@@ -2669 +2663 @@
         return err;
     }
+
+        snd_card_set_dev(card, &pci->dev);
 
     *chip_ret = chip;

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

@@ -176 +176 @@
 }
 
+static int __init alsa_ice1712_akm4xxx_module_init(void)
+{
+        return 0;
+}
+        
+static void __exit alsa_ice1712_akm4xxx_module_exit(void)
+{
+}
+        
+module_init(alsa_ice1712_akm4xxx_module_init)
+module_exit(alsa_ice1712_akm4xxx_module_exit)
+
 EXPORT_SYMBOL(snd_ice1712_akm4xxx_init);
 EXPORT_SYMBOL(snd_ice1712_akm4xxx_free);

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

@@ -2364 +2364 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (!pci_dma_supported(pci, 0x0fffffff)) {
+        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
                 snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
                 return -ENXIO;
         }
-        pci_set_consistent_dma_mask(pci, 0x0fffffff);
 
         ice = snd_magic_kcalloc(ice1712_t, 0, GFP_KERNEL);
@@ -2446 +2446 @@
         }
 
+        snd_card_set_dev(card, &pci->dev);
+
         *r_ice1712 = ice;
         return 0;

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

@@ -1802 +1802 @@
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        pci_set_consistent_dma_mask(pci, 0xffffffff); 
 
         ice = snd_magic_kcalloc(ice1712_t, 0, GFP_KERNEL);
@@ -1866 +1865 @@
         }
 
+        snd_card_set_dev(card, &pci->dev);
+
         *r_ice1712 = ice;
         return 0;

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

@@ -778 +778 @@
 }
 
+#ifdef __i386__
+/*
+ * Intel 82443MX running a 100MHz processor system bus has a hardware bug,
+ * which aborts PCI busmaster for audio transfer.  A workaround is to set
+ * the pages as non-cached.  For details, see the errata in
+ *      http://www.intel.com/design/chipsets/specupdt/245051.htm
+ */
+static void fill_nocache(void *buf, int size, int nocache)
+{
+        size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        change_page_attr(virt_to_page(buf), size, nocache ? PAGE_KERNEL_NOCACHE : PAGE_KERNEL);
+        global_flush_tlb();
+}
+#else
+#define fill_nocache(buf,size,nocache)
+#endif
+
 /*
  *  Interrupt handler
@@ -980 +997 @@
     struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     struct ichdev *ichdev = get_ichdev(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        size_t size = params_buffer_bytes(hw_params);
     int dbl = params_rate(hw_params) > 48000;
     int err;
 
+        if (chip->fix_nocache && runtime->dma_area && runtime->dma_bytes < size)
+                fill_nocache(runtime->dma_area, runtime->dma_bytes, 0); /* clear */
     err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
     if (err < 0)
         return err;
+        if (chip->fix_nocache && err > 0)
+                fill_nocache(runtime->dma_area, runtime->dma_bytes, 1);
     if (ichdev->pcm_open_flag) {
         snd_ac97_pcm_close(ichdev->pcm);
@@ -1004 +1027 @@
 static int snd_intel8x0_hw_free(snd_pcm_substream_t * substream)
 {
+        struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     struct ichdev *ichdev = get_ichdev(substream);
 
@@ -1010 +1034 @@
         ichdev->pcm_open_flag = 0;
     }
+        if (chip->fix_nocache && substream->runtime->dma_area)
+                fill_nocache(substream->runtime->dma_area, substream->runtime->dma_bytes, 0);
     return snd_pcm_lib_free_pages(substream);
 }
@@ -2958 +2984 @@
     /* tables must be aligned to 8 bytes here, but the kernel pages
      are much bigger, so we don't care (on i386) */
-
+        /* workaround for 440MX */
+        if (chip->fix_nocache)
+                fill_nocache(chip->bdbars, chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2, 1);
     int_sta_masks = 0;
     for (i = 0; i < chip->bdbars_count; i++) {
@@ -3018 +3046 @@
         return err;
     }
+
+        snd_card_set_dev(card, &pci->dev);
 
     *r_intel8x0 = chip;

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

@@ -2462 +2462 @@
         }
         
+        snd_card_set_dev(card, &pci->dev);
+
         * rchip = korg1212;
         return 0;

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

@@ -2706 +2706 @@
 
     /* check, if we can restrict PCI DMA transfers to 28 bits */
-    if (!pci_dma_supported(pci, 0x0fffffff)) {
+        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
         snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_consistent_dma_mask(pci, 0x0fffffff);
 
     chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
@@ -2829 +2829 @@
     snd_m3_enable_ints(chip);
     snd_m3_assp_continue(chip);
+
+        snd_card_set_dev(card, &pci->dev);
 
     *chip_ret = chip;

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

@@ -2511 +2511 @@
         rme96->card = card;
         rme96->pci = pci;
+        snd_card_set_dev(card, &pci->dev);
         if ((err = snd_rme96_create(rme96)) < 0) {
                 snd_card_free(card);

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

@@ -4986 +4986 @@
         
         pci_read_config_word(hdsp->pci, PCI_CLASS_REVISION, &hdsp->firmware_rev);
+        
+        /* From Martin Bjoernsen :
+            "It is important that the card's latency timer register in
+            the PCI configuration space is set to a value much larger
+            than 0 by the computer's BIOS or the driver.
+            The windows driver always sets this 8 bit register [...]
+            to its maximum 255 to avoid problems with some computers."
+        */
+        pci_write_config_byte(hdsp->pci, PCI_LATENCY_TIMER, 0xFF);
+        
         strcpy(card->driver, "H-DSP");
         strcpy(card->mixername, "Xilinx FPGA");
@@ -5148 +5158 @@
         hdsp->dev = dev;
         hdsp->pci = pci;
+        snd_card_set_dev(card, &pci->dev);
 
         if ((err = snd_hdsp_create(card, hdsp, precise_ptr[dev])) < 0) {

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

@@ -2706 +2706 @@
         rme9652->dev = dev;
         rme9652->pci = pci;
+        snd_card_set_dev(card, &pci->dev);
 
         if ((err = snd_rme9652_create(card, rme9652, precise_ptr[dev])) < 0) {

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

@@ -1254 +1254 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (!pci_dma_supported(pci, 0x00ffffff)) {
+        if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
                 snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
                 return -ENXIO;
         }
-        pci_set_consistent_dma_mask(pci, 0x00ffffff);
 
         sonic = snd_magic_kcalloc(sonicvibes_t, 0, GFP_KERNEL);
@@ -1389 +1389 @@
         }
 
+        snd_card_set_dev(card, &pci->dev);
+
         *rsonic = sonic;
         return 0;
@@ -1472 +1474 @@
                 return err;
         }
-        if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_sonicvibes_mixer(sonic)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
-                                       sonic->midi_port, 1,
-                                       sonic->irq, 0,
-                                       &midi_uart)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        snd_sonicvibes_midi(sonic, midi_uart);
-        if ((err = snd_opl3_create(card, sonic->synth_port,
-                                   sonic->synth_port + 2,
-                                   OPL3_HW_OPL3_SV, 1, &opl3)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
-        sonic->gameport.io = sonic->game_port;
-        gameport_register_port(&sonic->gameport);
-#endif
+
         strcpy(card->driver, "SonicVibes");
         strcpy(card->shortname, "S3 SonicVibes");
@@ -1509 +1482 @@
                 pci_resource_start(pci, 1),
                 sonic->irq);
+
+        if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_sonicvibes_mixer(sonic)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
+                                       sonic->midi_port, 1,
+                                       sonic->irq, 0,
+                                       &midi_uart)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        snd_sonicvibes_midi(sonic, midi_uart);
+        if ((err = snd_opl3_create(card, sonic->synth_port,
+                                   sonic->synth_port + 2,
+                                   OPL3_HW_OPL3_SV, 1, &opl3)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+        sonic->gameport.io = sonic->game_port;
+        gameport_register_port(&sonic->gameport);
+#endif
 
         if ((err = snd_card_register(card)) < 0) {

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

@@ -3540 +3540 @@
         return err;
     /* check, if we can restrict PCI DMA transfers to 30 bits */
-    if (!pci_dma_supported(pci, 0x3fffffff)) {
+        if (pci_set_dma_mask(pci, 0x3fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) {
         snd_printk("architecture does not support 30bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_dma_mask(pci, 0x3fffffff);
 
     trident = kcalloc(1, sizeof(*trident), GFP_KERNEL);
@@ -3640 +3640 @@
         return err;
     }
+        snd_card_set_dev(card, &pci->dev);
     *rtrident = trident;
     return 0;

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

@@ -316 +316 @@
         }
 #endif
-        strcpy(card->driver, str);
-        sprintf(card->shortname, "Yamaha DS-XG PCI (%s)", str);
-        sprintf(card->longname, "%s at 0x%lx, irq %i",
-                card->shortname,
-                chip->reg_area_phys,
-                chip->irq);
 
         if ((err = snd_card_register(card)) < 0) {