sync

2 files changed, 85 insertions, 29 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index cafbd0c1cd4..0a6e753eba5 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs.h,v 1.48 2002/06/21 00:33:20 art Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.49 2002/07/04 05:50:10 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.45 2002/06/17 16:24:41 nate Exp 
+ *	OpenBSD: usbdevs,v 1.47 2002/07/04 05:49:28 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
+/* $NetBSD: usbdevs,v 1.257 2002/06/20 09:20:36 augustss Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -363,9 +363,10 @@
 
 /* 3Com products */
 #define	USB_PRODUCT_3COM_HOMECONN	0x009d		/* HomeConnect Camera */
+#define	USB_PRODUCT_3COM_3CREB96	0x00a0		/* Bluetooth USB Adapter */
 #define	USB_PRODUCT_3COM_3C19250	0x03E8		/* 3C19250 Ethernet */
-#define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 */
 #define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect 3C460 */
+#define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 */
 #define	USB_PRODUCT_3COM_3C460B	0x4601		/* HomeConnect 3C460B */
 
 #define	USB_PRODUCT_3COMUSR_OFFICECONN	0x0082		/* 3Com OfficeConnect Analog Modem */
@@ -476,6 +477,7 @@
 
 /* Atmel Comp. products */
 #define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
+#define	USB_PRODUCT_ATMEL_DWL900AP	0x5601		/* DWL-900AP Wireless access point */
 #define	USB_PRODUCT_ATMEL_DWL120	0x7602		/* DWL-120 Wireless adapter */
 
 /* Audio-Technica products */
@@ -662,6 +664,9 @@
 /* Fuji photo products */
 #define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
 
+/* Genesys Logic products */
+#define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash */
+
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
@@ -669,9 +674,6 @@
 #define	USB_PRODUCT_GREENHOUSE_KANA21	0x0001		/* CF-writer/MP3 Player */
 #define	USB_PRODUCT_GREENHOUSE2_USBKR100	0x8150		/* GH-USB100B Ethernet */
 
-/* Genesys Logic products */
-#define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash */
-
 /* Griffin Technology */
 #define	USB_PRODUCT_GRIFFIN_IMATE	0x0405		/* iMate, ADB adapter */
 
@@ -1119,9 +1121,12 @@
 #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_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 */
 
 /* Rockfire products */
 #define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
@@ -1196,12 +1201,14 @@
 #define	USB_PRODUCT_SONY_MSACUS1	0x002d		/* Memorystick MSAC-US1 */
 #define	USB_PRODUCT_SONY_HANDYCAM	0x002e		/* Handycam */
 #define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC Memorystick Slot */
+#define	USB_PRODUCT_SONY_CLIE_35	0x0038		/* Clie v3.5 */
 #define	USB_PRODUCT_SONY_PS2KEYBOARD	0x005c		/* PlayStation2 keyboard */
 #define	USB_PRODUCT_SONY_PS2KEYBOARDHUB	0x005d		/* PlayStation2 keyboard hub */
 #define	USB_PRODUCT_SONY_PS2MOUSE	0x0061		/* PlayStatoin2 mouse */
-#define	USB_PRODUCT_SONY_CLIE_35	0x0038		/* Sony Clie v3.5 */
-#define	USB_PRODUCT_SONY_CLIE_40	0x0066		/* Sony Clie v4.0 */
-#define	USB_PRODUCT_SONY_CLIE_40_MS	0x006d		/* Sony Clie v4.0 Memory Stick slot */
+#define	USB_PRODUCT_SONY_CLIE_40	0x0066		/* Clie v4.0 */
+#define	USB_PRODUCT_SONY_CLIE_40_MS	0x006d		/* Clie v4.0 Memory Stick slot */
+#define	USB_PRODUCT_SONY_CLIE_41_MS	0x0099		/* Clie v4.1 Memory Stick slot */
+#define	USB_PRODUCT_SONY_CLIE_41	0x009a		/* Clie v4.1 */
 
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* Communicator */
@@ -1280,6 +1287,7 @@
 /* Visioneer products */
 #define	USB_PRODUCT_VISIONEER_7600	0x0211		/* OneTouch 7600 */
 #define	USB_PRODUCT_VISIONEER_5300	0x0221		/* OneTouch 5300 */
+#define	USB_PRODUCT_VISIONEER_3000	0x0224		/* Scanport 3000 */
 #define	USB_PRODUCT_VISIONEER_6100	0x0231		/* OneTouch 6100 */
 #define	USB_PRODUCT_VISIONEER_6200	0x0311		/* OneTouch 6200 */
 #define	USB_PRODUCT_VISIONEER_8100	0x0321		/* OneTouch 8100 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 0ebca59fdc0..e4d961a2a42 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.48 2002/06/21 00:33:20 art Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.49 2002/07/04 05:50:10 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.45 2002/06/17 16:24:41 nate Exp 
+ *	OpenBSD: usbdevs,v 1.47 2002/07/04 05:49:28 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
+/* $NetBSD: usbdevs,v 1.257 2002/06/20 09:20:36 augustss Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -53,16 +53,16 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "HomeConnect Camera",
 	},
 	{
-	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3CREB96,
 	    0,
 	    "3Com",
-	    "3C19250 Ethernet",
+	    "Bluetooth USB Adapter",
 	},
 	{
-	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
 	    0,
 	    "3Com",
-	    "U.S.Robotics 56000",
+	    "3C19250 Ethernet",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
@@ -71,6 +71,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "HomeConnect 3C460",
 	},
 	{
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
+	    0,
+	    "3Com",
+	    "U.S.Robotics 56000",
+	},
+	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B,
 	    0,
 	    "3Com",
@@ -455,6 +461,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UHB124 hub",
 	},
 	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL900AP,
+	    0,
+	    "Atmel",
+	    "DWL-900AP Wireless access point",
+	},
+	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL120,
 	    0,
 	    "Atmel",
@@ -1073,6 +1085,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Mass Storage",
 	},
 	{
+	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
+	    0,
+	    "Genesys Logic",
+	    "GL641USB CompactFlash",
+	},
+	{
 	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
 	    0,
 	    "Advanced Gravis Computer",
@@ -1091,12 +1109,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "GH-USB100B Ethernet",
 	},
 	{
-	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
-	    0,
-	    "Genesys Logic",
-	    "GL641USB CompactFlash",
-	},
-	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
 	    0,
 	    "Griffin Technology",
@@ -2885,12 +2897,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB serial adapter REX-USB60",
 	},
 	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8850,
+	    0,
+	    "Roland",
+	    "RolandED SC-8850 MIDI",
+	},
+	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
 	    0,
 	    "Roland",
 	    "UM-1 MIDI I/F",
 	},
 	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA3,
+	    0,
+	    "Roland",
+	    "EDIROL UA-3 USB audio I/F",
+	},
+	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880N,
 	    0,
 	    "Roland",
@@ -2903,6 +2927,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",
+	},
+	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
 	    0,
 	    "Rockfire",
@@ -3143,6 +3173,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sony MSC Memorystick Slot",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35,
+	    0,
+	    "Sony",
+	    "Clie v3.5",
+	},
+	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARD,
 	    0,
 	    "Sony",
@@ -3161,22 +3197,28 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "PlayStatoin2 mouse",
 	},
 	{
-	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35,
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40,
 	    0,
 	    "Sony",
-	    "Sony Clie v3.5",
+	    "Clie v4.0",
 	},
 	{
-	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40,
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40_MS,
 	    0,
 	    "Sony",
-	    "Sony Clie v4.0",
+	    "Clie v4.0 Memory Stick slot",
 	},
 	{
-	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40_MS,
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41_MS,
+	    0,
+	    "Sony",
+	    "Clie v4.1 Memory Stick slot",
+	},
+	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41,
 	    0,
 	    "Sony",
-	    "Sony Clie v4.0 Memory Stick slot",
+	    "Clie v4.1",
 	},
 	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
@@ -3401,6 +3443,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "OneTouch 5300",
 	},
 	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_3000,
+	    0,
+	    "Visioneer",
+	    "Scanport 3000",
+	},
+	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100,
 	    0,
 	    "Visioneer",