[ALSA] Add identification for Live 5.1 [SB0220]

[pandora-kernel.git] / sound / pci / emu10k1 / emu10k1_main.c

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 6dca381..e69d5b7 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -616,6 +616,7 @@ static int snd_emu10k1_dev_free(snd_device_t *device)
 
 static emu_chip_details_t emu_chip_details[] = {
        /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/
+       /* Tested by James@superbug.co.uk 3rd July 2005 */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
         .driver = "Audigy2", .name = "Audigy 2 Value [SB0400]", 
         .id = "Audigy2",
@@ -629,6 +630,14 @@ static emu_chip_details_t emu_chip_details[] = {
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .ac97_chip = 1} ,
+       /* Tested by James@superbug.co.uk 8th July 2005. No sound available yet. */
+       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
+        .driver = "Audigy2", .name = "E-mu 1212m [4001]", 
+        .id = "EMU1212m",
+        .emu10k2_chip = 1,
+        .ca0102_chip = 1,
+        .ecard = 1} ,
+       /* Tested by James@superbug.co.uk 3rd July 2005 */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
         .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]", 
         .id = "Audigy2",
@@ -689,18 +698,18 @@ static emu_chip_details_t emu_chip_details[] = {
         .ca0151_chip = 1,
         .spdif_bug = 1,
         .ac97_chip = 1} ,
-       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10020052,
-        .driver = "Audigy", .name = "Audigy 1 ES [SB0160]", 
+       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102,
+        .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
         .id = "Audigy",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
-        .spdif_bug = 1,
         .ac97_chip = 1} ,
-       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102,
-        .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
+       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00521102,
+        .driver = "Audigy", .name = "Audigy 1 ES [SB0160]", 
         .id = "Audigy",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
+        .spdif_bug = 1,
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102,
         .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
@@ -732,12 +741,20 @@ static emu_chip_details_t emu_chip_details[] = {
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
+       /* Tested by Thomas Zehetbauer 27th Aug 2005 */
+       {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102,
+        .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", 
+        .id = "Live",
+        .emu10k1_chip = 1,
+        .ac97_chip = 1,
+        .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
         .driver = "EMU10K1", .name = "SB Live 5.1", 
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
+       /* Tested by alsa bugtrack user "hus" 12th Sept 2005 */
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
         .driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]", 
         .id = "Live",
@@ -773,6 +790,7 @@ static emu_chip_details_t emu_chip_details[] = {
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
+       /* Tested by James@superbug.co.uk 3rd July 2005 */
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
         .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", 
         .id = "Live",
@@ -829,6 +847,7 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
                       unsigned short extout_mask,
                       long max_cache_bytes,
                       int enable_ir,
+                      uint subsystem,
                       emu10k1_t ** remu)
 {
        emu10k1_t *emu;
@@ -874,10 +893,16 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
 
        for (c = emu_chip_details; c->vendor; c++) {
                if (c->vendor == pci->vendor && c->device == pci->device) {
-                       if (c->subsystem && c->subsystem != emu->serial)
-                               continue;
-                       if (c->revision && c->revision != emu->revision)
-                               continue;
+                       if (subsystem) {
+                               if (c->subsystem && (c->subsystem == subsystem) ) {
+                                       break;
+                               } else continue;
+                       } else {
+                               if (c->subsystem && (c->subsystem != emu->serial) )
+                                       continue;
+                               if (c->revision && c->revision != emu->revision)
+                                       continue;
+                       }
                        break;
                }
        }
@@ -888,10 +913,14 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
                return -ENOENT;
        }
        emu->card_capabilities = c;
-       if (c->subsystem != 0)
+       if (c->subsystem && !subsystem)
                snd_printdd("Sound card name=%s\n", c->name);
-       else
-               snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x\n", c->name, pci->vendor, pci->device, emu->serial);
+       else if (subsystem) 
+               snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x. Forced to subsytem=0x%x\n",
+                       c->name, pci->vendor, pci->device, emu->serial, c->subsystem);
+       else 
+               snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x.\n",
+                       c->name, pci->vendor, pci->device, emu->serial);
        
        if (!*card->id && c->id) {
                int i, n = 0;