aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbquirks.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 13:13:38 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 13:13:38 -0400
commitfc8a327db6c46de783b1a4276d846841b9abc24c (patch)
treebee512c142cccea93511debd98ef954581693727 /sound/usb/usbquirks.h
parent92d15c2ccbb3e31a3fc71ad28fdb55e1319383c0 (diff)
parent24837e6f249a2c83667552e6871c1543b4a6b934 (diff)
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (264 commits) [ALSA] version 1.0.15 [ALSA] Fix thinko in cs4231 mce down check [ALSA] sun-cs4231: improved waiting after MCE down [ALSA] sun-cs4231: use cs4231-regs.h [ALSA] This simplifies and fixes waiting loops of the mce_down() [ALSA] This patch adds support for a wavetable chip on [ALSA] This patch removes open_mutex from the ad1848-lib as [ALSA] fix bootup crash in snd_gus_interrupt() [ALSA] hda-codec - Fix SKU ID function for realtek codecs [ALSA] Support ASUS P701 eeepc [0x1043 0x82a1] support [ALSA] hda-codec - Add array terminator for dmic in STAC codec [ALSA] hdsp - Fix zero division [ALSA] usb-audio - Fix double comment [ALSA] hda-codec - Fix STAC922x volume knob control [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz [ALSA] hda-codec - Fix for Fujitsu Lifebook C1410 [ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag [ALSA] mpu-401: do not require an ACK byte for the ENTER_UART command [ALSA] via82xx - Add DXS quirk for Shuttle AK31v2 [ALSA] hda-codec - Fix input_mux numbers for vaio stac92xx ...
Diffstat (limited to 'sound/usb/usbquirks.h')
-rw-r--r--sound/usb/usbquirks.h100
1 files changed, 98 insertions, 2 deletions
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 5a2f518c6629..743568f89907 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -88,7 +88,19 @@
88 .bInterfaceClass = USB_CLASS_AUDIO, 88 .bInterfaceClass = USB_CLASS_AUDIO,
89 .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL 89 .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL
90}, 90},
91 91/* E-Mu devices */
92{
93 .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
94 .idVendor = 0x041e,
95 .idProduct = 0x3f02,
96 .bInterfaceClass = USB_CLASS_AUDIO,
97},
98{
99 .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
100 .idVendor = 0x041e,
101 .idProduct = 0x3f04,
102 .bInterfaceClass = USB_CLASS_AUDIO,
103},
92/* 104/*
93 * Yamaha devices 105 * Yamaha devices
94 */ 106 */
@@ -1254,7 +1266,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1254 } 1266 }
1255}, 1267},
1256 /* TODO: add Edirol PC-80 support */ 1268 /* TODO: add Edirol PC-80 support */
1257 /* TODO: add Edirol UA-1EX support */ 1269{
1270 USB_DEVICE(0x0582, 0x0096),
1271 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1272 .vendor_name = "EDIROL",
1273 .product_name = "UA-1EX",
1274 .ifnum = QUIRK_ANY_INTERFACE,
1275 .type = QUIRK_COMPOSITE,
1276 .data = (const struct snd_usb_audio_quirk[]) {
1277 {
1278 .ifnum = 0,
1279 .type = QUIRK_AUDIO_STANDARD_INTERFACE
1280 },
1281 {
1282 .ifnum = 1,
1283 .type = QUIRK_AUDIO_STANDARD_INTERFACE
1284 },
1285 {
1286 .ifnum = -1
1287 }
1288 }
1289 }
1290},
1258{ 1291{
1259 USB_DEVICE(0x0582, 0x009a), 1292 USB_DEVICE(0x0582, 0x009a),
1260 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { 1293 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -1567,6 +1600,40 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1567 } 1600 }
1568 } 1601 }
1569}, 1602},
1603{
1604 USB_DEVICE(0x0763, 0x2019),
1605 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1606 /* .vendor_name = "M-Audio", */
1607 /* .product_name = "Ozone Academic", */
1608 .ifnum = QUIRK_ANY_INTERFACE,
1609 .type = QUIRK_COMPOSITE,
1610 .data = & (const struct snd_usb_audio_quirk[]) {
1611 {
1612 .ifnum = 0,
1613 .type = QUIRK_AUDIO_STANDARD_INTERFACE
1614 },
1615 {
1616 .ifnum = 1,
1617 .type = QUIRK_AUDIO_STANDARD_INTERFACE
1618 },
1619 {
1620 .ifnum = 2,
1621 .type = QUIRK_AUDIO_STANDARD_INTERFACE
1622 },
1623 {
1624 .ifnum = 3,
1625 .type = QUIRK_MIDI_MIDIMAN,
1626 .data = & (const struct snd_usb_midi_endpoint_info) {
1627 .out_cables = 0x0001,
1628 .in_cables = 0x0001
1629 }
1630 },
1631 {
1632 .ifnum = -1
1633 }
1634 }
1635 }
1636},
1570 1637
1571/* Casio devices */ 1638/* Casio devices */
1572{ 1639{
@@ -1709,6 +1776,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1709 } 1776 }
1710}, 1777},
1711 1778
1779/* Stanton/N2IT Final Scratch v1 device ('Scratchamp') */
1780{
1781 USB_DEVICE(0x103d, 0x0100),
1782 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1783 .vendor_name = "Stanton",
1784 .product_name = "ScratchAmp",
1785 .ifnum = QUIRK_NO_INTERFACE
1786 }
1787},
1788{
1789 USB_DEVICE(0x103d, 0x0101),
1790 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1791 .vendor_name = "Stanton",
1792 .product_name = "ScratchAmp",
1793 .ifnum = QUIRK_NO_INTERFACE
1794 }
1795},
1796
1712/* Novation EMS devices */ 1797/* Novation EMS devices */
1713{ 1798{
1714 USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001), 1799 USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
@@ -1738,6 +1823,17 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1738 } 1823 }
1739}, 1824},
1740 1825
1826/* */
1827{
1828 /* aka. Serato Scratch Live DJ Box */
1829 USB_DEVICE(0x13e5, 0x0001),
1830 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1831 .vendor_name = "Rane",
1832 .product_name = "SL-1",
1833 .ifnum = QUIRK_NO_INTERFACE
1834 }
1835},
1836
1741/* Miditech devices */ 1837/* Miditech devices */
1742{ 1838{
1743 USB_DEVICE(0x4752, 0x0011), 1839 USB_DEVICE(0x4752, 0x0011),