summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortshiozak <tshiozak@NetBSD.org>2002-06-19 13:55:30 +0000
committertshiozak <tshiozak@NetBSD.org>2002-06-19 13:55:30 +0000
commitdb90de7aba9e1b9ca82e2e08eab1a22e7b154fde (patch)
tree8104d51d3f9323924871f2ad4cca72c6f48a8113 /sys/dev
parent9fd9d36a301017b7db03fd6e3eab33deac4fd698 (diff)
add ROLAND/EDIROL SC-8850/SD-90.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/umidi_quirks.c36
-rw-r--r--sys/dev/usb/usbdevs.h6
-rw-r--r--sys/dev/usb/usbdevs_data.h16
3 files changed, 52 insertions, 6 deletions
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index 607b67251b2..b5245b89e3c 100644
--- a/sys/dev/usb/umidi_quirks.c
+++ b/sys/dev/usb/umidi_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.3 2001/11/13 06:24:56 lukem Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.3 2001/11/13 06:24:56 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,6 +122,36 @@ UMQ_DEF(ROLAND, ROLAND_UM1, 2) = {
UMQ_TERMINATOR
};
+/*
+ * ROLAND SC-8850
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SC8850, 2, 1, 1) = {
+ /* out */
+ { 0, 6 },
+ /* in */
+ { 1, 6 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_SC8850, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SC8850, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND SD-90
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SD90, 2, 1, 1) = {
+ /* out */
+ { 0, 4 },
+ /* in */
+ { 1, 4 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_SD90, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SD90, 2),
+ UMQ_TERMINATOR
+};
+
/*
* ROLAND UM-880 (native mode)
@@ -147,6 +177,8 @@ struct umidi_quirk umidi_quirklist[] = {
UMQ_REG(YAMAHA, YAMAHA_UX256, ANYIFACE),
UMQ_REG(YAMAHA, ANYPRODUCT, ANYIFACE),
UMQ_REG(ROLAND, ROLAND_UM1, 2),
+ UMQ_REG(ROLAND, ROLAND_SC8850, 2),
+ UMQ_REG(ROLAND, ROLAND_SD90, 2),
UMQ_REG(ROLAND, ROLAND_UM880N, 0),
UMQ_TERMINATOR
};
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index d4e2ddebde8..db7bf33bf50 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.260 2002/06/18 01:02:39 augustss Exp $ */
+/* $NetBSD: usbdevs.h,v 1.261 2002/06/19 13:55:30 tshiozak Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.255 2002/06/18 01:02:15 augustss Exp
+ * NetBSD: usbdevs,v 1.256 2002/06/19 13:54:06 tshiozak Exp
*/
/*
@@ -1105,10 +1105,12 @@
#define USB_PRODUCT_RAINBOW_IKEY2000 0x1200 /* i-Key 2000 */
/* Roland products */
+#define USB_PRODUCT_ROLAND_SC8850 0x0003 /* RolandED SC-8850 SOUND Canvas MIDI Synth. */
#define USB_PRODUCT_ROLAND_UM1 0x0009 /* UM-1 MIDI I/F */
#define USB_PRODUCT_ROLAND_UA3 0x000f /* EDIROL UA-3 USB audio I/F */
#define USB_PRODUCT_ROLAND_UM880N 0x0014 /* EDIROL UM-880 MIDI I/F (native) */
#define USB_PRODUCT_ROLAND_UM880G 0x0015 /* EDIROL UM-880 MIDI I/F (generic) */
+#define USB_PRODUCT_ROLAND_SD90 0x0016 /* EDIROL SD-90 STDIO Canvas MIDI Synth. */
/* Rockfire products */
#define USB_PRODUCT_ROCKFIRE_GAMEPAD 0x2033 /* gamepad 203USB */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index ce81e661d6d..94ad849c71a 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.261 2002/06/18 01:02:40 augustss Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.262 2002/06/19 13:55:30 tshiozak Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.255 2002/06/18 01:02:15 augustss Exp
+ * NetBSD: usbdevs,v 1.256 2002/06/19 13:54:06 tshiozak Exp
*/
/*
@@ -2860,6 +2860,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"i-Key 2000",
},
{
+ USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8850,
+ 0,
+ "Roland",
+ "RolandED SC-8850 SOUND Canvas MIDI Synth.",
+ },
+ {
USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
0,
"Roland",
@@ -2884,6 +2890,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"EDIROL UM-880 MIDI I/F (generic)",
},
{
+ USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD90,
+ 0,
+ "Roland",
+ "EDIROL SD-90 STDIO Canvas MIDI Synth.",
+ },
+ {
USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
0,
"Rockfire",