diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-05-17 03:14:27 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-05-29 04:11:00 -0400 |
commit | d3ff42fd2b4fddb5d779e9e03a2ea44147aa8048 (patch) | |
tree | aaf04b4404acd97f548c615efd53cf91f6d9e754 | |
parent | d138b44589cc180418f5a20cb0ecfe338123d86c (diff) |
[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: Clemens Ladisch <clemens@ladisch.de>
-rw-r--r-- | sound/usb/usbquirks.h | 270 |
1 files changed, 220 insertions, 50 deletions
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 00781fea2115..f5135641b3e2 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
@@ -203,11 +203,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
203 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 203 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
204 | .vendor_name = "EDIROL", | 204 | .vendor_name = "EDIROL", |
205 | .product_name = "UM-4", | 205 | .product_name = "UM-4", |
206 | .ifnum = 2, | 206 | .ifnum = QUIRK_ANY_INTERFACE, |
207 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 207 | .type = QUIRK_COMPOSITE, |
208 | .data = & (const snd_usb_midi_endpoint_info_t) { | 208 | .data = (const snd_usb_audio_quirk_t[]) { |
209 | .out_cables = 0x000f, | 209 | { |
210 | .in_cables = 0x000f | 210 | .ifnum = 0, |
211 | .type = QUIRK_IGNORE_INTERFACE | ||
212 | }, | ||
213 | { | ||
214 | .ifnum = 1, | ||
215 | .type = QUIRK_IGNORE_INTERFACE | ||
216 | }, | ||
217 | { | ||
218 | .ifnum = 2, | ||
219 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
220 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
221 | .out_cables = 0x000f, | ||
222 | .in_cables = 0x000f | ||
223 | } | ||
224 | }, | ||
225 | { | ||
226 | .ifnum = -1 | ||
227 | } | ||
211 | } | 228 | } |
212 | } | 229 | } |
213 | }, | 230 | }, |
@@ -216,11 +233,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
216 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 233 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
217 | .vendor_name = "Roland", | 234 | .vendor_name = "Roland", |
218 | .product_name = "SC-8850", | 235 | .product_name = "SC-8850", |
219 | .ifnum = 2, | 236 | .ifnum = QUIRK_ANY_INTERFACE, |
220 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 237 | .type = QUIRK_COMPOSITE, |
221 | .data = & (const snd_usb_midi_endpoint_info_t) { | 238 | .data = (const snd_usb_audio_quirk_t[]) { |
222 | .out_cables = 0x003f, | 239 | { |
223 | .in_cables = 0x003f | 240 | .ifnum = 0, |
241 | .type = QUIRK_IGNORE_INTERFACE | ||
242 | }, | ||
243 | { | ||
244 | .ifnum = 1, | ||
245 | .type = QUIRK_IGNORE_INTERFACE | ||
246 | }, | ||
247 | { | ||
248 | .ifnum = 2, | ||
249 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
250 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
251 | .out_cables = 0x003f, | ||
252 | .in_cables = 0x003f | ||
253 | } | ||
254 | }, | ||
255 | { | ||
256 | .ifnum = -1 | ||
257 | } | ||
224 | } | 258 | } |
225 | } | 259 | } |
226 | }, | 260 | }, |
@@ -229,11 +263,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
229 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 263 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
230 | .vendor_name = "Roland", | 264 | .vendor_name = "Roland", |
231 | .product_name = "U-8", | 265 | .product_name = "U-8", |
232 | .ifnum = 2, | 266 | .ifnum = QUIRK_ANY_INTERFACE, |
233 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 267 | .type = QUIRK_COMPOSITE, |
234 | .data = & (const snd_usb_midi_endpoint_info_t) { | 268 | .data = (const snd_usb_audio_quirk_t[]) { |
235 | .out_cables = 0x0005, | 269 | { |
236 | .in_cables = 0x0005 | 270 | .ifnum = 0, |
271 | .type = QUIRK_IGNORE_INTERFACE | ||
272 | }, | ||
273 | { | ||
274 | .ifnum = 1, | ||
275 | .type = QUIRK_IGNORE_INTERFACE | ||
276 | }, | ||
277 | { | ||
278 | .ifnum = 2, | ||
279 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
280 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
281 | .out_cables = 0x0005, | ||
282 | .in_cables = 0x0005 | ||
283 | } | ||
284 | }, | ||
285 | { | ||
286 | .ifnum = -1 | ||
287 | } | ||
237 | } | 288 | } |
238 | } | 289 | } |
239 | }, | 290 | }, |
@@ -242,11 +293,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
242 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 293 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
243 | .vendor_name = "EDIROL", | 294 | .vendor_name = "EDIROL", |
244 | .product_name = "UM-2", | 295 | .product_name = "UM-2", |
245 | .ifnum = 2, | 296 | .ifnum = QUIRK_ANY_INTERFACE, |
246 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 297 | .type = QUIRK_COMPOSITE, |
247 | .data = & (const snd_usb_midi_endpoint_info_t) { | 298 | .data = (const snd_usb_audio_quirk_t[]) { |
248 | .out_cables = 0x0003, | 299 | { |
249 | .in_cables = 0x0003 | 300 | .ifnum = 0, |
301 | .type = QUIRK_IGNORE_INTERFACE | ||
302 | }, | ||
303 | { | ||
304 | .ifnum = 1, | ||
305 | .type = QUIRK_IGNORE_INTERFACE | ||
306 | }, | ||
307 | { | ||
308 | .ifnum = 2, | ||
309 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
310 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
311 | .out_cables = 0x0003, | ||
312 | .in_cables = 0x0003 | ||
313 | } | ||
314 | }, | ||
315 | { | ||
316 | .ifnum = -1 | ||
317 | } | ||
250 | } | 318 | } |
251 | } | 319 | } |
252 | }, | 320 | }, |
@@ -255,11 +323,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
255 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 323 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
256 | .vendor_name = "Roland", | 324 | .vendor_name = "Roland", |
257 | .product_name = "SC-8820", | 325 | .product_name = "SC-8820", |
258 | .ifnum = 2, | 326 | .ifnum = QUIRK_ANY_INTERFACE, |
259 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 327 | .type = QUIRK_COMPOSITE, |
260 | .data = & (const snd_usb_midi_endpoint_info_t) { | 328 | .data = (const snd_usb_audio_quirk_t[]) { |
261 | .out_cables = 0x0013, | 329 | { |
262 | .in_cables = 0x0013 | 330 | .ifnum = 0, |
331 | .type = QUIRK_IGNORE_INTERFACE | ||
332 | }, | ||
333 | { | ||
334 | .ifnum = 1, | ||
335 | .type = QUIRK_IGNORE_INTERFACE | ||
336 | }, | ||
337 | { | ||
338 | .ifnum = 2, | ||
339 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
340 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
341 | .out_cables = 0x0013, | ||
342 | .in_cables = 0x0013 | ||
343 | } | ||
344 | }, | ||
345 | { | ||
346 | .ifnum = -1 | ||
347 | } | ||
263 | } | 348 | } |
264 | } | 349 | } |
265 | }, | 350 | }, |
@@ -268,11 +353,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
268 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 353 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
269 | .vendor_name = "Roland", | 354 | .vendor_name = "Roland", |
270 | .product_name = "PC-300", | 355 | .product_name = "PC-300", |
271 | .ifnum = 2, | 356 | .ifnum = QUIRK_ANY_INTERFACE, |
272 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 357 | .type = QUIRK_COMPOSITE, |
273 | .data = & (const snd_usb_midi_endpoint_info_t) { | 358 | .data = (const snd_usb_audio_quirk_t[]) { |
274 | .out_cables = 0x0001, | 359 | { |
275 | .in_cables = 0x0001 | 360 | .ifnum = 0, |
361 | .type = QUIRK_IGNORE_INTERFACE | ||
362 | }, | ||
363 | { | ||
364 | .ifnum = 1, | ||
365 | .type = QUIRK_IGNORE_INTERFACE | ||
366 | }, | ||
367 | { | ||
368 | .ifnum = 2, | ||
369 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
370 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
371 | .out_cables = 0x0001, | ||
372 | .in_cables = 0x0001 | ||
373 | } | ||
374 | }, | ||
375 | { | ||
376 | .ifnum = -1 | ||
377 | } | ||
276 | } | 378 | } |
277 | } | 379 | } |
278 | }, | 380 | }, |
@@ -281,11 +383,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
281 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 383 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
282 | .vendor_name = "EDIROL", | 384 | .vendor_name = "EDIROL", |
283 | .product_name = "UM-1", | 385 | .product_name = "UM-1", |
284 | .ifnum = 2, | 386 | .ifnum = QUIRK_ANY_INTERFACE, |
285 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 387 | .type = QUIRK_COMPOSITE, |
286 | .data = & (const snd_usb_midi_endpoint_info_t) { | 388 | .data = (const snd_usb_audio_quirk_t[]) { |
287 | .out_cables = 0x0001, | 389 | { |
288 | .in_cables = 0x0001 | 390 | .ifnum = 0, |
391 | .type = QUIRK_IGNORE_INTERFACE | ||
392 | }, | ||
393 | { | ||
394 | .ifnum = 1, | ||
395 | .type = QUIRK_IGNORE_INTERFACE | ||
396 | }, | ||
397 | { | ||
398 | .ifnum = 2, | ||
399 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
400 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
401 | .out_cables = 0x0001, | ||
402 | .in_cables = 0x0001 | ||
403 | } | ||
404 | }, | ||
405 | { | ||
406 | .ifnum = -1 | ||
407 | } | ||
289 | } | 408 | } |
290 | } | 409 | } |
291 | }, | 410 | }, |
@@ -294,11 +413,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
294 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 413 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
295 | .vendor_name = "Roland", | 414 | .vendor_name = "Roland", |
296 | .product_name = "SK-500", | 415 | .product_name = "SK-500", |
297 | .ifnum = 2, | 416 | .ifnum = QUIRK_ANY_INTERFACE, |
298 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 417 | .type = QUIRK_COMPOSITE, |
299 | .data = & (const snd_usb_midi_endpoint_info_t) { | 418 | .data = (const snd_usb_audio_quirk_t[]) { |
300 | .out_cables = 0x0013, | 419 | { |
301 | .in_cables = 0x0013 | 420 | .ifnum = 0, |
421 | .type = QUIRK_IGNORE_INTERFACE | ||
422 | }, | ||
423 | { | ||
424 | .ifnum = 1, | ||
425 | .type = QUIRK_IGNORE_INTERFACE | ||
426 | }, | ||
427 | { | ||
428 | .ifnum = 2, | ||
429 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
430 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
431 | .out_cables = 0x0013, | ||
432 | .in_cables = 0x0013 | ||
433 | } | ||
434 | }, | ||
435 | { | ||
436 | .ifnum = -1 | ||
437 | } | ||
302 | } | 438 | } |
303 | } | 439 | } |
304 | }, | 440 | }, |
@@ -421,11 +557,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
421 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 557 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
422 | .vendor_name = "EDIROL", | 558 | .vendor_name = "EDIROL", |
423 | .product_name = "SD-90", | 559 | .product_name = "SD-90", |
424 | .ifnum = 2, | 560 | .ifnum = QUIRK_ANY_INTERFACE, |
425 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 561 | .type = QUIRK_COMPOSITE, |
426 | .data = & (const snd_usb_midi_endpoint_info_t) { | 562 | .data = (const snd_usb_audio_quirk_t[]) { |
427 | .out_cables = 0x000f, | 563 | { |
428 | .in_cables = 0x000f | 564 | .ifnum = 0, |
565 | .type = QUIRK_IGNORE_INTERFACE | ||
566 | }, | ||
567 | { | ||
568 | .ifnum = 1, | ||
569 | .type = QUIRK_IGNORE_INTERFACE | ||
570 | }, | ||
571 | { | ||
572 | .ifnum = 2, | ||
573 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
574 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
575 | .out_cables = 0x000f, | ||
576 | .in_cables = 0x000f | ||
577 | } | ||
578 | }, | ||
579 | { | ||
580 | .ifnum = -1 | ||
581 | } | ||
429 | } | 582 | } |
430 | } | 583 | } |
431 | }, | 584 | }, |
@@ -434,11 +587,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
434 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { | 587 | .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { |
435 | .vendor_name = "Roland", | 588 | .vendor_name = "Roland", |
436 | .product_name = "MMP-2", | 589 | .product_name = "MMP-2", |
437 | .ifnum = 2, | 590 | .ifnum = QUIRK_ANY_INTERFACE, |
438 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | 591 | .type = QUIRK_COMPOSITE, |
439 | .data = & (const snd_usb_midi_endpoint_info_t) { | 592 | .data = (const snd_usb_audio_quirk_t[]) { |
440 | .out_cables = 0x0001, | 593 | { |
441 | .in_cables = 0x0001 | 594 | .ifnum = 0, |
595 | .type = QUIRK_IGNORE_INTERFACE | ||
596 | }, | ||
597 | { | ||
598 | .ifnum = 1, | ||
599 | .type = QUIRK_IGNORE_INTERFACE | ||
600 | }, | ||
601 | { | ||
602 | .ifnum = 2, | ||
603 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
604 | .data = & (const snd_usb_midi_endpoint_info_t) { | ||
605 | .out_cables = 0x0001, | ||
606 | .in_cables = 0x0001 | ||
607 | } | ||
608 | }, | ||
609 | { | ||
610 | .ifnum = -1 | ||
611 | } | ||
442 | } | 612 | } |
443 | } | 613 | } |
444 | }, | 614 | }, |