mirror of
https://github.com/torvalds/linux.git
synced 2024-09-21 07:23:06 +00:00
ALSA: snd-usb: re-order some quirk entries
No code change, just a cosmetic cleanup to keep entries ordered by the device ID within a block of unique vendor IDs. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Daniel Mack
Takashi Iwai
parent
8c4b79cf21
commit
358b7dfa1c
|
|
@ -72,16 +72,6 @@
|
|||
}
|
||||
},
|
||||
|
||||
/* Creative/Toshiba Multimedia Center SB-0500 */
|
||||
{
|
||||
USB_DEVICE(0x041e, 0x3048),
|
||||
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||
.vendor_name = "Toshiba",
|
||||
.product_name = "SB-0500",
|
||||
.ifnum = QUIRK_NO_INTERFACE
|
||||
}
|
||||
},
|
||||
|
||||
/* Creative/E-Mu devices */
|
||||
{
|
||||
USB_DEVICE(0x041e, 0x3010),
|
||||
|
|
@ -91,6 +81,15 @@
|
|||
.ifnum = QUIRK_NO_INTERFACE
|
||||
}
|
||||
},
|
||||
/* Creative/Toshiba Multimedia Center SB-0500 */
|
||||
{
|
||||
USB_DEVICE(0x041e, 0x3048),
|
||||
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||
.vendor_name = "Toshiba",
|
||||
.product_name = "SB-0500",
|
||||
.ifnum = QUIRK_NO_INTERFACE
|
||||
}
|
||||
},
|
||||
{
|
||||
/* E-Mu 0202 USB */
|
||||
.match_flags = USB_DEVICE_ID_MATCH_DEVICE,
|
||||
|
|
@ -2520,6 +2519,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
|||
.type = QUIRK_MIDI_RAW_BYTES
|
||||
}
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x1235, 0x0010),
|
||||
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
|
||||
.vendor_name = "Focusrite",
|
||||
.product_name = "Saffire 6 USB",
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_COMPOSITE,
|
||||
.data = (const struct snd_usb_audio_quirk[]) {
|
||||
{
|
||||
.ifnum = 0,
|
||||
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
|
||||
.data = &(const struct audioformat) {
|
||||
.formats = SNDRV_PCM_FMTBIT_S24_3LE,
|
||||
.channels = 4,
|
||||
.iface = 0,
|
||||
.altsetting = 1,
|
||||
.altset_idx = 1,
|
||||
.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
|
||||
.endpoint = 0x01,
|
||||
.ep_attr = USB_ENDPOINT_XFER_ISOC,
|
||||
.rates = SNDRV_PCM_RATE_44100 |
|
||||
SNDRV_PCM_RATE_48000,
|
||||
.rate_min = 44100,
|
||||
.rate_max = 48000,
|
||||
.nr_rates = 2,
|
||||
.rate_table = (unsigned int[]) {
|
||||
44100, 48000
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
.ifnum = 1,
|
||||
.type = QUIRK_MIDI_RAW_BYTES
|
||||
},
|
||||
{
|
||||
.ifnum = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x1235, 0x0018),
|
||||
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||
|
|
@ -2570,38 +2609,49 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
|||
}
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x1235, 0x0010),
|
||||
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
|
||||
/*
|
||||
* Focusrite Scarlett 18i6
|
||||
*
|
||||
* Avoid mixer creation, which otherwise fails because some of
|
||||
* the interface descriptor subtypes for interface 0 are
|
||||
* unknown. That should be fixed or worked-around but this at
|
||||
* least allows the device to be used successfully with a DAW
|
||||
* and an external mixer. See comments below about other
|
||||
* ignored interfaces.
|
||||
*/
|
||||
USB_DEVICE(0x1235, 0x8004),
|
||||
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||
.vendor_name = "Focusrite",
|
||||
.product_name = "Saffire 6 USB",
|
||||
.product_name = "Scarlett 18i6",
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_COMPOSITE,
|
||||
.data = (const struct snd_usb_audio_quirk[]) {
|
||||
.data = & (const struct snd_usb_audio_quirk[]) {
|
||||
{
|
||||
/* InterfaceSubClass 1 (Control Device) */
|
||||
.ifnum = 0,
|
||||
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
|
||||
.data = &(const struct audioformat) {
|
||||
.formats = SNDRV_PCM_FMTBIT_S24_3LE,
|
||||
.channels = 4,
|
||||
.iface = 0,
|
||||
.altsetting = 1,
|
||||
.altset_idx = 1,
|
||||
.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
|
||||
.endpoint = 0x01,
|
||||
.ep_attr = USB_ENDPOINT_XFER_ISOC,
|
||||
.rates = SNDRV_PCM_RATE_44100 |
|
||||
SNDRV_PCM_RATE_48000,
|
||||
.rate_min = 44100,
|
||||
.rate_max = 48000,
|
||||
.nr_rates = 2,
|
||||
.rate_table = (unsigned int[]) {
|
||||
44100, 48000
|
||||
}
|
||||
}
|
||||
.type = QUIRK_IGNORE_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 1,
|
||||
.type = QUIRK_MIDI_RAW_BYTES
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 2,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
/* InterfaceSubClass 1 (Control Device) */
|
||||
.ifnum = 3,
|
||||
.type = QUIRK_IGNORE_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 4,
|
||||
.type = QUIRK_MIDI_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
/* InterfaceSubClass 1 (Device Firmware Update) */
|
||||
.ifnum = 5,
|
||||
.type = QUIRK_IGNORE_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = -1
|
||||
|
|
@ -2710,20 +2760,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
|||
.type = QUIRK_AUDIO_ALIGN_TRANSFER,
|
||||
}
|
||||
},
|
||||
{
|
||||
USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240),
|
||||
.match_flags = USB_DEVICE_ID_MATCH_DEVICE |
|
||||
USB_DEVICE_ID_MATCH_INT_CLASS |
|
||||
USB_DEVICE_ID_MATCH_INT_SUBCLASS,
|
||||
.bInterfaceClass = USB_CLASS_AUDIO,
|
||||
.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
|
||||
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
|
||||
.vendor_name = "Hauppauge",
|
||||
.product_name = "HVR-850",
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_AUDIO_ALIGN_TRANSFER,
|
||||
}
|
||||
},
|
||||
{
|
||||
USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210),
|
||||
.match_flags = USB_DEVICE_ID_MATCH_DEVICE |
|
||||
|
|
@ -2794,6 +2830,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
|||
.type = QUIRK_AUDIO_ALIGN_TRANSFER,
|
||||
}
|
||||
},
|
||||
{
|
||||
USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240),
|
||||
.match_flags = USB_DEVICE_ID_MATCH_DEVICE |
|
||||
USB_DEVICE_ID_MATCH_INT_CLASS |
|
||||
USB_DEVICE_ID_MATCH_INT_SUBCLASS,
|
||||
.bInterfaceClass = USB_CLASS_AUDIO,
|
||||
.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
|
||||
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
|
||||
.vendor_name = "Hauppauge",
|
||||
.product_name = "HVR-850",
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_AUDIO_ALIGN_TRANSFER,
|
||||
}
|
||||
},
|
||||
{
|
||||
USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280),
|
||||
.match_flags = USB_DEVICE_ID_MATCH_DEVICE |
|
||||
|
|
@ -3092,58 +3142,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
|||
}
|
||||
},
|
||||
|
||||
{
|
||||
/*
|
||||
* Focusrite Scarlett 18i6
|
||||
*
|
||||
* Avoid mixer creation, which otherwise fails because some of
|
||||
* the interface descriptor subtypes for interface 0 are
|
||||
* unknown. That should be fixed or worked-around but this at
|
||||
* least allows the device to be used successfully with a DAW
|
||||
* and an external mixer. See comments below about other
|
||||
* ignored interfaces.
|
||||
*/
|
||||
USB_DEVICE(0x1235, 0x8004),
|
||||
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||
.vendor_name = "Focusrite",
|
||||
.product_name = "Scarlett 18i6",
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_COMPOSITE,
|
||||
.data = & (const struct snd_usb_audio_quirk[]) {
|
||||
{
|
||||
/* InterfaceSubClass 1 (Control Device) */
|
||||
.ifnum = 0,
|
||||
.type = QUIRK_IGNORE_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 1,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 2,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
/* InterfaceSubClass 1 (Control Device) */
|
||||
.ifnum = 3,
|
||||
.type = QUIRK_IGNORE_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 4,
|
||||
.type = QUIRK_MIDI_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
/* InterfaceSubClass 1 (Device Firmware Update) */
|
||||
.ifnum = 5,
|
||||
.type = QUIRK_IGNORE_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
/*
|
||||
* Some USB MIDI devices don't have an audio control interface,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user