Greg KH wrote:
> Can you also make up a 2.5 patch for this?
sync with Nagano's version:
- protect vendors ids against multiple definitions
- sort Roland device ids
- fix SC-8850 cable bitmask
- add quirk for the SC-8820
- add quirk for the MOTU Fastlane
--- linux-2.5.x/drivers/usb/class/usb-midi.h Wed Feb 26 22:35:48 2003
+++ linux/drivers/usb/class/usb-midi.h Wed Feb 26 22:35:48 2003
@@ -37,22 +37,35 @@
/* ------------------------------------------------------------------------- */
/* Roland MIDI Devices */
+#ifndef USB_VENDOR_ID_ROLAND
#define USB_VENDOR_ID_ROLAND 0x0582
+#endif
#define USBMIDI_ROLAND_UA100G 0x0000
#define USBMIDI_ROLAND_MPU64 0x0002
#define USBMIDI_ROLAND_SC8850 0x0003
#define USBMIDI_ROLAND_UM2 0x0005
-#define USBMIDI_ROLAND_UM1 0x0009
+#define USBMIDI_ROLAND_SC8820 0x0007
#define USBMIDI_ROLAND_PC300 0x0008
+#define USBMIDI_ROLAND_UM1 0x0009
/* YAMAHA MIDI Devices */
+#ifndef USB_VENDOR_ID_YAMAHA
#define USB_VENDOR_ID_YAMAHA 0x0499
+#endif
#define USBMIDI_YAMAHA_MU1000 0x1001
/* Steinberg MIDI Devices */
+#ifndef USB_VENDOR_ID_STEINBERG
#define USB_VENDOR_ID_STEINBERG 0x0763
+#endif
#define USBMIDI_STEINBERG_USB2MIDI 0x1001
+/* Mark of the Unicorn MIDI Devices */
+#ifndef USB_VENDOR_ID_MOTU
+#define USB_VENDOR_ID_MOTU 0x07fd
+#endif
+#define USBMIDI_MOTU_FASTLANE 0x0001
+
/* ------------------------------------------------------------------------- */
/* Supported devices */
@@ -100,10 +113,17 @@
{ /* Roland SC8850 */
"Roland SC8850",
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8850, 2, -1,
- { { 0x81, 15 }, {-1, -1} }, /** cables 0,1,2, and 3 **/
- { { 0x01, 15 }, {-1, -1} },
+ { { 0x81, 0x3f }, {-1, -1} },
+ { { 0x01, 0x3f }, {-1, -1} },
},
+ { /* Roland SC8820 */
+ "Roland SC8820",
+ USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8820, 2, -1,
+ { { 0x81, 0x13 }, {-1, -1} },
+ { { 0x01, 0x13 }, {-1, -1} },
+ },
+
{ /* YAMAHA MU1000 */
"YAMAHA MU1000",
USB_VENDOR_ID_YAMAHA, USBMIDI_YAMAHA_MU1000, 0, -1,
@@ -115,6 +135,12 @@
USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_PC300, 2, -1,
{ { 0x81, 1 }, {-1, -1} },
{ { 0x01, 1 }, {-1, -1} },
+ },
+ { /* MOTU Fastlane USB */
+ "MOTU Fastlane USB",
+ USB_VENDOR_ID_MOTU, USBMIDI_MOTU_FASTLANE, 1, 0,
+ { { 0x82, 3 }, {-1, -1} },
+ { { 0x02, 3 }, {-1, -1} },
}
};
@@ -130,7 +156,9 @@
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_UA100G ) },
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_PC300 ) },
{ USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8850 ) },
+ { USB_DEVICE( USB_VENDOR_ID_ROLAND, USBMIDI_ROLAND_SC8820 ) },
{ USB_DEVICE( USB_VENDOR_ID_YAMAHA, USBMIDI_YAMAHA_MU1000 ) },
+ { USB_DEVICE( USB_VENDOR_ID_MOTU, USBMIDI_MOTU_FASTLANE ) },
/* { USB_DEVICE( USB_VENDOR_ID_STEINBERG, USBMIDI_STEINBERG_USB2MIDI ) },*/
{ } /* Terminating entry */
};
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
