sync

2 files changed, 512 insertions, 35 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index fef26f39c7b..76f31364234 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.45 2002/05/07 18:29:18 nate Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.46 2002/06/10 01:23:02 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.43 2002/04/01 21:35:52 nate Exp 
+ *	OpenBSD: usbdevs,v 1.44 2002/06/10 01:22:33 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
 
@@ -213,6 +213,7 @@
 #define	USB_VENDOR_APEX	0x0624		/* Apex */
 #define	USB_VENDOR_AVISION	0x0638		/* Avision */
 #define	USB_VENDOR_TEAC	0x0644		/* TEAC */
+#define	USB_VENDOR_SANWASUPPLY	0x0663		/* Sanwa Supply */
 #define	USB_VENDOR_LINKSYS	0x066b		/* Linksys */
 #define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America */
 #define	USB_VENDOR_SIGMATEL	0x066f		/* Sigmatel */
@@ -296,6 +297,7 @@
 #define	USB_VENDOR_EXTENDED	0x08e9		/* Extended Systems */
 #define	USB_VENDOR_MSYSTEMS	0x08ec		/* M-Systems */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec */
+#define	USB_VENDOR_AUDIOTECHNICA	0x0909		/* Audio-Technica */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems */
 #define	USB_VENDOR_CONCORDCAMERA	0x0919		/* Concord Camera */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
@@ -328,10 +330,13 @@
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
+#define	USB_VENDOR_KURUSUGAWA	0x0b7e		/* Kurusugawa Electronics, Inc. */
 #define	USB_VENDOR_GREENHOUSE2	0x0bda		/* GREENHOUSE */
 #define	USB_VENDOR_ADDONICS2	0x0bf6		/* Addonics Technology */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
+#define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
+#define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
@@ -472,6 +477,9 @@
 #define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
 #define	USB_PRODUCT_ATMEL_DWL120	0x7602		/* DWL-120 Wireless adapter */
 
+/* Audio-Technica products */
+#define	USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB	0x0009		/* ATC-HA4USB USB headphone */
+
 /* Avision products */
 #define	USB_PRODUCT_AVISION_1200U	0x0268		/* 1200U scanner */
 
@@ -586,6 +594,9 @@
 /* DMI products */
 #define	USB_PRODUCT_DMI_SA2_0	0xb001		/* Storage Adapter */
 
+/* EasyDisk products */
+#define	USB_PRODUCT_EASYDISK_EASYDISK	0x0005		/* Flash Disk */
+
 /* EIZO products */
 #define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
 #define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
@@ -643,6 +654,7 @@
 #define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
 
 /* Future Technology Devices products */
+#define	USB_PRODUCT_FTDI_SERIAL_8U232AM	0x6001		/* 8U232AM Serial converter */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
 #define	USB_PRODUCT_FTDI_SERIAL	0x8372		/* Serial converter */
 
@@ -656,15 +668,15 @@
 #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 */
 
 /* Guillemot Corporation */
 #define	USB_PRODUCT_GUILLEMOT_DALEADER	0xa300		/* DA Leader */
 
-/* Genesys Logic products */
-#define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash */
-
 /* Hagiwara products */
 #define	USB_PRODUCT_HAGIWARA_FGSM	0x0002		/* FlashGate SmartMedia Reader */
 #define	USB_PRODUCT_HAGIWARA_FGCF	0x0003		/* FlashGate CompactFlash Reader */
@@ -696,11 +708,13 @@
 #define	USB_PRODUCT_HP_4300C	0x0305		/* Scanjet 4300C */
 #define	USB_PRODUCT_HP_CD4E	0x0307		/* CD-Writer+ CD-4e */
 #define	USB_PRODUCT_HP_G85XI	0x0311		/* OfficeJet G85xi */
+#define	USB_PRODUCT_HP_1200	0x0317		/* LaserJet 1200 */
 #define	USB_PRODUCT_HP_5200C	0x0401		/* Scanjet 5200C */
 #define	USB_PRODUCT_HP_830C	0x0404		/* DeskJet 830C */
 #define	USB_PRODUCT_HP_3400CSE	0x0405		/* ScanJet 3400cse */
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
 #define	USB_PRODUCT_HP_840C	0x0604		/* DeskJet 840c */
+#define	USB_PRODUCT_HP_2200C	0x0605		/* ScanJet 2200C */
 #define	USB_PRODUCT_HP_5300C	0x0701		/* Scanjet 5300C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
 #define	USB_PRODUCT_HP_5400C	0x1005		/* Scanjet 5400C */
@@ -719,7 +733,27 @@
 #define	USB_PRODUCT_IIYAMA_HUB	0x0201		/* Hub */
 
 /* Inside Out Networks products */
-#define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 serial ports */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 RS232 */
+#define	USB_PRODUCT_INSIDEOUT_HUBPORT7	0x0002		/* Hubport/7 */
+#define	USB_PRODUCT_INSIDEOUT_RAPIDPORT4	0x0003		/* Rapidport/4 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT4T	0x0004		/* Edgeport/4 RS232 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT2	0x0005		/* Edgeport/2 RS232 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT4I	0x0006		/* Edgeport/4 RS422 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT2I	0x0007		/* Edgeport/2 RS422/RS485 */
+#define	USB_PRODUCT_INSIDEOUT_HUBPORT4	0x0008		/* Hubport/4 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT8HAND	0x0009		/* Hand-built Edgeport/8 */
+#define	USB_PRODUCT_INSIDEOUT_MULTIMODEM	0x000A		/* MultiTech version of RP/4 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT	0x000B		/* Edgeport/(4)21 Parallel port */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT421	0x000C		/* Edgeport/421 Hub+RS232+Parallel */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT21	0x000D		/* Edgeport/21 RS232+Parallel */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT8DC	0x000E		/* 1/2 Edgeport/8 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT8	0x000F		/* Edgeport/8 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT2DIN	0x0010		/* Edgeport/2 RS232/DIN */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT4DIN	0x0011		/* Edgeport/4 RS232/DIN */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT16DC	0x0012		/* 1/2 Edgeport/16 */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORTCOMP	0x0013		/* Edgeport Compatible */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT8I	0x0014		/* Edgeport/8 RS422 */
+#define	USB_PRODUCT_INSIDEOUT_MT4X56USB	0x1403		/* OEM device */
 
 /* In-System products */
 #define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel adapter */
@@ -739,6 +773,8 @@
 #define	USB_PRODUCT_INTERSIL_PRISM_2X	0x3642		/* Prism2.x WLAN */
 
 /* I/O DATA products */
+#define	USB_PRODUCT_IODATA_USBSSMRW	0x0314		/* USB-SSMRW SD-card adapter */
+#define	USB_PRODUCT_IODATA_USBSDRW	0x031e		/* USB-SDRW SD-card adapter */
 #define	USB_PRODUCT_IODATA_USBETT	0x0901		/* USB ETT */
 #define	USB_PRODUCT_IODATA_USBETTX	0x0904		/* USB ETTX */
 #define	USB_PRODUCT_IODATA_USBETTXS	0x0913		/* USB ETTX */
@@ -769,14 +805,33 @@
 #define	USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA	0x5002		/* VideoCAM VGA */
 
 /* Keyspan products */
-#define	USB_PRODUCT_KEYSPAN_USA28	0x0101		/* USA-28 serial adapter */
-#define	USB_PRODUCT_KEYSPAN_USA28X	0x0102		/* USA-28X serial adapter */
-#define	USB_PRODUCT_KEYSPAN_USA19	0x0103		/* USA-19 serial adapter */
-#define	USB_PRODUCT_KEYSPAN_USA18X	0x0105		/* USA-18X serial adapter */
-#define	USB_PRODUCT_KEYSPAN_USA19W	0x0106		/* USA-19W serial adapter */
-#define	USB_PRODUCT_KEYSPAN_USA49W	0x0109		/* USA-49W serial adapter */
-#define	USB_PRODUCT_KEYSPAN_USA19Q	0x010b		/* USA-19Q serial adapter */
-#define	USB_PRODUCT_KEYSPAN_UIA10_NF	0x0201		/* UIA-10 remote control */
+#define	USB_PRODUCT_KEYSPAN_USA28_NF	0x0101		/* USA-28 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA28X_NF	0x0102		/* USA-28X serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19_NF	0x0103		/* USA-19 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA18_NF	0x0104		/* USA-18 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA18X_NF	0x0105		/* USA-18X serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19W_NF	0x0106		/* USA-19W serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19	0x0107		/* USA-19 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19W	0x0108		/* USA-19W serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA49W_NF	0x0109		/* USA-49W serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA49W	0x010a		/* USA-49W serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19QI_NF	0x010b		/* USA-19QI serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19QI	0x010c		/* USA-19QI serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19Q_NF	0x010d		/* USA-19Q serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19Q	0x010e		/* USA-19Q serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA28	0x010f		/* USA-28 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA28XXB	0x0110		/* USA-28X/XB serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA18	0x0111		/* USA-18 serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA18X	0x0112		/* USA-18X serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA28XB_NF	0x0113		/* USA-28XB serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA28XA_NF	0x0114		/* USA-28XB serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA28XA	0x0115		/* USA-28XA serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA18XA_NF	0x0116		/* USA-18XA serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA18XA	0x0117		/* USA-18XA serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19QW_NF	0x0118		/* USA-19WQ serial adapter */
+#define	USB_PRODUCT_KEYSPAN_USA19QW	0x0119		/* USA-19WQ serial adapter */
+#define	USB_PRODUCT_KEYSPAN_UIA10	0x0201		/* UIA-10 remote control */
+#define	USB_PRODUCT_KEYSPAN_UIA11	0x0202		/* UIA-11 remote control */
 
 /* Kingston products */
 #define	USB_PRODUCT_KINGSTON_XX1	0x0008		/* Ethernet */
@@ -834,9 +889,11 @@
 #define	USB_PRODUCT_LOGITECH_WMMOUSE	0xc004		/* WingMan Gaming Mouse */
 #define	USB_PRODUCT_LOGITECH_BD58	0xc00c		/* BD58 mouse */
 #define	USB_PRODUCT_LOGITECH_UN58A	0xc030		/* iFeel Mouse */
-#define	USB_PRODUCT_LOGITECH_BB13	0xc401		/* USB-PS/2 Trackball */
 #define	USB_PRODUCT_LOGITECH_WMPAD	0xc208		/* WingMan GamePad Extreme */
 #define	USB_PRODUCT_LOGITECH_WMJOY	0xc281		/* WingMan Force joystick */
+#define	USB_PRODUCT_LOGITECH_WMFFGP	0xc293		/* WingMan Formula Force GP (GT-Force) */
+#define	USB_PRODUCT_LOGITECH_BB13	0xc401		/* USB-PS/2 Trackball */
+#define	USB_PRODUCT_LOGITECH_BB18	0xc404		/* TrackMan Wheel */
 #define	USB_PRODUCT_LOGITECH_RK53	0xc501		/* Cordless mouse */
 #define	USB_PRODUCT_LOGITECH_RB6	0xc503		/* Cordless keyboard */
 #define	USB_PRODUCT_LOGITECH_CDO	0xc504		/* Cordless Desktop Optical */
@@ -870,6 +927,7 @@
 #define	USB_PRODUCT_MICROSOFT_NATURALKBD	0x000b		/* Natural */
 #define	USB_PRODUCT_MICROSOFT_DDS80	0x0014		/* Digital Sound System 80 */
 #define	USB_PRODUCT_MICROSOFT_SIDEWINDER	0x001a		/* Sidewinder Precision Racing Wheel */
+#define	USB_PRODUCT_MICROSOFT_TBEXPLORER	0x0024		/* Trackball Explorer */
 #define	USB_PRODUCT_MICROSOFT_INTELLIEYE	0x0025		/* IntelliEye mouse */
 #define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Keyboard Pro */
 
@@ -900,6 +958,7 @@
 
 /* Mitsumi products */
 #define	USB_PRODUCT_MITSUMI_CDRRW	0x0000		/* CD-R/RW Drive */
+#define	USB_PRODUCT_MITSUMI_MOUSE	0x6407		/* Mouse */
 #define	USB_PRODUCT_MITSUMI_FDD	0x6901		/* FDD */
 
 /* Mobility products */
@@ -990,8 +1049,14 @@
 #define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
+#define	USB_PRODUCT_PHILIPS_PCA645VC	0x0302		/* PCA645VC PC Camera */
 #define	USB_PRODUCT_PHILIPS_PCA646VC	0x0303		/* PCA646VC PC Camera */
+#define	USB_PRODUCT_PHILIPS_PCVC675K	0x0307		/* PCVC675K Vesta PC Camera */
 #define	USB_PRODUCT_PHILIPS_PCVC680K	0x0308		/* PCVC680K Vesta Pro PC Camera */
+#define	USB_PRODUCT_PHILIPS_PCVC690K	0x030c		/* PCVC690K Vesta Pro Scan Camera */
+#define	USB_PRODUCT_PHILIPS_PCVC730K	0x0310		/* PCVC730K ToUCam Fun PC Camera */
+#define	USB_PRODUCT_PHILIPS_PCVC740K	0x0311		/* PCVC740K ToUCam Pro PC Camera */
+#define	USB_PRODUCT_PHILIPS_PCVC750K	0x0312		/* PCVC750K ToUCam Pro Scan Camera */
 #define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_DIVAUSB	0x1801		/* DIVA USB mp3 player */
 
@@ -1069,6 +1134,9 @@
 #define	USB_PRODUCT_SANDISK_SDDR12	0x0100		/* ImageMate SDDR-12 */
 #define	USB_PRODUCT_SANDISK_SDDR09	0x0200		/* ImageMate SDDR-09 */
 
+/* Sanwa Supply products */
+#define	USB_PRODUCT_SANWASUPPLY_JYDV9USB	0x9806		/* JY-DV9USB gamepad */
+
 /* ScanLogic products */
 #define	USB_PRODUCT_SCANLOGIC_SL11R	0x0002		/* SL11R-IDE */
 #define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 scanner */
@@ -1127,6 +1195,9 @@
 #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_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 */
@@ -1152,6 +1223,9 @@
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 */
 #define	USB_PRODUCT_DIAMOND2_RIO800USB	0x5002		/* Rio 800 USB */
 
+/* Tangtop products */
+#define	USB_PRODUCT_TANGTOP_USBPS2	0x0001		/* USBPS2 */
+
 /* Taugagreining products */
 #define	USB_PRODUCT_TAUGA_CAMERAMATE	0x0005		/* CameraMate (DPCM_USB) */
  
@@ -1220,6 +1294,7 @@
 /* Yamaha products */
 #define	USB_PRODUCT_YAMAHA_UX256	0x1000		/* UX256 MIDI I/F */
 #define	USB_PRODUCT_YAMAHA_UX96	0x1008		/* UX96 MIDI I/F */
+#define	USB_PRODUCT_YAMAHA_RPU200	0x3104		/* RP-U200 */
 
 /* Yano products */
 #define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index a4715eb8da9..909bc594404 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.45 2002/05/07 18:29:18 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.46 2002/06/10 01:23:02 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.43 2002/04/01 21:35:52 nate Exp 
+ *	OpenBSD: usbdevs,v 1.44 2002/06/10 01:22:33 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
 
@@ -461,6 +461,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWL-120 Wireless adapter",
 	},
 	{
+	    USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB,
+	    0,
+	    "Audio-Technica",
+	    "ATC-HA4USB USB headphone",
+	},
+	{
 	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
 	    0,
 	    "Avision",
@@ -809,6 +815,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Storage Adapter",
 	},
 	{
+	    USB_VENDOR_EASYDISK, USB_PRODUCT_EASYDISK_EASYDISK,
+	    0,
+	    "EasyDisk",
+	    "Flash Disk",
+	},
+	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
 	    0,
 	    "EIZO",
@@ -1037,6 +1049,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Connector for DVD drive",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM,
+	    0,
+	    "Future Technology Devices",
+	    "8U232AM Serial converter",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
 	    0,
 	    "Future Technology Devices",
@@ -1073,6 +1091,12 @@ 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",
@@ -1085,12 +1109,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DA Leader",
 	},
 	{
-	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
-	    0,
-	    "Genesys Logic",
-	    "GL641USB CompactFlash",
-	},
-	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
 	    0,
 	    "Hagiwara Sys-Com",
@@ -1223,6 +1241,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "OfficeJet G85xi",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_1200,
+	    0,
+	    "Hewlett Packard",
+	    "LaserJet 1200",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
 	    0,
 	    "Hewlett Packard",
@@ -1253,6 +1277,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DeskJet 840c",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_2200C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 2200C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
 	    0,
 	    "Hewlett Packard",
@@ -1316,7 +1346,127 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
 	    0,
 	    "Inside Out Networks",
-	    "EdgePort/4 serial ports",
+	    "EdgePort/4 RS232",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_HUBPORT7,
+	    0,
+	    "Inside Out Networks",
+	    "Hubport/7",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_RAPIDPORT4,
+	    0,
+	    "Inside Out Networks",
+	    "Rapidport/4",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4T,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/4 RS232",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/2 RS232",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4I,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/4 RS422",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2I,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/2 RS422/RS485",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_HUBPORT4,
+	    0,
+	    "Inside Out Networks",
+	    "Hubport/4",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8HAND,
+	    0,
+	    "Inside Out Networks",
+	    "Hand-built Edgeport/8",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_MULTIMODEM,
+	    0,
+	    "Inside Out Networks",
+	    "MultiTech version of RP/4",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/(4)21 Parallel port",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT421,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/421 Hub+RS232+Parallel",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT21,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/21 RS232+Parallel",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8DC,
+	    0,
+	    "Inside Out Networks",
+	    "1/2 Edgeport/8",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/8",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2DIN,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/2 RS232/DIN",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4DIN,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/4 RS232/DIN",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT16DC,
+	    0,
+	    "Inside Out Networks",
+	    "1/2 Edgeport/16",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORTCOMP,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport Compatible",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8I,
+	    0,
+	    "Inside Out Networks",
+	    "Edgeport/8 RS422",
+	},
+	{
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_MT4X56USB,
+	    0,
+	    "Inside Out Networks",
+	    "OEM device",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002,
@@ -1385,6 +1535,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Prism2.x WLAN",
 	},
 	{
+	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSSMRW,
+	    0,
+	    "I/O Data",
+	    "USB-SSMRW SD-card adapter",
+	},
+	{
+	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSDRW,
+	    0,
+	    "I/O Data",
+	    "USB-SDRW SD-card adapter",
+	},
+	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT,
 	    0,
 	    "I/O Data",
@@ -1481,54 +1643,168 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "VideoCAM VGA",
 	},
 	{
-	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28_NF,
 	    0,
 	    "Keyspan",
 	    "USA-28 serial adapter",
 	},
 	{
-	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X,
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X_NF,
 	    0,
 	    "Keyspan",
 	    "USA-28X serial adapter",
 	},
 	{
-	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19,
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19_NF,
 	    0,
 	    "Keyspan",
 	    "USA-19 serial adapter",
 	},
 	{
-	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF,
+	    0,
+	    "Keyspan",
+	    "USA-18 serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X_NF,
 	    0,
 	    "Keyspan",
 	    "USA-18X serial adapter",
 	},
 	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W_NF,
+	    0,
+	    "Keyspan",
+	    "USA-19W serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19,
+	    0,
+	    "Keyspan",
+	    "USA-19 serial adapter",
+	},
+	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W,
 	    0,
 	    "Keyspan",
 	    "USA-19W serial adapter",
 	},
 	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W_NF,
+	    0,
+	    "Keyspan",
+	    "USA-49W serial adapter",
+	},
+	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W,
 	    0,
 	    "Keyspan",
 	    "USA-49W serial adapter",
 	},
 	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI_NF,
+	    0,
+	    "Keyspan",
+	    "USA-19QI serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI,
+	    0,
+	    "Keyspan",
+	    "USA-19QI serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q_NF,
+	    0,
+	    "Keyspan",
+	    "USA-19Q serial adapter",
+	},
+	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q,
 	    0,
 	    "Keyspan",
 	    "USA-19Q serial adapter",
 	},
 	{
-	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10_NF,
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
+	    0,
+	    "Keyspan",
+	    "USA-28 serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB,
+	    0,
+	    "Keyspan",
+	    "USA-28X/XB serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18,
+	    0,
+	    "Keyspan",
+	    "USA-18 serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
+	    0,
+	    "Keyspan",
+	    "USA-18X serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XB_NF,
+	    0,
+	    "Keyspan",
+	    "USA-28XB serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA_NF,
+	    0,
+	    "Keyspan",
+	    "USA-28XB serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA,
+	    0,
+	    "Keyspan",
+	    "USA-28XA serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA_NF,
+	    0,
+	    "Keyspan",
+	    "USA-18XA serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA,
+	    0,
+	    "Keyspan",
+	    "USA-18XA serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW_NF,
+	    0,
+	    "Keyspan",
+	    "USA-19WQ serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW,
+	    0,
+	    "Keyspan",
+	    "USA-19WQ serial adapter",
+	},
+	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10,
 	    0,
 	    "Keyspan",
 	    "UIA-10 remote control",
 	},
 	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA11,
+	    0,
+	    "Keyspan",
+	    "UIA-11 remote control",
+	},
+	{
 	    USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_XX1,
 	    0,
 	    "Kingston Technology",
@@ -1763,12 +2039,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "iFeel Mouse",
 	},
 	{
-	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
-	    0,
-	    "Logitech",
-	    "USB-PS/2 Trackball",
-	},
-	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
 	    0,
 	    "Logitech",
@@ -1781,6 +2051,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WingMan Force joystick",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMFFGP,
+	    0,
+	    "Logitech",
+	    "WingMan Formula Force GP (GT-Force)",
+	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
+	    0,
+	    "Logitech",
+	    "USB-PS/2 Trackball",
+	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB18,
+	    0,
+	    "Logitech",
+	    "TrackMan Wheel",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RK53,
 	    0,
 	    "Logitech",
@@ -1907,6 +2195,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sidewinder Precision Racing Wheel",
 	},
 	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_TBEXPLORER,
+	    0,
+	    "Microsoft",
+	    "Trackball Explorer",
+	},
+	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE,
 	    0,
 	    "Microsoft",
@@ -2015,6 +2309,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CD-R/RW Drive",
 	},
 	{
+	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_MOUSE,
+	    0,
+	    "Mitsumi",
+	    "Mouse",
+	},
+	{
 	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_FDD,
 	    0,
 	    "Mitsumi",
@@ -2327,18 +2627,54 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "hub",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA645VC,
+	    0,
+	    "Philips",
+	    "PCA645VC PC Camera",
+	},
+	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA646VC,
 	    0,
 	    "Philips",
 	    "PCA646VC PC Camera",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC675K,
+	    0,
+	    "Philips",
+	    "PCVC675K Vesta PC Camera",
+	},
+	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K,
 	    0,
 	    "Philips",
 	    "PCVC680K Vesta Pro PC Camera",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC690K,
+	    0,
+	    "Philips",
+	    "PCVC690K Vesta Pro Scan Camera",
+	},
+	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC730K,
+	    0,
+	    "Philips",
+	    "PCVC730K ToUCam Fun PC Camera",
+	},
+	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC740K,
+	    0,
+	    "Philips",
+	    "PCVC740K ToUCam Pro PC Camera",
+	},
+	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC750K,
+	    0,
+	    "Philips",
+	    "PCVC750K ToUCam Pro Scan Camera",
+	},
+	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
 	    0,
 	    "Philips",
@@ -2603,6 +2939,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ImageMate SDDR-09",
 	},
 	{
+	    USB_VENDOR_SANWASUPPLY, USB_PRODUCT_SANWASUPPLY_JYDV9USB,
+	    0,
+	    "Sanwa Supply",
+	    "JY-DV9USB gamepad",
+	},
+	{
 	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R,
 	    0,
 	    "ScanLogic",
@@ -2801,6 +3143,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sony MSC Memorystick Slot",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARD,
+	    0,
+	    "Sony",
+	    "PlayStation2 keyboard",
+	},
+	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARDHUB,
+	    0,
+	    "Sony",
+	    "PlayStation2 keyboard hub",
+	},
+	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2MOUSE,
+	    0,
+	    "Sony",
+	    "PlayStatoin2 mouse",
+	},
+	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35,
 	    0,
 	    "Sony",
@@ -2879,6 +3239,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Rio 800 USB",
 	},
 	{
+	    USB_VENDOR_TANGTOP, USB_PRODUCT_TANGTOP_USBPS2,
+	    0,
+	    "Tangtop",
+	    "USBPS2",
+	},
+	{
 	    USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE,
 	    0,
 	    "Taugagreining HF",
@@ -3089,6 +3455,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UX96 MIDI I/F",
 	},
 	{
+	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RPU200,
+	    0,
+	    "YAMAHA",
+	    "RP-U200",
+	},
+	{
 	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
 	    0,
 	    "Yano",
@@ -4007,6 +4379,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SANWASUPPLY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Sanwa Supply",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LINKSYS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Linksys",
@@ -4505,6 +4883,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AUDIOTECHNICA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Audio-Technica",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ALATION, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Alation Systems",
@@ -4697,6 +5081,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_KURUSUGAWA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Kurusugawa Electronics, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_GREENHOUSE2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "GREENHOUSE",
@@ -4721,6 +5111,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_EASYDISK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "EasyDisk",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_TANGTOP, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Tangtop",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PEN, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Pen Drive",