aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@suse.cz>2005-05-30 08:48:16 -0400
committerJaroslav Kysela <perex@suse.cz>2005-06-22 06:27:34 -0400
commit69ad07cf98d0ef65cac67bac2ea4381bb499bea8 (patch)
tree692fc1d61dd23ef6a7dcf3cb1d28d57c7b336d2d
parent745cac56ba6b0222d97a4bf0e347149f20518bf1 (diff)
[ALSA] AC97 - renamed vendor/device to subvendor/subdevice where appropriate
AC97 Codec,ATIIXP driver,VIA82xx driver To avoid confusion, the structure members vendor/device were renamed to subvendor/subdevice, because we compare them with PCI subsystem vendor and subsystem device. Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r--include/sound/ac97_codec.h4
-rw-r--r--sound/pci/ac97/ac97_codec.c8
-rw-r--r--sound/pci/atiixp.c4
-rw-r--r--sound/pci/via82xx.c118
4 files changed, 67 insertions, 67 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 996eeab683b0..1309c12b8f71 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -573,8 +573,8 @@ enum {
573}; 573};
574 574
575struct ac97_quirk { 575struct ac97_quirk {
576 unsigned short vendor; /* PCI vendor id */ 576 unsigned short subvendor; /* PCI subsystem vendor id */
577 unsigned short device; /* PCI device id */ 577 unsigned short subdevice; /* PCI sybsystem device id */
578 unsigned short mask; /* device id bit mask, 0 = accept all */ 578 unsigned short mask; /* device id bit mask, 0 = accept all */
579 unsigned int codec_id; /* codec id (if any), 0 = accept all */ 579 unsigned int codec_id; /* codec id (if any), 0 = accept all */
580 const char *name; /* name shown as info */ 580 const char *name; /* name shown as info */
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 996fcfb09532..a4b72cd2eea0 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -2542,11 +2542,11 @@ int snd_ac97_tune_hardware(ac97_t *ac97, struct ac97_quirk *quirk, const char *o
2542 return result; 2542 return result;
2543 } 2543 }
2544 2544
2545 for (; quirk->vendor; quirk++) { 2545 for (; quirk->subvendor; quirk++) {
2546 if (quirk->vendor != ac97->subsystem_vendor) 2546 if (quirk->subvendor != ac97->subsystem_vendor)
2547 continue; 2547 continue;
2548 if ((! quirk->mask && quirk->device == ac97->subsystem_device) || 2548 if ((! quirk->mask && quirk->subdevice == ac97->subsystem_device) ||
2549 quirk->device == (quirk->mask & ac97->subsystem_device)) { 2549 quirk->subdevice == (quirk->mask & ac97->subsystem_device)) {
2550 if (quirk->codec_id && quirk->codec_id != ac97->id) 2550 if (quirk->codec_id && quirk->codec_id != ac97->id)
2551 continue; 2551 continue;
2552 snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk->name, ac97->subsystem_vendor, ac97->subsystem_device); 2552 snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk->name, ac97->subsystem_vendor, ac97->subsystem_device);
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 06551a69fb40..cafab4af5c57 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1334,8 +1334,8 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id, struct pt_regs *r
1334 1334
1335static struct ac97_quirk ac97_quirks[] __devinitdata = { 1335static struct ac97_quirk ac97_quirks[] __devinitdata = {
1336 { 1336 {
1337 .vendor = 0x103c, 1337 .subvendor = 0x103c,
1338 .device = 0x006b, 1338 .subdevice = 0x006b,
1339 .name = "HP Pavilion ZV5030US", 1339 .name = "HP Pavilion ZV5030US",
1340 .type = AC97_TUNE_MUTE_LED 1340 .type = AC97_TUNE_MUTE_LED
1341 }, 1341 },
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 4c47fc83797f..52d1074f8696 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1560,51 +1560,51 @@ static void snd_via82xx_mixer_free_ac97(ac97_t *ac97)
1560 1560
1561static struct ac97_quirk ac97_quirks[] = { 1561static struct ac97_quirk ac97_quirks[] = {
1562 { 1562 {
1563 .vendor = 0x1106, 1563 .subvendor = 0x1106,
1564 .device = 0x4161, 1564 .subdevice = 0x4161,
1565 .codec_id = 0x56494161, /* VT1612A */ 1565 .codec_id = 0x56494161, /* VT1612A */
1566 .name = "Soltek SL-75DRV5", 1566 .name = "Soltek SL-75DRV5",
1567 .type = AC97_TUNE_NONE 1567 .type = AC97_TUNE_NONE
1568 }, 1568 },
1569 { /* FIXME: which codec? */ 1569 { /* FIXME: which codec? */
1570 .vendor = 0x1106, 1570 .subvendor = 0x1106,
1571 .device = 0x4161, 1571 .subdevice = 0x4161,
1572 .name = "ASRock K7VT2", 1572 .name = "ASRock K7VT2",
1573 .type = AC97_TUNE_HP_ONLY 1573 .type = AC97_TUNE_HP_ONLY
1574 }, 1574 },
1575 { 1575 {
1576 .vendor = 0x1019, 1576 .subvendor = 0x1019,
1577 .device = 0x0a81, 1577 .subdevice = 0x0a81,
1578 .name = "ECS K7VTA3", 1578 .name = "ECS K7VTA3",
1579 .type = AC97_TUNE_HP_ONLY 1579 .type = AC97_TUNE_HP_ONLY
1580 }, 1580 },
1581 { 1581 {
1582 .vendor = 0x1019, 1582 .subvendor = 0x1019,
1583 .device = 0x0a85, 1583 .subdevice = 0x0a85,
1584 .name = "ECS L7VMM2", 1584 .name = "ECS L7VMM2",
1585 .type = AC97_TUNE_HP_ONLY 1585 .type = AC97_TUNE_HP_ONLY
1586 }, 1586 },
1587 { 1587 {
1588 .vendor = 0x1849, 1588 .subvendor = 0x1849,
1589 .device = 0x3059, 1589 .subdevice = 0x3059,
1590 .name = "ASRock K7VM2", 1590 .name = "ASRock K7VM2",
1591 .type = AC97_TUNE_HP_ONLY /* VT1616 */ 1591 .type = AC97_TUNE_HP_ONLY /* VT1616 */
1592 }, 1592 },
1593 { 1593 {
1594 .vendor = 0x14cd, 1594 .subvendor = 0x14cd,
1595 .device = 0x7002, 1595 .subdevice = 0x7002,
1596 .name = "Unknown", 1596 .name = "Unknown",
1597 .type = AC97_TUNE_ALC_JACK 1597 .type = AC97_TUNE_ALC_JACK
1598 }, 1598 },
1599 { 1599 {
1600 .vendor = 0x1071, 1600 .subvendor = 0x1071,
1601 .device = 0x8590, 1601 .subdevice = 0x8590,
1602 .name = "Mitac Mobo", 1602 .name = "Mitac Mobo",
1603 .type = AC97_TUNE_ALC_JACK 1603 .type = AC97_TUNE_ALC_JACK
1604 }, 1604 },
1605 { 1605 {
1606 .vendor = 0x161f, 1606 .subvendor = 0x161f,
1607 .device = 0x202b, 1607 .subdevice = 0x202b,
1608 .name = "Arima Notebook", 1608 .name = "Arima Notebook",
1609 .type = AC97_TUNE_HP_ONLY, 1609 .type = AC97_TUNE_HP_ONLY,
1610 }, 1610 },
@@ -2142,8 +2142,8 @@ static struct via823x_info via823x_cards[] __devinitdata = {
2142 * auto detection of DXS channel supports. 2142 * auto detection of DXS channel supports.
2143 */ 2143 */
2144struct dxs_whitelist { 2144struct dxs_whitelist {
2145 unsigned short vendor; 2145 unsigned short subvendor;
2146 unsigned short device; 2146 unsigned short subdevice;
2147 unsigned short mask; 2147 unsigned short mask;
2148 short action; /* new dxs_support value */ 2148 short action; /* new dxs_support value */
2149}; 2149};
@@ -2151,43 +2151,43 @@ struct dxs_whitelist {
2151static int __devinit check_dxs_list(struct pci_dev *pci) 2151static int __devinit check_dxs_list(struct pci_dev *pci)
2152{ 2152{
2153 static struct dxs_whitelist whitelist[] = { 2153 static struct dxs_whitelist whitelist[] = {
2154 { .vendor = 0x1005, .device = 0x4710, .action = VIA_DXS_ENABLE }, /* Avance Logic Mobo */ 2154 { .subvendor = 0x1005, .subdevice = 0x4710, .action = VIA_DXS_ENABLE }, /* Avance Logic Mobo */
2155 { .vendor = 0x1019, .device = 0x0996, .action = VIA_DXS_48K }, 2155 { .subvendor = 0x1019, .subdevice = 0x0996, .action = VIA_DXS_48K },
2156 { .vendor = 0x1019, .device = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */ 2156 { .subvendor = 0x1019, .subdevice = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */
2157 { .vendor = 0x1019, .device = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */ 2157 { .subvendor = 0x1019, .subdevice = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */
2158 { .vendor = 0x1025, .device = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */ 2158 { .subvendor = 0x1025, .subdevice = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */
2159 { .vendor = 0x1043, .device = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/ 2159 { .subvendor = 0x1043, .subdevice = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
2160 { .vendor = 0x1043, .device = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */ 2160 { .subvendor = 0x1043, .subdevice = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */
2161 { .vendor = 0x1043, .device = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/ 2161 { .subvendor = 0x1043, .subdevice = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/
2162 { .vendor = 0x1043, .device = 0x812a, .action = VIA_DXS_SRC }, /* ASUS A8V Deluxe */ 2162 { .subvendor = 0x1043, .subdevice = 0x812a, .action = VIA_DXS_SRC }, /* ASUS A8V Deluxe */
2163 { .vendor = 0x1071, .device = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */ 2163 { .subvendor = 0x1071, .subdevice = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
2164 { .vendor = 0x1071, .device = 0x8399, .action = VIA_DXS_ENABLE }, /* Umax AB 595T (VIA K8N800A - VT8237) */ 2164 { .subvendor = 0x1071, .subdevice = 0x8399, .action = VIA_DXS_ENABLE }, /* Umax AB 595T (VIA K8N800A - VT8237) */
2165 { .vendor = 0x10cf, .device = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */ 2165 { .subvendor = 0x10cf, .subdevice = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */
2166 { .vendor = 0x1106, .device = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */ 2166 { .subvendor = 0x1106, .subdevice = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */
2167 { .vendor = 0x1106, .device = 0x4552, .action = VIA_DXS_NO_VRA }, /* QDI Kudoz 7X/600-6AL */ 2167 { .subvendor = 0x1106, .subdevice = 0x4552, .action = VIA_DXS_NO_VRA }, /* QDI Kudoz 7X/600-6AL */
2168 { .vendor = 0x1106, .device = 0xaa01, .action = VIA_DXS_NO_VRA }, /* EPIA MII */ 2168 { .subvendor = 0x1106, .subdevice = 0xaa01, .action = VIA_DXS_NO_VRA }, /* EPIA MII */
2169 { .vendor = 0x1106, .device = 0xc001, .action = VIA_DXS_SRC }, /* Insight P4-ITX */ 2169 { .subvendor = 0x1106, .subdevice = 0xc001, .action = VIA_DXS_SRC }, /* Insight P4-ITX */
2170 { .vendor = 0x1297, .device = 0xa232, .action = VIA_DXS_ENABLE }, /* Shuttle ?? */ 2170 { .subvendor = 0x1297, .subdevice = 0xa232, .action = VIA_DXS_ENABLE }, /* Shuttle ?? */
2171 { .vendor = 0x1297, .device = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */ 2171 { .subvendor = 0x1297, .subdevice = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */
2172 { .vendor = 0x1458, .device = 0xa002, .action = VIA_DXS_ENABLE }, /* Gigabyte GA-7VAXP */ 2172 { .subvendor = 0x1458, .subdevice = 0xa002, .action = VIA_DXS_ENABLE }, /* Gigabyte GA-7VAXP */
2173 { .vendor = 0x1462, .device = 0x0080, .action = VIA_DXS_SRC }, /* MSI K8T Neo-FIS2R */ 2173 { .subvendor = 0x1462, .subdevice = 0x0080, .action = VIA_DXS_SRC }, /* MSI K8T Neo-FIS2R */
2174 { .vendor = 0x1462, .device = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */ 2174 { .subvendor = 0x1462, .subdevice = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */
2175 { .vendor = 0x1462, .device = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */ 2175 { .subvendor = 0x1462, .subdevice = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */
2176 { .vendor = 0x1462, .device = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */ 2176 { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */
2177 { .vendor = 0x1462, .device = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */ 2177 { .subvendor = 0x1462, .subdevice = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */
2178 { .vendor = 0x147b, .device = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */ 2178 { .subvendor = 0x147b, .subdevice = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */
2179 { .vendor = 0x147b, .device = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */ 2179 { .subvendor = 0x147b, .subdevice = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */
2180 { .vendor = 0x147b, .device = 0x1413, .action = VIA_DXS_ENABLE }, /* ABIT KV8 Pro */ 2180 { .subvendor = 0x147b, .subdevice = 0x1413, .action = VIA_DXS_ENABLE }, /* ABIT KV8 Pro */
2181 { .vendor = 0x147b, .device = 0x1415, .action = VIA_DXS_NO_VRA }, /* Abit AV8 */ 2181 { .subvendor = 0x147b, .subdevice = 0x1415, .action = VIA_DXS_NO_VRA }, /* Abit AV8 */
2182 { .vendor = 0x14ff, .device = 0x0403, .action = VIA_DXS_ENABLE }, /* Twinhead mobo */ 2182 { .subvendor = 0x14ff, .subdevice = 0x0403, .action = VIA_DXS_ENABLE }, /* Twinhead mobo */
2183 { .vendor = 0x14ff, .device = 0x0408, .action = VIA_DXS_NO_VRA }, /* Twinhead mobo */ 2183 { .subvendor = 0x14ff, .subdevice = 0x0408, .action = VIA_DXS_NO_VRA }, /* Twinhead mobo */
2184 { .vendor = 0x1584, .device = 0x8120, .action = VIA_DXS_ENABLE }, /* Gericom/Targa/Vobis/Uniwill laptop */ 2184 { .subvendor = 0x1584, .subdevice = 0x8120, .action = VIA_DXS_ENABLE }, /* Gericom/Targa/Vobis/Uniwill laptop */
2185 { .vendor = 0x1584, .device = 0x8123, .action = VIA_DXS_NO_VRA }, /* Uniwill (Targa Visionary XP-210) */ 2185 { .subvendor = 0x1584, .subdevice = 0x8123, .action = VIA_DXS_NO_VRA }, /* Uniwill (Targa Visionary XP-210) */
2186 { .vendor = 0x161f, .device = 0x202b, .action = VIA_DXS_NO_VRA }, /* Amira Note book */ 2186 { .subvendor = 0x161f, .subdevice = 0x202b, .action = VIA_DXS_NO_VRA }, /* Amira Note book */
2187 { .vendor = 0x161f, .device = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */ 2187 { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */
2188 { .vendor = 0x1631, .device = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */ 2188 { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */
2189 { .vendor = 0x1695, .device = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */ 2189 { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */
2190 { .vendor = 0x1849, .device = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */ 2190 { .subvendor = 0x1849, .subdevice = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */
2191 { } /* terminator */ 2191 { } /* terminator */
2192 }; 2192 };
2193 struct dxs_whitelist *w; 2193 struct dxs_whitelist *w;
@@ -2197,14 +2197,14 @@ static int __devinit check_dxs_list(struct pci_dev *pci)
2197 pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor); 2197 pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
2198 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device); 2198 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
2199 2199
2200 for (w = whitelist; w->vendor; w++) { 2200 for (w = whitelist; w->subvendor; w++) {
2201 if (w->vendor != subsystem_vendor) 2201 if (w->subvendor != subsystem_vendor)
2202 continue; 2202 continue;
2203 if (w->mask) { 2203 if (w->mask) {
2204 if ((w->mask & subsystem_device) == w->device) 2204 if ((w->mask & subsystem_device) == w->subdevice)
2205 return w->action; 2205 return w->action;
2206 } else { 2206 } else {
2207 if (subsystem_device == w->device) 2207 if (subsystem_device == w->subdevice)
2208 return w->action; 2208 return w->action;
2209 } 2209 }
2210 } 2210 }