Skip to content

L
linux
Commit 1a88e80e authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files
Options

ALSA CVS update - Takashi Iwai <tiwai@suse.de> 

USB generic driver
Clemens Ladisch <clemens@ladisch.de>:

- fix Edirol comment
- use special macros for Yamaha devices
- add support for Yamaha MOTIF-R, CVP-204, CVP-206, CVP-208, CVP-210,
  PSR-1100, PSR-2100, PSR-K1, EZ-250i, MOTIF ES 6, MOTIF ES 7,
  MOTIF ES 8, CS1D, DSP1D, ACU16-C, NHB32-C, DM1000, 01V96
parent 6ea42f87
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 193 deletions
sound/usb/usbquirks.h
View file @ 1a88e80e
...@@ -39,202 +39,72 @@ ...@@ -39,202 +39,72 @@
.idProduct = prod, \ .idProduct = prod, \
.bInterfaceClass = USB_CLASS_VENDOR_SPEC .bInterfaceClass = USB_CLASS_VENDOR_SPEC
/* Yamaha devices */ /*
{ * Yamaha devices
USB_DEVICE(0x0499, 0x1000), */
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha", #define YAMAHA_DEVICE(id, name) { \
.product_name = "UX256", USB_DEVICE(0x0499, id), \
.ifnum = QUIRK_ANY_INTERFACE, .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { \
.type = QUIRK_MIDI_YAMAHA .vendor_name = "Yamaha", \
} .product_name = name, \
}, .ifnum = QUIRK_ANY_INTERFACE, \
{ .type = QUIRK_MIDI_YAMAHA \
USB_DEVICE(0x0499, 0x1001), } \
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { }
.vendor_name = "Yamaha", #define YAMAHA_INTERFACE(id, intf, name) { \
.product_name = "MU1000", USB_DEVICE_VENDOR_SPEC(0x0499, id), \
.ifnum = QUIRK_ANY_INTERFACE, .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { \
.type = QUIRK_MIDI_YAMAHA .vendor_name = "Yamaha", \
} .product_name = name, \
}, .ifnum = intf, \
{ .type = QUIRK_MIDI_YAMAHA \
USB_DEVICE(0x0499, 0x1002), } \
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { }
.vendor_name = "Yamaha", YAMAHA_DEVICE(0x1000, "UX256"),
.product_name = "MU2000", YAMAHA_DEVICE(0x1001, "MU1000"),
.ifnum = QUIRK_ANY_INTERFACE, YAMAHA_DEVICE(0x1002, "MU2000"),
.type = QUIRK_MIDI_YAMAHA YAMAHA_DEVICE(0x1003, "MU500"),
} YAMAHA_INTERFACE(0x1004, 3, "UW500"),
}, YAMAHA_DEVICE(0x1005, "MOTIF6"),
{ YAMAHA_DEVICE(0x1006, "MOTIF7"),
USB_DEVICE(0x0499, 0x1003), YAMAHA_DEVICE(0x1007, "MOTIF8"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { YAMAHA_DEVICE(0x1008, "UX96"),
.vendor_name = "Yamaha", YAMAHA_DEVICE(0x1009, "UX16"),
.product_name = "MU500", YAMAHA_INTERFACE(0x100a, 3, "EOS BX"),
.ifnum = QUIRK_ANY_INTERFACE, YAMAHA_DEVICE(0x100e, "S08"),
.type = QUIRK_MIDI_YAMAHA YAMAHA_DEVICE(0x100f, "CLP-150"),
} YAMAHA_DEVICE(0x1010, "CLP-170"),
}, YAMAHA_DEVICE(0x1011, "P-250"),
{ YAMAHA_DEVICE(0x1012, "TYROS"),
USB_DEVICE_VENDOR_SPEC(0x0499, 0x1004), YAMAHA_DEVICE(0x1013, "PF-500"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { YAMAHA_DEVICE(0x1014, "S90"),
.vendor_name = "Yamaha", YAMAHA_DEVICE(0x1015, "MOTIF-R"),
.product_name = "UW500", YAMAHA_DEVICE(0x1017, "CVP-204"),
.ifnum = 3, YAMAHA_DEVICE(0x1018, "CVP-206"),
.type = QUIRK_MIDI_YAMAHA YAMAHA_DEVICE(0x1019, "CVP-208"),
} YAMAHA_DEVICE(0x101a, "CVP-210"),
}, YAMAHA_DEVICE(0x101b, "PSR-1100"),
{ YAMAHA_DEVICE(0x101c, "PSR-2100"),
USB_DEVICE(0x0499, 0x1005), YAMAHA_DEVICE(0x101e, "PSR-K1"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { YAMAHA_DEVICE(0x1020, "EZ-250i"),
.vendor_name = "Yamaha", YAMAHA_DEVICE(0x1021, "MOTIF ES 6"),
.product_name = "MOTIF6", YAMAHA_DEVICE(0x1022, "MOTIF ES 7"),
.ifnum = QUIRK_ANY_INTERFACE, YAMAHA_DEVICE(0x1023, "MOTIF ES 8"),
.type = QUIRK_MIDI_YAMAHA YAMAHA_DEVICE(0x5000, "CS1D"),
} YAMAHA_DEVICE(0x5001, "DSP1D"),
}, YAMAHA_DEVICE(0x5002, "DME32"),
{ YAMAHA_DEVICE(0x5003, "DM2000"),
USB_DEVICE(0x0499, 0x1006), YAMAHA_DEVICE(0x5004, "02R96"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { YAMAHA_DEVICE(0x5005, "ACU16-C"),
.vendor_name = "Yamaha", YAMAHA_DEVICE(0x5006, "NHB32-C"),
.product_name = "MOTIF7", YAMAHA_DEVICE(0x5007, "DM1000"),
.ifnum = QUIRK_ANY_INTERFACE, YAMAHA_DEVICE(0x5008, "01V96"),
.type = QUIRK_MIDI_YAMAHA #undef YAMAHA_DEVICE
} #undef YAMAHA_INTERFACE
},
{
USB_DEVICE(0x0499, 0x1007),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "MOTIF8",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x1008),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "UX96",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x1009),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "UX16",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE_VENDOR_SPEC(0x0499, 0x100a),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "EOS BX",
.ifnum = 3,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x100e),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "S08",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x100f),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "CLP-150",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x1010),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "CLP-170",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x1011),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "P-250",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x1012),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "TYROS",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x1013),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "PF-500",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x1014),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "S90",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x5002),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "DME32",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x5003),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "DM2000",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
{
USB_DEVICE(0x0499, 0x5004),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Yamaha",
.product_name = "02R96",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_MIDI_YAMAHA
}
},
/* /*
* Roland/RolandED/Edirol devices * Roland/RolandED/Edirol devices
*
* The USB MIDI Specification has been written by Roland,
* but a 100% conforming Roland device has yet to be found.
*/ */
{ {
USB_DEVICE(0x0582, 0x0000), USB_DEVICE(0x0582, 0x0000),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7