aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/intel8x0.c
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2005-05-30 11:20:19 -0400
committerJaroslav Kysela <perex@suse.cz>2005-06-22 06:27:37 -0400
commit6fd8b87f0e1e5de436ba020bd5806fe9ad738269 (patch)
tree1f8aa64e4d86298f50365f062855151b81ab3bba /sound/pci/intel8x0.c
parent69ad07cf98d0ef65cac67bac2ea4381bb499bea8 (diff)
[ALSA] AC97 - renamed vendor/device to subvendor/subdevice where appropriate
Intel8x0 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: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound/pci/intel8x0.c')
-rw-r--r--sound/pci/intel8x0.c148
1 files changed, 74 insertions, 74 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 9c5710daed50..53fa5d8d0c4b 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1725,229 +1725,229 @@ static struct ac97_pcm ac97_pcm_defs[] __devinitdata = {
1725 1725
1726static struct ac97_quirk ac97_quirks[] __devinitdata = { 1726static struct ac97_quirk ac97_quirks[] __devinitdata = {
1727 { 1727 {
1728 .vendor = 0x0e11, 1728 .subvendor = 0x0e11,
1729 .device = 0x008a, 1729 .subdevice = 0x008a,
1730 .name = "Compaq Evo W4000", /* AD1885 */ 1730 .name = "Compaq Evo W4000", /* AD1885 */
1731 .type = AC97_TUNE_HP_ONLY 1731 .type = AC97_TUNE_HP_ONLY
1732 }, 1732 },
1733 { 1733 {
1734 .vendor = 0x0e11, 1734 .subvendor = 0x0e11,
1735 .device = 0x00b8, 1735 .subdevice = 0x00b8,
1736 .name = "Compaq Evo D510C", 1736 .name = "Compaq Evo D510C",
1737 .type = AC97_TUNE_HP_ONLY 1737 .type = AC97_TUNE_HP_ONLY
1738 }, 1738 },
1739 { 1739 {
1740 .vendor = 0x0e11, 1740 .subvendor = 0x0e11,
1741 .device = 0x0860, 1741 .subdevice = 0x0860,
1742 .name = "HP/Compaq nx7010", 1742 .name = "HP/Compaq nx7010",
1743 .type = AC97_TUNE_MUTE_LED 1743 .type = AC97_TUNE_MUTE_LED
1744 }, 1744 },
1745 { 1745 {
1746 .vendor = 0x1014, 1746 .subvendor = 0x1014,
1747 .device = 0x1f00, 1747 .subdevice = 0x1f00,
1748 .name = "MS-9128", 1748 .name = "MS-9128",
1749 .type = AC97_TUNE_ALC_JACK 1749 .type = AC97_TUNE_ALC_JACK
1750 }, 1750 },
1751 { 1751 {
1752 .vendor = 0x1028, 1752 .subvendor = 0x1028,
1753 .device = 0x00d8, 1753 .subdevice = 0x00d8,
1754 .name = "Dell Precision 530", /* AD1885 */ 1754 .name = "Dell Precision 530", /* AD1885 */
1755 .type = AC97_TUNE_HP_ONLY 1755 .type = AC97_TUNE_HP_ONLY
1756 }, 1756 },
1757 { 1757 {
1758 .vendor = 0x1028, 1758 .subvendor = 0x1028,
1759 .device = 0x010d, 1759 .subdevice = 0x010d,
1760 .name = "Dell", /* which model? AD1885 */ 1760 .name = "Dell", /* which model? AD1885 */
1761 .type = AC97_TUNE_HP_ONLY 1761 .type = AC97_TUNE_HP_ONLY
1762 }, 1762 },
1763 { 1763 {
1764 .vendor = 0x1028, 1764 .subvendor = 0x1028,
1765 .device = 0x0126, 1765 .subdevice = 0x0126,
1766 .name = "Dell Optiplex GX260", /* AD1981A */ 1766 .name = "Dell Optiplex GX260", /* AD1981A */
1767 .type = AC97_TUNE_HP_ONLY 1767 .type = AC97_TUNE_HP_ONLY
1768 }, 1768 },
1769 { 1769 {
1770 .vendor = 0x1028, 1770 .subvendor = 0x1028,
1771 .device = 0x012c, 1771 .subdevice = 0x012c,
1772 .name = "Dell Precision 650", /* AD1981A */ 1772 .name = "Dell Precision 650", /* AD1981A */
1773 .type = AC97_TUNE_HP_ONLY 1773 .type = AC97_TUNE_HP_ONLY
1774 }, 1774 },
1775 { 1775 {
1776 .vendor = 0x1028, 1776 .subvendor = 0x1028,
1777 .device = 0x012d, 1777 .subdevice = 0x012d,
1778 .name = "Dell Precision 450", /* AD1981B*/ 1778 .name = "Dell Precision 450", /* AD1981B*/
1779 .type = AC97_TUNE_HP_ONLY 1779 .type = AC97_TUNE_HP_ONLY
1780 }, 1780 },
1781 { 1781 {
1782 .vendor = 0x1028, 1782 .subvendor = 0x1028,
1783 .device = 0x0147, 1783 .subdevice = 0x0147,
1784 .name = "Dell", /* which model? AD1981B*/ 1784 .name = "Dell", /* which model? AD1981B*/
1785 .type = AC97_TUNE_HP_ONLY 1785 .type = AC97_TUNE_HP_ONLY
1786 }, 1786 },
1787 { 1787 {
1788 .vendor = 0x1028, 1788 .subvendor = 0x1028,
1789 .device = 0x0163, 1789 .subdevice = 0x0163,
1790 .name = "Dell Unknown", /* STAC9750/51 */ 1790 .name = "Dell Unknown", /* STAC9750/51 */
1791 .type = AC97_TUNE_HP_ONLY 1791 .type = AC97_TUNE_HP_ONLY
1792 }, 1792 },
1793 { 1793 {
1794 .vendor = 0x103c, 1794 .subvendor = 0x103c,
1795 .device = 0x006d, 1795 .subdevice = 0x006d,
1796 .name = "HP zv5000", 1796 .name = "HP zv5000",
1797 .type = AC97_TUNE_MUTE_LED /*AD1981B*/ 1797 .type = AC97_TUNE_MUTE_LED /*AD1981B*/
1798 }, 1798 },
1799 { /* FIXME: which codec? */ 1799 { /* FIXME: which codec? */
1800 .vendor = 0x103c, 1800 .subvendor = 0x103c,
1801 .device = 0x00c3, 1801 .subdevice = 0x00c3,
1802 .name = "HP xw6000", 1802 .name = "HP xw6000",
1803 .type = AC97_TUNE_HP_ONLY 1803 .type = AC97_TUNE_HP_ONLY
1804 }, 1804 },
1805 { 1805 {
1806 .vendor = 0x103c, 1806 .subvendor = 0x103c,
1807 .device = 0x088c, 1807 .subdevice = 0x088c,
1808 .name = "HP nc8000", 1808 .name = "HP nc8000",
1809 .type = AC97_TUNE_MUTE_LED 1809 .type = AC97_TUNE_MUTE_LED
1810 }, 1810 },
1811 { 1811 {
1812 .vendor = 0x103c, 1812 .subvendor = 0x103c,
1813 .device = 0x0890, 1813 .subdevice = 0x0890,
1814 .name = "HP nc6000", 1814 .name = "HP nc6000",
1815 .type = AC97_TUNE_MUTE_LED 1815 .type = AC97_TUNE_MUTE_LED
1816 }, 1816 },
1817 { 1817 {
1818 .vendor = 0x103c, 1818 .subvendor = 0x103c,
1819 .device = 0x129d, 1819 .subdevice = 0x129d,
1820 .name = "HP xw8000", 1820 .name = "HP xw8000",
1821 .type = AC97_TUNE_HP_ONLY 1821 .type = AC97_TUNE_HP_ONLY
1822 }, 1822 },
1823 { 1823 {
1824 .vendor = 0x103c, 1824 .subvendor = 0x103c,
1825 .device = 0x12f1, 1825 .subdevice = 0x12f1,
1826 .name = "HP xw8200", /* AD1981B*/ 1826 .name = "HP xw8200", /* AD1981B*/
1827 .type = AC97_TUNE_HP_ONLY 1827 .type = AC97_TUNE_HP_ONLY
1828 }, 1828 },
1829 { 1829 {
1830 .vendor = 0x103c, 1830 .subvendor = 0x103c,
1831 .device = 0x12f2, 1831 .subdevice = 0x12f2,
1832 .name = "HP xw6200", 1832 .name = "HP xw6200",
1833 .type = AC97_TUNE_HP_ONLY 1833 .type = AC97_TUNE_HP_ONLY
1834 }, 1834 },
1835 { 1835 {
1836 .vendor = 0x103c, 1836 .subvendor = 0x103c,
1837 .device = 0x3008, 1837 .subdevice = 0x3008,
1838 .name = "HP xw4200", /* AD1981B*/ 1838 .name = "HP xw4200", /* AD1981B*/
1839 .type = AC97_TUNE_HP_ONLY 1839 .type = AC97_TUNE_HP_ONLY
1840 }, 1840 },
1841 { 1841 {
1842 .vendor = 0x104d, 1842 .subvendor = 0x104d,
1843 .device = 0x8197, 1843 .subdevice = 0x8197,
1844 .name = "Sony S1XP", 1844 .name = "Sony S1XP",
1845 .type = AC97_TUNE_INV_EAPD 1845 .type = AC97_TUNE_INV_EAPD
1846 }, 1846 },
1847 { 1847 {
1848 .vendor = 0x1043, 1848 .subvendor = 0x1043,
1849 .device = 0x80f3, 1849 .subdevice = 0x80f3,
1850 .name = "ASUS ICH5/AD1985", 1850 .name = "ASUS ICH5/AD1985",
1851 .type = AC97_TUNE_AD_SHARING 1851 .type = AC97_TUNE_AD_SHARING
1852 }, 1852 },
1853 { 1853 {
1854 .vendor = 0x10cf, 1854 .subvendor = 0x10cf,
1855 .device = 0x11c3, 1855 .subdevice = 0x11c3,
1856 .name = "Fujitsu-Siemens E4010", 1856 .name = "Fujitsu-Siemens E4010",
1857 .type = AC97_TUNE_HP_ONLY 1857 .type = AC97_TUNE_HP_ONLY
1858 }, 1858 },
1859 { 1859 {
1860 .vendor = 0x10cf, 1860 .subvendor = 0x10cf,
1861 .device = 0x1253, 1861 .subdevice = 0x1253,
1862 .name = "Fujitsu S6210", /* STAC9750/51 */ 1862 .name = "Fujitsu S6210", /* STAC9750/51 */
1863 .type = AC97_TUNE_HP_ONLY 1863 .type = AC97_TUNE_HP_ONLY
1864 }, 1864 },
1865 { 1865 {
1866 .vendor = 0x10f1, 1866 .subvendor = 0x10f1,
1867 .device = 0x2665, 1867 .subdevice = 0x2665,
1868 .name = "Fujitsu-Siemens Celsius", /* AD1981? */ 1868 .name = "Fujitsu-Siemens Celsius", /* AD1981? */
1869 .type = AC97_TUNE_HP_ONLY 1869 .type = AC97_TUNE_HP_ONLY
1870 }, 1870 },
1871 { 1871 {
1872 .vendor = 0x10f1, 1872 .subvendor = 0x10f1,
1873 .device = 0x2885, 1873 .subdevice = 0x2885,
1874 .name = "AMD64 Mobo", /* ALC650 */ 1874 .name = "AMD64 Mobo", /* ALC650 */
1875 .type = AC97_TUNE_HP_ONLY 1875 .type = AC97_TUNE_HP_ONLY
1876 }, 1876 },
1877 { 1877 {
1878 .vendor = 0x110a, 1878 .subvendor = 0x110a,
1879 .device = 0x0056, 1879 .subdevice = 0x0056,
1880 .name = "Fujitsu-Siemens Scenic", /* AD1981? */ 1880 .name = "Fujitsu-Siemens Scenic", /* AD1981? */
1881 .type = AC97_TUNE_HP_ONLY 1881 .type = AC97_TUNE_HP_ONLY
1882 }, 1882 },
1883 { 1883 {
1884 .vendor = 0x11d4, 1884 .subvendor = 0x11d4,
1885 .device = 0x5375, 1885 .subdevice = 0x5375,
1886 .name = "ADI AD1985 (discrete)", 1886 .name = "ADI AD1985 (discrete)",
1887 .type = AC97_TUNE_HP_ONLY 1887 .type = AC97_TUNE_HP_ONLY
1888 }, 1888 },
1889 { 1889 {
1890 .vendor = 0x1462, 1890 .subvendor = 0x1462,
1891 .device = 0x5470, 1891 .subdevice = 0x5470,
1892 .name = "MSI P4 ATX 645 Ultra", 1892 .name = "MSI P4 ATX 645 Ultra",
1893 .type = AC97_TUNE_HP_ONLY 1893 .type = AC97_TUNE_HP_ONLY
1894 }, 1894 },
1895 { 1895 {
1896 .vendor = 0x1734, 1896 .subvendor = 0x1734,
1897 .device = 0x0088, 1897 .subdevice = 0x0088,
1898 .name = "Fujitsu-Siemens D1522", /* AD1981 */ 1898 .name = "Fujitsu-Siemens D1522", /* AD1981 */
1899 .type = AC97_TUNE_HP_ONLY 1899 .type = AC97_TUNE_HP_ONLY
1900 }, 1900 },
1901 { 1901 {
1902 .vendor = 0x8086, 1902 .subvendor = 0x8086,
1903 .device = 0x2000, 1903 .subdevice = 0x2000,
1904 .mask = 0xfff0, 1904 .mask = 0xfff0,
1905 .name = "Intel ICH5/AD1985", 1905 .name = "Intel ICH5/AD1985",
1906 .type = AC97_TUNE_AD_SHARING 1906 .type = AC97_TUNE_AD_SHARING
1907 }, 1907 },
1908 { 1908 {
1909 .vendor = 0x8086, 1909 .subvendor = 0x8086,
1910 .device = 0x4000, 1910 .subdevice = 0x4000,
1911 .mask = 0xfff0, 1911 .mask = 0xfff0,
1912 .name = "Intel ICH5/AD1985", 1912 .name = "Intel ICH5/AD1985",
1913 .type = AC97_TUNE_AD_SHARING 1913 .type = AC97_TUNE_AD_SHARING
1914 }, 1914 },
1915 { 1915 {
1916 .vendor = 0x8086, 1916 .subvendor = 0x8086,
1917 .device = 0x4856, 1917 .subdevice = 0x4856,
1918 .name = "Intel D845WN (82801BA)", 1918 .name = "Intel D845WN (82801BA)",
1919 .type = AC97_TUNE_SWAP_HP 1919 .type = AC97_TUNE_SWAP_HP
1920 }, 1920 },
1921 { 1921 {
1922 .vendor = 0x8086, 1922 .subvendor = 0x8086,
1923 .device = 0x4d44, 1923 .subdevice = 0x4d44,
1924 .name = "Intel D850EMV2", /* AD1885 */ 1924 .name = "Intel D850EMV2", /* AD1885 */
1925 .type = AC97_TUNE_HP_ONLY 1925 .type = AC97_TUNE_HP_ONLY
1926 }, 1926 },
1927 { 1927 {
1928 .vendor = 0x8086, 1928 .subvendor = 0x8086,
1929 .device = 0x4d56, 1929 .subdevice = 0x4d56,
1930 .name = "Intel ICH/AD1885", 1930 .name = "Intel ICH/AD1885",
1931 .type = AC97_TUNE_HP_ONLY 1931 .type = AC97_TUNE_HP_ONLY
1932 }, 1932 },
1933 { 1933 {
1934 .vendor = 0x8086, 1934 .subvendor = 0x8086,
1935 .device = 0x6000, 1935 .subdevice = 0x6000,
1936 .mask = 0xfff0, 1936 .mask = 0xfff0,
1937 .name = "Intel ICH5/AD1985", 1937 .name = "Intel ICH5/AD1985",
1938 .type = AC97_TUNE_AD_SHARING 1938 .type = AC97_TUNE_AD_SHARING
1939 }, 1939 },
1940 { 1940 {
1941 .vendor = 0x8086, 1941 .subvendor = 0x8086,
1942 .device = 0xe000, 1942 .subdevice = 0xe000,
1943 .mask = 0xfff0, 1943 .mask = 0xfff0,
1944 .name = "Intel ICH5/AD1985", 1944 .name = "Intel ICH5/AD1985",
1945 .type = AC97_TUNE_AD_SHARING 1945 .type = AC97_TUNE_AD_SHARING
1946 }, 1946 },
1947#if 0 /* FIXME: this seems wrong on most boards */ 1947#if 0 /* FIXME: this seems wrong on most boards */
1948 { 1948 {
1949 .vendor = 0x8086, 1949 .subvendor = 0x8086,
1950 .device = 0xa000, 1950 .subdevice = 0xa000,
1951 .mask = 0xfff0, 1951 .mask = 0xfff0,
1952 .name = "Intel ICH5/AD1985", 1952 .name = "Intel ICH5/AD1985",
1953 .type = AC97_TUNE_HP_ONLY 1953 .type = AC97_TUNE_HP_ONLY