Re: Support for EDIROL UM-3ex

[Brent Cook <busterbcook@yahoo.com>]

[-- Attachment #1: Type: text/plain, Size: 855 bytes --]

On Monday 09 January 2006 08:52, Takashi Iwai wrote:
> At Sat, 31 Dec 2005 21:54:35 -0600,
>
> Brent Cook wrote:
> > Dear all,
> >
> > 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.
>
> The patch looks OK to me, but it cannot be applied because we removed
> xxx_t typedefs in the latest ALSA code.  Could you regenerate a patch
> for Linus' latest git tree (also together with Signed-off-by line) ?
>
> Thanks.
>
> Takashi

Here you go. By the way. what was the rationale behind removing the typedefs? 
I always agonize over when to choose a typedef over a struct.

 - Brent

[-- Attachment #2: um-3ex.patch --]
[-- Type: text/x-diff, Size: 1309 bytes --]

diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index f15b021..905e33e 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 6190ada..8f34861 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",