Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 a6f6192b 编写于 作者: J James Courtier-Dutton 提交者： Jaroslav Kysela
浏览文件
操作

[ALSA] emu10k1: Sort by card id. 

EMU10K1/EMU10K2 driver
Signed-off-by: NJames Courtier-Dutton <James@superbug.co.uk>
上级 3818152e
隐藏空白更改
内联 并排
Showing with 37 addition and 43 deletion
sound/pci/emu10k1/emu10k1_main.c
浏览文件 @ a6f6192b
...@@ -714,54 +714,49 @@ static emu_chip_details_t emu_chip_details[] = { ...@@ -714,54 +714,49 @@ static emu_chip_details_t emu_chip_details[] = {
.emu10k2_chip = 1, .emu10k2_chip = 1,
.ca0102_chip = 1, .ca0102_chip = 1,
.ac97_chip = 1} , .ac97_chip = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,
.driver = "EMU10K1", .name = "E-mu APS [4001]", .driver = "EMU10K1", .name = "SBLive! [SB0105]",
.id = "APS",
.emu10k1_chip = 1,
.ecard = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
.driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,
.driver = "EMU10K1", .name = "SB Live 5.1", .driver = "EMU10K1", .name = "SBLive! Value [SB0103]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,
.driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", .driver = "EMU10K1", .name = "SBLive! Value [SB0101]",
.id = "Live",
.emu10k1_chip = 1,
.ac97_chip = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
.driver = "EMU10K1", .name = "SBLive! [CT4620]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4670]", .driver = "EMU10K1", .name = "SB Live 5.1",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4780]", .driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,
.driver = "EMU10K1", .name = "SB PCI512 [CT4790]", .driver = "EMU10K1", .name = "SBLive! Value [CT4850]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4830]", .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]",
.id = "Live",
.emu10k1_chip = 1,
.ac97_chip = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4871]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
...@@ -772,50 +767,49 @@ static emu_chip_details_t emu_chip_details[] = { ...@@ -772,50 +767,49 @@ static emu_chip_details_t emu_chip_details[] = {
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4832]", .driver = "EMU10K1", .name = "SBLive! Value [CT4870]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4850]", .driver = "EMU10K1", .name = "SBLive! Value [CT4832]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4870]", .driver = "EMU10K1", .name = "SBLive! Value [CT4830]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,
.driver = "EMU10K1", .name = "SBLive! Value [CT4871]", .driver = "EMU10K1", .name = "SB PCI512 [CT4790]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,
.driver = "EMU10K1", .name = "SBLive! Value [SB0060]", .driver = "EMU10K1", .name = "SBLive! Value [CT4780]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
.driver = "EMU10K1", .name = "SBLive! Value [SB0101]", .driver = "EMU10K1", .name = "E-mu APS [4001]",
.id = "Live", .id = "APS",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ecard = 1} ,
.sblive51 = 1} , {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102, .driver = "EMU10K1", .name = "SBLive! [CT4620]",
.driver = "EMU10K1", .name = "SBLive! Value [SB0103]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
.sblive51 = 1} , .sblive51 = 1} ,
{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102, {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,
.driver = "EMU10K1", .name = "SBLive! [SB0105]", .driver = "EMU10K1", .name = "SBLive! Value [CT4670]",
.id = "Live", .id = "Live",
.emu10k1_chip = 1, .emu10k1_chip = 1,
.ac97_chip = 1, .ac97_chip = 1,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或