sync

2 files changed, 87 insertions, 17 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index fae4111671e..0dd7318148e 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.90 2004/06/13 19:53:26 mickey Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.91 2004/06/27 19:44:29 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.87 2004/06/13 19:52:57 mickey Exp 
+ *	OpenBSD: usbdevs,v 1.88 2004/06/27 19:44:19 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1287,12 +1287,22 @@
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial adapter REX-USB60 */
 
 /* Roland products */
-#define	USB_PRODUCT_ROLAND_SC8850	0x0003		/* RolandED SC-8850 MIDI */
+#define	USB_PRODUCT_ROLAND_UA100	0x0000		/* UA-100 Audio I/F */
+#define	USB_PRODUCT_ROLAND_UM4	0x0002		/* UM-4 MIDI I/F */
+#define	USB_PRODUCT_ROLAND_SC8850	0x0003		/* SC-8850 MIDI Synth */
+#define	USB_PRODUCT_ROLAND_U8	0x0004		/* U-8 Audio I/F */
+#define	USB_PRODUCT_ROLAND_UM2	0x0005		/* UM-2 MIDI I/F */
+#define	USB_PRODUCT_ROLAND_SC8820	0x0007		/* SC-8820 MIDI Synth */
+#define	USB_PRODUCT_ROLAND_PC300	0x0008		/* PC-300 MIDI Keyboard */
 #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 */
+#define	USB_PRODUCT_ROLAND_SK500	0x000b		/* SK-500 MIDI Keyboard */
+#define	USB_PRODUCT_ROLAND_SCD70	0x000c		/* SC-D70 MIDI Synth */
+#define	USB_PRODUCT_ROLAND_UM880N	0x0014		/* UM-880 MIDI I/F */
+#define	USB_PRODUCT_ROLAND_SD90	0x0016		/* SD-90 MIDI Synth */
+#define	USB_PRODUCT_ROLAND_UM550	0x0023		/* UM-550 MIDI I/F */
+#define	USB_PRODUCT_ROLAND_SD20	0x0027		/* SD-20 MIDI Synth */
+#define	USB_PRODUCT_ROLAND_SD80	0x0029		/* SD-80 MIDI Synth */
+#define	USB_PRODUCT_ROLAND_UA700	0x002b		/* UA-700 Audio I/F */
 
 /* 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 6599a42afb4..0295572e35e 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.90 2004/06/13 19:53:27 mickey Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.91 2004/06/27 19:44:29 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.87 2004/06/13 19:52:57 mickey Exp 
+ *	OpenBSD: usbdevs,v 1.88 2004/06/27 19:44:19 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -3467,10 +3467,46 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB serial adapter REX-USB60",
 	},
 	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA100,
+	    0,
+	    "Roland",
+	    "UA-100 Audio I/F",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM4,
+	    0,
+	    "Roland",
+	    "UM-4 MIDI I/F",
+	},
+	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8850,
 	    0,
 	    "Roland",
-	    "RolandED SC-8850 MIDI",
+	    "SC-8850 MIDI Synth",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_U8,
+	    0,
+	    "Roland",
+	    "U-8 Audio I/F",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM2,
+	    0,
+	    "Roland",
+	    "UM-2 MIDI I/F",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8820,
+	    0,
+	    "Roland",
+	    "SC-8820 MIDI Synth",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_PC300,
+	    0,
+	    "Roland",
+	    "PC-300 MIDI Keyboard",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
@@ -3479,28 +3515,52 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UM-1 MIDI I/F",
 	},
 	{
-	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA3,
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SK500,
 	    0,
 	    "Roland",
-	    "EDIROL UA-3 USB audio I/F",
+	    "SK-500 MIDI Keyboard",
 	},
 	{
-	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880N,
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SCD70,
 	    0,
 	    "Roland",
-	    "EDIROL UM-880 MIDI I/F (native)",
+	    "SC-D70 MIDI Synth",
 	},
 	{
-	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880G,
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880N,
 	    0,
 	    "Roland",
-	    "EDIROL UM-880 MIDI I/F (generic)",
+	    "UM-880 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD90,
 	    0,
 	    "Roland",
-	    "EDIROL SD-90 STDIO Canvas MIDI",
+	    "SD-90 MIDI Synth",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM550,
+	    0,
+	    "Roland",
+	    "UM-550 MIDI I/F",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD20,
+	    0,
+	    "Roland",
+	    "SD-20 MIDI Synth",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD80,
+	    0,
+	    "Roland",
+	    "SD-80 MIDI Synth",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA700,
+	    0,
+	    "Roland",
+	    "UA-700 Audio I/F",
 	},
 	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,