diff options
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 146 |
1 files changed, 76 insertions, 70 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 2f283ea6ad9a..423aa0de1fad 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -1292,21 +1292,6 @@ static int snd_emu10k1_dev_free(struct snd_device *device) | |||
1292 | } | 1292 | } |
1293 | 1293 | ||
1294 | static struct snd_emu_chip_details emu_chip_details[] = { | 1294 | static struct snd_emu_chip_details emu_chip_details[] = { |
1295 | /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/ | ||
1296 | /* Tested by James@superbug.co.uk 3rd July 2005 */ | ||
1297 | /* DSP: CA0108-IAT | ||
1298 | * DAC: CS4382-KQ | ||
1299 | * ADC: Philips 1361T | ||
1300 | * AC97: STAC9750 | ||
1301 | * CA0151: None | ||
1302 | */ | ||
1303 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102, | ||
1304 | .driver = "Audigy2", .name = "Audigy 2 Value [SB0400]", | ||
1305 | .id = "Audigy2", | ||
1306 | .emu10k2_chip = 1, | ||
1307 | .ca0108_chip = 1, | ||
1308 | .spk71 = 1, | ||
1309 | .ac97_chip = 1} , | ||
1310 | /* Audigy4 (Not PRO) SB0610 */ | 1295 | /* Audigy4 (Not PRO) SB0610 */ |
1311 | /* Tested by James@superbug.co.uk 4th April 2006 */ | 1296 | /* Tested by James@superbug.co.uk 4th April 2006 */ |
1312 | /* A_IOCFG bits | 1297 | /* A_IOCFG bits |
@@ -1346,20 +1331,37 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1346 | * CA0151: None | 1331 | * CA0151: None |
1347 | */ | 1332 | */ |
1348 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10211102, | 1333 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10211102, |
1349 | .driver = "Audigy2", .name = "Audigy 4 [SB0610]", | 1334 | .driver = "Audigy2", .name = "SB Audigy 4 [SB0610]", |
1350 | .id = "Audigy2", | 1335 | .id = "Audigy2", |
1351 | .emu10k2_chip = 1, | 1336 | .emu10k2_chip = 1, |
1352 | .ca0108_chip = 1, | 1337 | .ca0108_chip = 1, |
1353 | .spk71 = 1, | 1338 | .spk71 = 1, |
1354 | .adc_1361t = 1, /* 24 bit capture instead of 16bit */ | 1339 | .adc_1361t = 1, /* 24 bit capture instead of 16bit */ |
1355 | .ac97_chip = 1} , | 1340 | .ac97_chip = 1} , |
1341 | /* Audigy 2 Value AC3 out does not work yet. | ||
1342 | * Need to find out how to turn off interpolators. | ||
1343 | */ | ||
1344 | /* Tested by James@superbug.co.uk 3rd July 2005 */ | ||
1345 | /* DSP: CA0108-IAT | ||
1346 | * DAC: CS4382-KQ | ||
1347 | * ADC: Philips 1361T | ||
1348 | * AC97: STAC9750 | ||
1349 | * CA0151: None | ||
1350 | */ | ||
1351 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102, | ||
1352 | .driver = "Audigy2", .name = "SB Audigy 2 Value [SB0400]", | ||
1353 | .id = "Audigy2", | ||
1354 | .emu10k2_chip = 1, | ||
1355 | .ca0108_chip = 1, | ||
1356 | .spk71 = 1, | ||
1357 | .ac97_chip = 1} , | ||
1356 | /* Audigy 2 ZS Notebook Cardbus card.*/ | 1358 | /* Audigy 2 ZS Notebook Cardbus card.*/ |
1357 | /* Tested by James@superbug.co.uk 6th November 2006 */ | 1359 | /* Tested by James@superbug.co.uk 6th November 2006 */ |
1358 | /* Audio output 7.1/Headphones working. | 1360 | /* Audio output 7.1/Headphones working. |
1359 | * Digital output working. (AC3 not checked, only PCM) | 1361 | * Digital output working. (AC3 not checked, only PCM) |
1360 | * Audio Mic/Line inputs working. | 1362 | * Audio Mic/Line inputs working. |
1361 | * Digital input not tested. | 1363 | * Digital input not tested. |
1362 | */ | 1364 | */ |
1363 | /* DSP: Tina2 | 1365 | /* DSP: Tina2 |
1364 | * DAC: Wolfson WM8768/WM8568 | 1366 | * DAC: Wolfson WM8768/WM8568 |
1365 | * ADC: Wolfson WM8775 | 1367 | * ADC: Wolfson WM8775 |
@@ -1386,7 +1388,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1386 | * | 1388 | * |
1387 | */ | 1389 | */ |
1388 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102, | 1390 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102, |
1389 | .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]", | 1391 | .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]", |
1390 | .id = "Audigy2", | 1392 | .id = "Audigy2", |
1391 | .emu10k2_chip = 1, | 1393 | .emu10k2_chip = 1, |
1392 | .ca0108_chip = 1, | 1394 | .ca0108_chip = 1, |
@@ -1396,7 +1398,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1396 | .spk71 = 1} , | 1398 | .spk71 = 1} , |
1397 | /* Tested by James@superbug.co.uk 4th Nov 2007. */ | 1399 | /* Tested by James@superbug.co.uk 4th Nov 2007. */ |
1398 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102, | 1400 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102, |
1399 | .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]", | 1401 | .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]", |
1400 | .id = "EMU1010", | 1402 | .id = "EMU1010", |
1401 | .emu10k2_chip = 1, | 1403 | .emu10k2_chip = 1, |
1402 | .ca0108_chip = 1, | 1404 | .ca0108_chip = 1, |
@@ -1404,47 +1406,50 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1404 | .spk71 = 1 , | 1406 | .spk71 = 1 , |
1405 | .emu_model = EMU_MODEL_EMU1616}, | 1407 | .emu_model = EMU_MODEL_EMU1616}, |
1406 | /* Tested by James@superbug.co.uk 4th Nov 2007. */ | 1408 | /* Tested by James@superbug.co.uk 4th Nov 2007. */ |
1409 | /* This is MAEM8960, 0202 is MAEM 8980 */ | ||
1407 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102, | 1410 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102, |
1408 | .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM????]", | 1411 | .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM8960]", |
1409 | .id = "EMU1010", | 1412 | .id = "EMU1010", |
1410 | .emu10k2_chip = 1, | 1413 | .emu10k2_chip = 1, |
1411 | .ca0108_chip = 1, | 1414 | .ca0108_chip = 1, |
1412 | .spk71 = 1, | 1415 | .spk71 = 1, |
1413 | .emu_model = EMU_MODEL_EMU1010B}, | 1416 | .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 new revision */ |
1414 | /* Tested by James@superbug.co.uk 8th July 2005. */ | 1417 | /* Tested by James@superbug.co.uk 8th July 2005. */ |
1418 | /* This is MAEM8810, 0202 is MAEM8820 */ | ||
1415 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102, | 1419 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102, |
1416 | .driver = "Audigy2", .name = "E-mu 1010 [4001]", | 1420 | .driver = "Audigy2", .name = "E-mu 1010 [MAEM8810]", |
1417 | .id = "EMU1010", | 1421 | .id = "EMU1010", |
1418 | .emu10k2_chip = 1, | 1422 | .emu10k2_chip = 1, |
1419 | .ca0102_chip = 1, | 1423 | .ca0102_chip = 1, |
1420 | .spk71 = 1, | 1424 | .spk71 = 1, |
1421 | .emu_model = EMU_MODEL_EMU1010}, /* Emu 1010 */ | 1425 | .emu_model = EMU_MODEL_EMU1010}, /* EMU 1010 old revision */ |
1422 | /* EMU0404b */ | 1426 | /* EMU0404b */ |
1423 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102, | 1427 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102, |
1424 | .driver = "Audigy2", .name = "E-mu 0404b [4002]", | 1428 | .driver = "Audigy2", .name = "E-mu 0404b PCI [MAEM8852]", |
1425 | .id = "EMU0404", | 1429 | .id = "EMU0404", |
1426 | .emu10k2_chip = 1, | 1430 | .emu10k2_chip = 1, |
1427 | .ca0108_chip = 1, | 1431 | .ca0108_chip = 1, |
1428 | .spk71 = 1, | 1432 | .spk71 = 1, |
1429 | .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */ | 1433 | .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 new revision */ |
1430 | /* Tested by James@superbug.co.uk 20-3-2007. */ | 1434 | /* Tested by James@superbug.co.uk 20-3-2007. */ |
1431 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102, | 1435 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102, |
1432 | .driver = "Audigy2", .name = "E-mu 0404 [4002]", | 1436 | .driver = "Audigy2", .name = "E-mu 0404 [MAEM8850]", |
1433 | .id = "EMU0404", | 1437 | .id = "EMU0404", |
1434 | .emu10k2_chip = 1, | 1438 | .emu10k2_chip = 1, |
1435 | .ca0102_chip = 1, | 1439 | .ca0102_chip = 1, |
1436 | .spk71 = 1, | 1440 | .spk71 = 1, |
1437 | .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */ | 1441 | .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */ |
1442 | #endif | ||
1438 | /* Audigy4 (Not PRO) SB0610 */ | 1443 | /* Audigy4 (Not PRO) SB0610 */ |
1439 | {.vendor = 0x1102, .device = 0x0008, | 1444 | {.vendor = 0x1102, .device = 0x0008, |
1440 | .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]", | 1445 | .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]", |
1441 | .id = "Audigy2", | 1446 | .id = "Audigy2", |
1442 | .emu10k2_chip = 1, | 1447 | .emu10k2_chip = 1, |
1443 | .ca0108_chip = 1, | 1448 | .ca0108_chip = 1, |
1444 | .ac97_chip = 1} , | 1449 | .ac97_chip = 1} , |
1445 | /* Tested by James@superbug.co.uk 3rd July 2005 */ | 1450 | /* Tested by James@superbug.co.uk 3rd July 2005 */ |
1446 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102, | 1451 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102, |
1447 | .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]", | 1452 | .driver = "Audigy2", .name = "SB Audigy 4 PRO [SB0380]", |
1448 | .id = "Audigy2", | 1453 | .id = "Audigy2", |
1449 | .emu10k2_chip = 1, | 1454 | .emu10k2_chip = 1, |
1450 | .ca0102_chip = 1, | 1455 | .ca0102_chip = 1, |
@@ -1457,7 +1462,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1457 | * Just like 0x20021102 | 1462 | * Just like 0x20021102 |
1458 | */ | 1463 | */ |
1459 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20061102, | 1464 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20061102, |
1460 | .driver = "Audigy2", .name = "Audigy 2 [SB0350b]", | 1465 | .driver = "Audigy2", .name = "SB Audigy 2 [SB0350b]", |
1461 | .id = "Audigy2", | 1466 | .id = "Audigy2", |
1462 | .emu10k2_chip = 1, | 1467 | .emu10k2_chip = 1, |
1463 | .ca0102_chip = 1, | 1468 | .ca0102_chip = 1, |
@@ -1466,7 +1471,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1466 | .spdif_bug = 1, | 1471 | .spdif_bug = 1, |
1467 | .ac97_chip = 1} , | 1472 | .ac97_chip = 1} , |
1468 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102, | 1473 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102, |
1469 | .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]", | 1474 | .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]", |
1470 | .id = "Audigy2", | 1475 | .id = "Audigy2", |
1471 | .emu10k2_chip = 1, | 1476 | .emu10k2_chip = 1, |
1472 | .ca0102_chip = 1, | 1477 | .ca0102_chip = 1, |
@@ -1475,7 +1480,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1475 | .spdif_bug = 1, | 1480 | .spdif_bug = 1, |
1476 | .ac97_chip = 1} , | 1481 | .ac97_chip = 1} , |
1477 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102, | 1482 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102, |
1478 | .driver = "Audigy2", .name = "Audigy 2 ZS [2001]", | 1483 | .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0360]", |
1479 | .id = "Audigy2", | 1484 | .id = "Audigy2", |
1480 | .emu10k2_chip = 1, | 1485 | .emu10k2_chip = 1, |
1481 | .ca0102_chip = 1, | 1486 | .ca0102_chip = 1, |
@@ -1492,7 +1497,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1492 | * CA0151: Yes | 1497 | * CA0151: Yes |
1493 | */ | 1498 | */ |
1494 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10071102, | 1499 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10071102, |
1495 | .driver = "Audigy2", .name = "Audigy 2 [SB0240]", | 1500 | .driver = "Audigy2", .name = "SB Audigy 2 [SB0240]", |
1496 | .id = "Audigy2", | 1501 | .id = "Audigy2", |
1497 | .emu10k2_chip = 1, | 1502 | .emu10k2_chip = 1, |
1498 | .ca0102_chip = 1, | 1503 | .ca0102_chip = 1, |
@@ -1502,7 +1507,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1502 | .adc_1361t = 1, /* 24 bit capture instead of 16bit */ | 1507 | .adc_1361t = 1, /* 24 bit capture instead of 16bit */ |
1503 | .ac97_chip = 1} , | 1508 | .ac97_chip = 1} , |
1504 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102, | 1509 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102, |
1505 | .driver = "Audigy2", .name = "Audigy 2 EX [1005]", | 1510 | .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]", |
1506 | .id = "Audigy2", | 1511 | .id = "Audigy2", |
1507 | .emu10k2_chip = 1, | 1512 | .emu10k2_chip = 1, |
1508 | .ca0102_chip = 1, | 1513 | .ca0102_chip = 1, |
@@ -1512,7 +1517,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1512 | /* Dell OEM/Creative Labs Audigy 2 ZS */ | 1517 | /* Dell OEM/Creative Labs Audigy 2 ZS */ |
1513 | /* See ALSA bug#1365 */ | 1518 | /* See ALSA bug#1365 */ |
1514 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10031102, | 1519 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10031102, |
1515 | .driver = "Audigy2", .name = "Audigy 2 ZS [SB0353]", | 1520 | .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0353]", |
1516 | .id = "Audigy2", | 1521 | .id = "Audigy2", |
1517 | .emu10k2_chip = 1, | 1522 | .emu10k2_chip = 1, |
1518 | .ca0102_chip = 1, | 1523 | .ca0102_chip = 1, |
@@ -1521,7 +1526,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1521 | .spdif_bug = 1, | 1526 | .spdif_bug = 1, |
1522 | .ac97_chip = 1} , | 1527 | .ac97_chip = 1} , |
1523 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102, | 1528 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102, |
1524 | .driver = "Audigy2", .name = "Audigy 2 Platinum [SB0240P]", | 1529 | .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]", |
1525 | .id = "Audigy2", | 1530 | .id = "Audigy2", |
1526 | .emu10k2_chip = 1, | 1531 | .emu10k2_chip = 1, |
1527 | .ca0102_chip = 1, | 1532 | .ca0102_chip = 1, |
@@ -1532,7 +1537,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1532 | .adc_1361t = 1, /* 24 bit capture instead of 16bit. Fixes ALSA bug#324 */ | 1537 | .adc_1361t = 1, /* 24 bit capture instead of 16bit. Fixes ALSA bug#324 */ |
1533 | .ac97_chip = 1} , | 1538 | .ac97_chip = 1} , |
1534 | {.vendor = 0x1102, .device = 0x0004, .revision = 0x04, | 1539 | {.vendor = 0x1102, .device = 0x0004, .revision = 0x04, |
1535 | .driver = "Audigy2", .name = "Audigy 2 [Unknown]", | 1540 | .driver = "Audigy2", .name = "SB Audigy 2 [Unknown]", |
1536 | .id = "Audigy2", | 1541 | .id = "Audigy2", |
1537 | .emu10k2_chip = 1, | 1542 | .emu10k2_chip = 1, |
1538 | .ca0102_chip = 1, | 1543 | .ca0102_chip = 1, |
@@ -1540,78 +1545,79 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1540 | .spdif_bug = 1, | 1545 | .spdif_bug = 1, |
1541 | .ac97_chip = 1} , | 1546 | .ac97_chip = 1} , |
1542 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102, | 1547 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102, |
1543 | .driver = "Audigy", .name = "Audigy 1 [SB0090]", | 1548 | .driver = "Audigy", .name = "SB Audigy 1 [SB0092]", |
1544 | .id = "Audigy", | 1549 | .id = "Audigy", |
1545 | .emu10k2_chip = 1, | 1550 | .emu10k2_chip = 1, |
1546 | .ca0102_chip = 1, | 1551 | .ca0102_chip = 1, |
1547 | .ac97_chip = 1} , | 1552 | .ac97_chip = 1} , |
1548 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00521102, | 1553 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00521102, |
1549 | .driver = "Audigy", .name = "Audigy 1 ES [SB0160]", | 1554 | .driver = "Audigy", .name = "SB Audigy 1 ES [SB0160]", |
1550 | .id = "Audigy", | 1555 | .id = "Audigy", |
1551 | .emu10k2_chip = 1, | 1556 | .emu10k2_chip = 1, |
1552 | .ca0102_chip = 1, | 1557 | .ca0102_chip = 1, |
1553 | .spdif_bug = 1, | 1558 | .spdif_bug = 1, |
1554 | .ac97_chip = 1} , | 1559 | .ac97_chip = 1} , |
1555 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102, | 1560 | {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102, |
1556 | .driver = "Audigy", .name = "Audigy 1 [SB0090]", | 1561 | .driver = "Audigy", .name = "SB Audigy 1 [SB0090]", |
1557 | .id = "Audigy", | 1562 | .id = "Audigy", |
1558 | .emu10k2_chip = 1, | 1563 | .emu10k2_chip = 1, |
1559 | .ca0102_chip = 1, | 1564 | .ca0102_chip = 1, |
1560 | .ac97_chip = 1} , | 1565 | .ac97_chip = 1} , |
1561 | {.vendor = 0x1102, .device = 0x0004, | 1566 | {.vendor = 0x1102, .device = 0x0004, |
1562 | .driver = "Audigy", .name = "Audigy 1 [Unknown]", | 1567 | .driver = "Audigy", .name = "Audigy 1 [Unknown]", |
1563 | .id = "Audigy", | 1568 | .id = "Audigy", |
1564 | .emu10k2_chip = 1, | 1569 | .emu10k2_chip = 1, |
1565 | .ca0102_chip = 1, | 1570 | .ca0102_chip = 1, |
1566 | .ac97_chip = 1} , | 1571 | .ac97_chip = 1} , |
1567 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102, | 1572 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x100a1102, |
1568 | .driver = "EMU10K1", .name = "SBLive! [SB0105]", | 1573 | .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0220]", |
1574 | .id = "Live", | ||
1575 | .emu10k1_chip = 1, | ||
1576 | .ac97_chip = 1, | ||
1577 | .sblive51 = 1} , | ||
1578 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806b1102, | ||
1579 | .driver = "EMU10K1", .name = "SB Live! [SB0105]", | ||
1569 | .id = "Live", | 1580 | .id = "Live", |
1570 | .emu10k1_chip = 1, | 1581 | .emu10k1_chip = 1, |
1571 | .ac97_chip = 1, | 1582 | .ac97_chip = 1, |
1572 | .sblive51 = 1} , | 1583 | .sblive51 = 1} , |
1573 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102, | 1584 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806a1102, |
1574 | .driver = "EMU10K1", .name = "SBLive! Value [SB0103]", | 1585 | .driver = "EMU10K1", .name = "SB Live! Value [SB0103]", |
1575 | .id = "Live", | 1586 | .id = "Live", |
1576 | .emu10k1_chip = 1, | 1587 | .emu10k1_chip = 1, |
1577 | .ac97_chip = 1, | 1588 | .ac97_chip = 1, |
1578 | .sblive51 = 1} , | 1589 | .sblive51 = 1} , |
1579 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102, | 1590 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102, |
1580 | .driver = "EMU10K1", .name = "SBLive! Value [SB0101]", | 1591 | .driver = "EMU10K1", .name = "SB Live! Value [SB0101]", |
1581 | .id = "Live", | 1592 | .id = "Live", |
1582 | .emu10k1_chip = 1, | 1593 | .emu10k1_chip = 1, |
1583 | .ac97_chip = 1, | 1594 | .ac97_chip = 1, |
1584 | .sblive51 = 1} , | 1595 | .sblive51 = 1} , |
1585 | /* Tested by ALSA bug#1680 26th December 2005 */ | 1596 | /* Tested by ALSA bug#1680 26th December 2005 */ |
1586 | /* note: It really has SB0220 written on the card. */ | 1597 | /* note: It really has SB0220 written on the card, */ |
1598 | /* but it's SB0228 according to kx.inf */ | ||
1587 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80661102, | 1599 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80661102, |
1588 | .driver = "EMU10K1", .name = "SB Live 5.1 Dell OEM [SB0220]", | 1600 | .driver = "EMU10K1", .name = "SB Live! 5.1 Dell OEM [SB0228]", |
1589 | .id = "Live", | 1601 | .id = "Live", |
1590 | .emu10k1_chip = 1, | 1602 | .emu10k1_chip = 1, |
1591 | .ac97_chip = 1, | 1603 | .ac97_chip = 1, |
1592 | .sblive51 = 1} , | 1604 | .sblive51 = 1} , |
1593 | /* Tested by Thomas Zehetbauer 27th Aug 2005 */ | 1605 | /* Tested by Thomas Zehetbauer 27th Aug 2005 */ |
1594 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102, | 1606 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102, |
1595 | .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", | 1607 | .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0220]", |
1596 | .id = "Live", | ||
1597 | .emu10k1_chip = 1, | ||
1598 | .ac97_chip = 1, | ||
1599 | .sblive51 = 1} , | ||
1600 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x100a1102, | ||
1601 | .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", | ||
1602 | .id = "Live", | 1608 | .id = "Live", |
1603 | .emu10k1_chip = 1, | 1609 | .emu10k1_chip = 1, |
1604 | .ac97_chip = 1, | 1610 | .ac97_chip = 1, |
1605 | .sblive51 = 1} , | 1611 | .sblive51 = 1} , |
1606 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102, | 1612 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102, |
1607 | .driver = "EMU10K1", .name = "SB Live 5.1", | 1613 | .driver = "EMU10K1", .name = "SB Live! 5.1", |
1608 | .id = "Live", | 1614 | .id = "Live", |
1609 | .emu10k1_chip = 1, | 1615 | .emu10k1_chip = 1, |
1610 | .ac97_chip = 1, | 1616 | .ac97_chip = 1, |
1611 | .sblive51 = 1} , | 1617 | .sblive51 = 1} , |
1612 | /* Tested by alsa bugtrack user "hus" bug #1297 12th Aug 2005 */ | 1618 | /* Tested by alsa bugtrack user "hus" bug #1297 12th Aug 2005 */ |
1613 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102, | 1619 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102, |
1614 | .driver = "EMU10K1", .name = "SBLive 5.1 [SB0060]", | 1620 | .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0060]", |
1615 | .id = "Live", | 1621 | .id = "Live", |
1616 | .emu10k1_chip = 1, | 1622 | .emu10k1_chip = 1, |
1617 | .ac97_chip = 2, /* ac97 is optional; both SBLive 5.1 and platinum | 1623 | .ac97_chip = 2, /* ac97 is optional; both SBLive 5.1 and platinum |
@@ -1619,78 +1625,78 @@ static struct snd_emu_chip_details emu_chip_details[] = { | |||
1619 | */ | 1625 | */ |
1620 | .sblive51 = 1} , | 1626 | .sblive51 = 1} , |
1621 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102, | 1627 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102, |
1622 | .driver = "EMU10K1", .name = "SBLive! Value [CT4850]", | 1628 | .driver = "EMU10K1", .name = "SB Live! Value [CT4850]", |
1623 | .id = "Live", | 1629 | .id = "Live", |
1624 | .emu10k1_chip = 1, | 1630 | .emu10k1_chip = 1, |
1625 | .ac97_chip = 1, | 1631 | .ac97_chip = 1, |
1626 | .sblive51 = 1} , | 1632 | .sblive51 = 1} , |
1627 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102, | 1633 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102, |
1628 | .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", | 1634 | .driver = "EMU10K1", .name = "SB Live! Platinum [CT4760P]", |
1629 | .id = "Live", | 1635 | .id = "Live", |
1630 | .emu10k1_chip = 1, | 1636 | .emu10k1_chip = 1, |
1631 | .ac97_chip = 1} , | 1637 | .ac97_chip = 1} , |
1632 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102, | 1638 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102, |
1633 | .driver = "EMU10K1", .name = "SBLive! Value [CT4871]", | 1639 | .driver = "EMU10K1", .name = "SB Live! Value [CT4871]", |
1634 | .id = "Live", | 1640 | .id = "Live", |
1635 | .emu10k1_chip = 1, | 1641 | .emu10k1_chip = 1, |
1636 | .ac97_chip = 1, | 1642 | .ac97_chip = 1, |
1637 | .sblive51 = 1} , | 1643 | .sblive51 = 1} , |
1638 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80311102, | 1644 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80311102, |
1639 | .driver = "EMU10K1", .name = "SBLive! Value [CT4831]", | 1645 | .driver = "EMU10K1", .name = "SB Live! Value [CT4831]", |
1640 | .id = "Live", | 1646 | .id = "Live", |
1641 | .emu10k1_chip = 1, | 1647 | .emu10k1_chip = 1, |
1642 | .ac97_chip = 1, | 1648 | .ac97_chip = 1, |
1643 | .sblive51 = 1} , | 1649 | .sblive51 = 1} , |
1644 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102, | 1650 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102, |
1645 | .driver = "EMU10K1", .name = "SBLive! Value [CT4870]", | 1651 | .driver = "EMU10K1", .name = "SB Live! Value [CT4870]", |
1646 | .id = "Live", | 1652 | .id = "Live", |
1647 | .emu10k1_chip = 1, | 1653 | .emu10k1_chip = 1, |
1648 | .ac97_chip = 1, | 1654 | .ac97_chip = 1, |
1649 | .sblive51 = 1} , | 1655 | .sblive51 = 1} , |
1650 | /* Tested by James@superbug.co.uk 3rd July 2005 */ | 1656 | /* Tested by James@superbug.co.uk 3rd July 2005 */ |
1651 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102, | 1657 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102, |
1652 | .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", | 1658 | .driver = "EMU10K1", .name = "SB Live! Value [CT4832]", |
1653 | .id = "Live", | 1659 | .id = "Live", |
1654 | .emu10k1_chip = 1, | 1660 | .emu10k1_chip = 1, |
1655 | .ac97_chip = 1, | 1661 | .ac97_chip = 1, |
1656 | .sblive51 = 1} , | 1662 | .sblive51 = 1} , |
1657 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102, | 1663 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102, |
1658 | .driver = "EMU10K1", .name = "SBLive! Value [CT4830]", | 1664 | .driver = "EMU10K1", .name = "SB Live! Value [CT4830]", |
1659 | .id = "Live", | 1665 | .id = "Live", |
1660 | .emu10k1_chip = 1, | 1666 | .emu10k1_chip = 1, |
1661 | .ac97_chip = 1, | 1667 | .ac97_chip = 1, |
1662 | .sblive51 = 1} , | 1668 | .sblive51 = 1} , |
1663 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102, | 1669 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102, |
1664 | .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", | 1670 | .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", |
1665 | .id = "Live", | 1671 | .id = "Live", |
1666 | .emu10k1_chip = 1, | 1672 | .emu10k1_chip = 1, |
1667 | .ac97_chip = 1, | 1673 | .ac97_chip = 1, |
1668 | .sblive51 = 1} , | 1674 | .sblive51 = 1} , |
1669 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102, | 1675 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102, |
1670 | .driver = "EMU10K1", .name = "SBLive! Value [CT4780]", | 1676 | .driver = "EMU10K1", .name = "SB Live! Value [CT4780]", |
1671 | .id = "Live", | 1677 | .id = "Live", |
1672 | .emu10k1_chip = 1, | 1678 | .emu10k1_chip = 1, |
1673 | .ac97_chip = 1, | 1679 | .ac97_chip = 1, |
1674 | .sblive51 = 1} , | 1680 | .sblive51 = 1} , |
1675 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102, | 1681 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102, |
1676 | .driver = "EMU10K1", .name = "E-mu APS [4001]", | 1682 | .driver = "EMU10K1", .name = "E-mu APS [PC545]", |
1677 | .id = "APS", | 1683 | .id = "APS", |
1678 | .emu10k1_chip = 1, | 1684 | .emu10k1_chip = 1, |
1679 | .ecard = 1} , | 1685 | .ecard = 1} , |
1680 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102, | 1686 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102, |
1681 | .driver = "EMU10K1", .name = "SBLive! [CT4620]", | 1687 | .driver = "EMU10K1", .name = "SB Live! [CT4620]", |
1682 | .id = "Live", | 1688 | .id = "Live", |
1683 | .emu10k1_chip = 1, | 1689 | .emu10k1_chip = 1, |
1684 | .ac97_chip = 1, | 1690 | .ac97_chip = 1, |
1685 | .sblive51 = 1} , | 1691 | .sblive51 = 1} , |
1686 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102, | 1692 | {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102, |
1687 | .driver = "EMU10K1", .name = "SBLive! Value [CT4670]", | 1693 | .driver = "EMU10K1", .name = "SB Live! Value [CT4670]", |
1688 | .id = "Live", | 1694 | .id = "Live", |
1689 | .emu10k1_chip = 1, | 1695 | .emu10k1_chip = 1, |
1690 | .ac97_chip = 1, | 1696 | .ac97_chip = 1, |
1691 | .sblive51 = 1} , | 1697 | .sblive51 = 1} , |
1692 | {.vendor = 0x1102, .device = 0x0002, | 1698 | {.vendor = 0x1102, .device = 0x0002, |
1693 | .driver = "EMU10K1", .name = "SB Live [Unknown]", | 1699 | .driver = "EMU10K1", .name = "SB Live! [Unknown]", |
1694 | .id = "Live", | 1700 | .id = "Live", |
1695 | .emu10k1_chip = 1, | 1701 | .emu10k1_chip = 1, |
1696 | .ac97_chip = 1, | 1702 | .ac97_chip = 1, |