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

Timestamp:

Jul 26, 2007, 7:21:09 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.1

File:

• GPL/branches/alsa-resync1/alsa-kernel/isa/sb/sb16.c (modified) (7 diffs)

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

@@ -200 +200 @@
     { \
     ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-    devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), } \
+                .devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), } \
     }
 #define ISAPNP_SBAWE(_va, _vb, _vc, _device, _audio, _awe) \
     { \
     ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-    devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
+                .devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
     ISAPNP_DEVICE_ID(_va, _vb, _vc, _awe), } \
     }
@@ -214 +214 @@
     /* Sound Blaster 16 PnP */
     ISAPNP_SB16('C','T','L',0x0024,0x0031),
+        /* Sound Blaster 16 PnP */
+        ISAPNP_SB16('C','T','L',0x0025,0x0031),
     /* Sound Blaster 16 PnP */
     ISAPNP_SB16('C','T','L',0x0026,0x0031),
@@ -235 +237 @@
     /* Sound Blaster Vibra16CL - added by ctm@ardi.com */
     ISAPNP_SB16('C','T','L',0x0080,0x0041),
+        /* Sound Blaster 16 'value' PnP. It says model ct4130 on the pcb, */
+        /* but ct4131 on a sticker on the board.. */
+        ISAPNP_SB16('C','T','L',0x0086,0x0041),
     /* Sound Blaster Vibra16X */
     ISAPNP_SB16('C','T','L',0x00f0,0x0043),
@@ -664 +669 @@
                 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");
+                printk(KERN_ERR "In case, if you have non-AWE card, try snd-sb16 module\n");
+#else
+                printk(KERN_ERR "In case, if you have AWE card, try snd-sbawe module\n");
 #endif
 #endif
@@ -697 +702 @@
         static unsigned __initdata nr_dev = 0;
         int __attribute__ ((__unused__)) pnp = INT_MAX;
-        int __attribute__ ((__unused__)) csp = INT_MAX;
+        int __attribute__ ((__unused__)) xcsp = INT_MAX;
 
         if (nr_dev >= SNDRV_CARDS)
@@ -714 +719 @@
 #ifdef CONFIG_SND_SB16_CSP
                &&
-               get_option(&str,&csp[nr_dev]) == 2
+               get_option(&str,&xcsp) == 2
 #endif
 #ifdef SNDRV_SBAWE_EMU8000
@@ -727 +732 @@
 #endif
 #ifdef CONFIG_SND_SB16_CSP
-        if (csp != INT_MAX)
-                csp[nr_dev] = csp;
+        if (xcsp != INT_MAX)
+                csp[nr_dev] = xcsp;
 #endif
         nr_dev++;