ChangeSet 1.1021, 2003/03/05 14:18:05-08:00, [EMAIL PROTECTED]
[PATCH] usb-midi.h: fixes for SC-8820/50
Clemens Ladisch wrote:
> OK, here are further changes for 2.4.
... and now, hopefully, with correct formatting.
sync with Nagano's version:
- protect vendor ids against multiple definitions
- sort Roland device ids
- add SC-8820 table entry for hotplugging
- add quirk for the MOTU Fastlane
drivers/usb/usb-midi.h | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff -Nru a/drivers/usb/usb-midi.h b/drivers/usb/usb-midi.h
--- a/drivers/usb/usb-midi.h Thu Mar 6 14:23:24 2003
+++ b/drivers/usb/usb-midi.h Thu Mar 6 14:23:24 2003
@@ -37,23 +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_SC8820 0x0007
#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 devices */
+#ifndef USB_VENDOR_ID_MOTU
+#define USB_VENDOR_ID_MOTU 0x07fd
+#endif
+#define USBMIDI_MOTU_FASTLANE 0x0001
+
/* ------------------------------------------------------------------------- */
/* Supported devices */
@@ -123,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} },
}
};
@@ -138,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: Etnus, makers of TotalView, The debugger
for complex code. Debugging C/C++ programs can leave you feeling lost and
disoriented. TotalView can help you find your way. Available on major UNIX
and Linux platforms. Try it free. www.etnus.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
