Skip to content

L
linux
Commit d3ff42fd authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files
Options

[ALSA] usb-audio - claim all interfaces for Roland USB MIDI devices 

USB generic driver
Many Roland USB MIDI devices have two interfaces that are currently not
used by the driver; claim them anyway.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent d138b445
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 50 deletions
sound/usb/usbquirks.h
View file @ d3ff42fd
...@@ -203,12 +203,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -203,12 +203,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "EDIROL", .vendor_name = "EDIROL",
.product_name = "UM-4", .product_name = "UM-4",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x000f, .out_cables = 0x000f,
.in_cables = 0x000f .in_cables = 0x000f
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -216,12 +233,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -216,12 +233,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Roland", .vendor_name = "Roland",
.product_name = "SC-8850", .product_name = "SC-8850",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x003f, .out_cables = 0x003f,
.in_cables = 0x003f .in_cables = 0x003f
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -229,12 +263,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -229,12 +263,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Roland", .vendor_name = "Roland",
.product_name = "U-8", .product_name = "U-8",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x0005, .out_cables = 0x0005,
.in_cables = 0x0005 .in_cables = 0x0005
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -242,12 +293,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -242,12 +293,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "EDIROL", .vendor_name = "EDIROL",
.product_name = "UM-2", .product_name = "UM-2",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x0003, .out_cables = 0x0003,
.in_cables = 0x0003 .in_cables = 0x0003
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -255,12 +323,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -255,12 +323,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Roland", .vendor_name = "Roland",
.product_name = "SC-8820", .product_name = "SC-8820",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x0013, .out_cables = 0x0013,
.in_cables = 0x0013 .in_cables = 0x0013
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -268,12 +353,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -268,12 +353,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Roland", .vendor_name = "Roland",
.product_name = "PC-300", .product_name = "PC-300",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x0001, .out_cables = 0x0001,
.in_cables = 0x0001 .in_cables = 0x0001
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -281,12 +383,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -281,12 +383,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "EDIROL", .vendor_name = "EDIROL",
.product_name = "UM-1", .product_name = "UM-1",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x0001, .out_cables = 0x0001,
.in_cables = 0x0001 .in_cables = 0x0001
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -294,12 +413,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -294,12 +413,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Roland", .vendor_name = "Roland",
.product_name = "SK-500", .product_name = "SK-500",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x0013, .out_cables = 0x0013,
.in_cables = 0x0013 .in_cables = 0x0013
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -421,12 +557,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -421,12 +557,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "EDIROL", .vendor_name = "EDIROL",
.product_name = "SD-90", .product_name = "SD-90",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x000f, .out_cables = 0x000f,
.in_cables = 0x000f .in_cables = 0x000f
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
...@@ -434,12 +587,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -434,12 +587,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
.vendor_name = "Roland", .vendor_name = "Roland",
.product_name = "MMP-2", .product_name = "MMP-2",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const snd_usb_audio_quirk_t[]) {
{
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE
},
{
.ifnum = 2, .ifnum = 2,
.type = QUIRK_MIDI_FIXED_ENDPOINT, .type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const snd_usb_midi_endpoint_info_t) { .data = & (const snd_usb_midi_endpoint_info_t) {
.out_cables = 0x0001, .out_cables = 0x0001,
.in_cables = 0x0001 .in_cables = 0x0001
} }
},
{
.ifnum = -1
}
}
} }
}, },
{ {
......
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