diff options
author | Brent Cook <busterbcook@yahoo.com> | 2006-01-10 14:27:20 +0100 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 10:22:14 +0100 |
commit | e03173fce2f2c233b755f2d668d6d4247a717453 (patch) | |
tree | c1ba0936ae513f308fda33db69fc3d626d2a9c99 /sound/usb | |
parent | 34226c4239861654c69888e6e98973b2cc908c0b (diff) | |
download | linux-3.10-e03173fce2f2c233b755f2d668d6d4247a717453.tar.gz linux-3.10-e03173fce2f2c233b755f2d668d6d4247a717453.tar.bz2 linux-3.10-e03173fce2f2c233b755f2d668d6d4247a717453.zip |
[ALSA] Add support for EDIROL UM-3ex
Modules: USB generic driver
This is my naive attempt at adding ALSA device support. The attached
patch provides support for the EDIROL UM-3ex. This is a 3-port USB midi
interface with a built-in USB hub and the ability to chain 2 other
UM-3x's in a master-slave configuration. I only have one, so I do not
know how this works in practice.
Though this is a 3-port device, I had to throw in that 4th 'Control' interface
to the definition in order to make the 3rd port work. If I set in/out_cables
to 0x000b, a 3rd interface appears on the driver, but it does nothing.
Changing it to 0x000f allows the 3rd interface to work, but of course
interface 4 does not work because it does not exist.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbmidi.c | 2 | ||||
-rw-r--r-- | sound/usb/usbquirks.h | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c index f15b021c3ce..905e33e6068 100644 --- a/sound/usb/usbmidi.c +++ b/sound/usb/usbmidi.c @@ -1092,6 +1092,8 @@ static struct { { USB_ID(0x086a, 0x0001), 8, "%s Broadcast" }, { USB_ID(0x086a, 0x0002), 8, "%s Broadcast" }, { USB_ID(0x086a, 0x0003), 4, "%s Broadcast" }, + /* Edirol UM-3ex */ + { USB_ID(0x0582, 0x009a), 3, "%s Control" }, }; static void snd_usbmidi_init_substream(struct snd_usb_midi* umidi, diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 6190ada00e3..8f348611bb0 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h @@ -204,6 +204,28 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { + USB_DEVICE(0x0582, 0x009a), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "EDIROL", + .product_name = "UM-3ex", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x000f, + .in_cables = 0x000f + } + }, + { + .ifnum = -1 + } + } + } +}, +{ USB_DEVICE(0x0582, 0x0002), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "EDIROL", |