sync

2 files changed, 572 insertions, 101 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 84ff6c7f206..8a81bd55e82 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs.h,v 1.42 2002/01/03 19:16:07 nate Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.43 2002/04/01 21:36:16 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.42 2002/01/03 19:15:39 nate Exp 
+ *	OpenBSD: usbdevs,v 1.43 2002/04/01 21:35:52 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */
+/* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -78,6 +78,7 @@
 #define	USB_VENDOR_CREATIVELABS	0x041e		/* Creative Labs */
 #define	USB_VENDOR_ADI	0x0422		/* ADI Systems */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology */
+#define	USB_VENDOR_SMC2	0x0424		/* Standard Microsystems */
 #define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer */
 #define	USB_VENDOR_SUN	0x0430		/* Sun Microsystems */
 #define	USB_VENDOR_TAUGA	0x0436		/* Taugagreining HF */
@@ -104,6 +105,7 @@
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
 #define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq */
+#define	USB_VENDOR_HITACHI	0x04a4		/* Hitachi */
 #define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals */
 #define	USB_VENDOR_VISIONEER	0x04a7		/* Visioneer */
 #define	USB_VENDOR_CANON	0x04a9		/* Canon */
@@ -171,6 +173,7 @@
 #define	USB_VENDOR_QUICKSHOT	0x057f		/* Quickshot */
 #define	USB_VENDOR_ROLAND	0x0582		/* Roland */
 #define	USB_VENDOR_ROCKFIRE	0x0583		/* Rockfire */
+#define	USB_VENDOR_RATOC	0x0584		/* RATOC Systems */
 #define	USB_VENDOR_ZYXEL	0x0586		/* ZyXEL Communication */
 #define	USB_VENDOR_ALCOR	0x058f		/* Alcor Micro */
 #define	USB_VENDOR_IOMEGA	0x059b		/* Iomega */
@@ -187,6 +190,7 @@
 #define	USB_VENDOR_ULTIMA	0x05d8		/* Ultima */
 #define	USB_VENDOR_AXIOHM	0x05d9		/* Axiohm Transaction Solutions */
 #define	USB_VENDOR_MICROTEK	0x05da		/* Microtek */
+#define	USB_VENDOR_SUNTAC	0x05db		/* SUN Corporation */
 #define	USB_VENDOR_LEXAR	0x05dc		/* Lexar Media */
 #define	USB_VENDOR_SYMBOL	0x05e0		/* Symbol Technologies */
 #define	USB_VENDOR_GENESYS	0x05e3		/* Genesys Logic */
@@ -215,7 +219,9 @@
 #define	USB_VENDOR_AIWA	0x0677		/* Aiwa */
 #define	USB_VENDOR_ACARD	0x0678		/* ACARD Technology */
 #define	USB_VENDOR_PROLIFIC	0x067b		/* Prolific Technology */
+#define	USB_VENDOR_SIEMENS	0x067c		/* Siemens */
 #define	USB_VENDOR_ADVANCELOGIC	0x0680		/* Avance Logic */
+#define	USB_VENDOR_MINOLTA	0x0686		/* Minolta */
 #define	USB_VENDOR_CHPRODUCTS	0x068e		/* CH Products */
 #define	USB_VENDOR_HAGIWARA	0x0693		/* Hagiwara Sys-Com */
 #define	USB_VENDOR_CTX	0x0698		/* Chuntex */
@@ -255,6 +261,7 @@
 #define	USB_VENDOR_OLYMPUS	0x07b4		/* Olympus */
 #define	USB_VENDOR_ABOCOM	0x07b8		/* AboCom Systems */
 #define	USB_VENDOR_KEISOKUGIKEN	0x07c1		/* Keisokugiken */
+#define	USB_VENDOR_ONSPEC	0x07c4		/* OnSpec Electronic */
 #define	USB_VENDOR_APG	0x07c5		/* APG Cash Drawer */
 #define	USB_VENDOR_BUG	0x07c8		/* B.U.G. */
 #define	USB_VENDOR_ALLIEDTELESYN	0x07c9		/* Allied Telesyn International */
@@ -290,6 +297,7 @@
 #define	USB_VENDOR_MSYSTEMS	0x08ec		/* M-Systems */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems */
+#define	USB_VENDOR_CONCORDCAMERA	0x0919		/* Concord Camera */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
 #define	USB_VENDOR_YANO	0x094f		/* Yano */
 #define	USB_VENDOR_KINGSTON	0x0951		/* Kingston Technology */
@@ -298,6 +306,8 @@
 #define	USB_VENDOR_PORTSMITH	0x095a		/* Portsmith */
 #define	USB_VENDOR_ADIRONDACK	0x0976		/* Adirondack Wire & Cable */
 #define	USB_VENDOR_BECKHOFF	0x0978		/* Beckhoff */
+#define	USB_VENDOR_MINDSATWORK	0x097a		/* Minds At Work */
+#define	USB_VENDOR_INTERSIL	0x09aa		/* Intersil */
 #define	USB_VENDOR_ALTIUS	0x09b3		/* Altius Solutions */
 #define	USB_VENDOR_ARRIS	0x09c1		/* Arris Interactive */
 #define	USB_VENDOR_ACTIVCARD	0x09c3		/* ACTIVCARD */
@@ -318,9 +328,13 @@
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
+#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_PEN	0x0d7d		/* Pen Drive */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
+#define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
@@ -333,6 +347,7 @@
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
+#define	USB_VENDOR_DAISY	0x3579		/* Daisy Technology */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
 
@@ -370,19 +385,25 @@
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet */
 #define	USB_PRODUCT_ACCTON_SS1001	0x5046		/* SpeedStream Ethernet */
 
-/* Acer Peripherals products */
+/* Acer Peripherals, Inc. products */
 #define	USB_PRODUCT_ACERP_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
 #define	USB_PRODUCT_ACERP_ACERSCAN_320U	0x2022		/* Acerscan 320U */
 #define	USB_PRODUCT_ACERP_ACERSCAN_640U	0x2040		/* Acerscan 640U */
 #define	USB_PRODUCT_ACERP_ACERSCAN_620U	0x2060		/* Acerscan 620U */
 
+/* Actiontec products */
+#define	USB_PRODUCT_ACTIONTEC_PRISM_25	0x0408		/* Prism2.5 WLAN */
+
 /* ACTiSYS products */
 #define	USB_PRODUCT_ACTISYS_IR2000U	0x0011		/* ACT-IR2000U FIR */
 
-/* ActiveWire products */
+/* ActiveWire, Inc. products */
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD	0x0100		/* I/O Board */
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1	0x0101		/* I/O Board, rev. 1 */
 
+/* Addonics products */
+#define	USB_PRODUCT_ADDONICS2_205	0xa001		/* Cable 205 */
+
 /* ADMtek products */
 #define	USB_PRODUCT_ADMTEK_PEGASUS	0x0986		/* AN986 Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUSII	0x8511		/* AN8511 Ethernet */
@@ -409,7 +430,7 @@
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
-/* Alcor Micro products */
+/* Alcor Micro, Inc. products */
 #define	USB_PRODUCT_ALCOR2_KBD_HUB	0x2802		/* Kbd Hub */
 
 #define	USB_PRODUCT_ALCOR_MA_KBD_HUB	0x9213		/* MacAlly Kbd Hub */
@@ -428,7 +449,7 @@
 #define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
 #define	USB_PRODUCT_ANCHOR_EZLINK	0x2720		/* EZLINK */
 
-/* AOX products */
+/* AOX, Inc. products */
 #define	USB_PRODUCT_AOX_USB101	0x0008		/* Ethernet controller engine */
 
 /* Apple Computer products */
@@ -457,6 +478,7 @@
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet */
 #define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel adapter */
+#define	USB_PRODUCT_BELKIN_SCSI	0x0115		/* SCSI Adaptor */
 
 /* Billionton products */
 #define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 Ethernet */
@@ -468,9 +490,9 @@
 #define	USB_PRODUCT_BROTHER_HL1050	0x0002		/* HL-1050 laser printer */
 
 /* Behavior Technology Computer products */
-#define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard */
+#define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard/Mouse */
 
-/* Canon products */
+/* Canon, Inc. products */
 #define	USB_PRODUCT_CANON_N656U	0x2206		/* CANOSCAN N656U */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
 #define	USB_PRODUCT_CANON_S100	0x3045		/* PowerShot S100 */
@@ -482,8 +504,12 @@
 #define	USB_PRODUCT_CATC_ANDROMEDA	0x1237		/* Andromeda hub */
 
 /* CASIO products */
+#define	USB_PRODUCT_CASIO_QV	0x1001		/* QV DigitalCamera */
 #define	USB_PRODUCT_CASIO_NAMELAND	0x4001		/* CASIO Nameland EZ-USB */
 
+/* CCYU Technology products */
+#define	USB_PRODUCT_CCYU_EASYDISK	0x2136		/* EasyDisk Portable */
+
 /* Cherry products */
 #define	USB_PRODUCT_CHERRY_MY3000KBD	0x0001		/* My3000 keyboard */
 #define	USB_PRODUCT_CHERRY_MY3000HUB	0x0003		/* My3000 hub */
@@ -501,14 +527,19 @@
 
 /* Compaq products */
 #define	USB_PRODUCT_COMPAQ_IPAQPOCKETPC	0x0003		/* iPAQ PocketPC */
+#define	USB_PRODUCT_COMPAQ_A1500	0x0012		/* A1500 */
 #define	USB_PRODUCT_COMPAQ_PJB100	0x504a		/* Personal Jukebox PJB100 */
 
+/* Concord Camera products */
+#define	USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X	0x0100		/* Eye Q 3x */
+
 /* Connectix products */
 #define	USB_PRODUCT_CONNECTIX_QUICKCAM	0x0001		/* QuickCam */
 
 /* Corega products */
 #define	USB_PRODUCT_COREGA_ETHER_USB_T	0x0001		/* Ether USB-T */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TX	0x0004		/* FEther USB-TX */
+#define	USB_PRODUCT_COREGA_WLAN_USB_USB_11	0x000c		/* WirelessLAN USB-11 */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXS	0x000d		/* FEther USB-TXS */
 
 /* Creative Labs products */
@@ -523,16 +554,8 @@
 #define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
 #define	USB_PRODUCT_CYPRESS_FMRADIO	0x1002		/* FM Radio */
 
-/* D-Link products */
-/*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
-#define	USB_PRODUCT_DLINK_DSB650TX4	0x200c		/* 10/100 ethernet */
-#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps Ethernet */
-#define	USB_PRODUCT_DLINK_DSB650TX1	0x4001		/* 10/100 ethernet */
-#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 Ethernet */
-#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 Ethernet */
-#define	USB_PRODUCT_DLINK_DSB650TX3	0x400b		/* 10/100 ethernet */
-#define	USB_PRODUCT_DLINK_DSB650TX2	0x4102		/* 10/100 ethernet */
-#define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 Ethernet */
+/* Daisy Technology products */
+#define	USB_PRODUCT_DAISY_DMC	0x6901		/* PhotoClip Camera */
 
 /* Dallas Semiconductor products */
 #define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
@@ -549,6 +572,17 @@
 /* Digital Stream Corp. products */
 #define	USB_PRODUCT_DIGITALSTREAM_PS2	0x0001		/* PS/2 Active Adapter */
 
+/* D-Link products */
+/*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
+#define	USB_PRODUCT_DLINK_DSB650TX4	0x200c		/* 10/100 ethernet */
+#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps Ethernet */
+#define	USB_PRODUCT_DLINK_DSB650TX1	0x4001		/* 10/100 ethernet */
+#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 Ethernet */
+#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 Ethernet */
+#define	USB_PRODUCT_DLINK_DSB650TX3	0x400b		/* 10/100 ethernet */
+#define	USB_PRODUCT_DLINK_DSB650TX2	0x4102		/* 10/100 ethernet */
+#define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 Ethernet */
+
 /* DMI products */
 #define	USB_PRODUCT_DMI_SA2_0	0xb001		/* Storage Adapter */
 
@@ -560,6 +594,7 @@
 #define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
 #define	USB_PRODUCT_ELECOM_LDUSBTX0	0x200c		/* LD-USB/TX */
 #define	USB_PRODUCT_ELECOM_LDUSBTX1	0x4002		/* LD-USB/TX */
+#define	USB_PRODUCT_ELECOM_LDUSBLTX	0x4005		/* LD-USBL/TX */
 #define	USB_PRODUCT_ELECOM_LDUSBTX2	0x400b		/* LD-USB/TX */
 #define	USB_PRODUCT_ELECOM_UCSGT	0x5003		/* UC-SGT serial adapter */
 #define	USB_PRODUCT_ELECOM_LDUSBTX3	0xabc1		/* LD-USB/TX */
@@ -619,6 +654,7 @@
 
 /* GREENHOUSE products */
 #define	USB_PRODUCT_GREENHOUSE_KANA21	0x0001		/* CF-writer/MP3 Player */
+#define	USB_PRODUCT_GREENHOUSE2_USBKR100	0x8150		/* GH-USB100B Ethernet */
 
 /* Griffin Technology */
 #define	USB_PRODUCT_GRIFFIN_IMATE	0x0405		/* iMate, ADB adapter */
@@ -626,17 +662,23 @@
 /* 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 */
 #define	USB_PRODUCT_HAGIWARA_FG	0x0005		/* FlashGate */
 
-/* Handspring */
+/* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 
 /* Hauppauge Computer Works */
 #define	USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM	0x4d12		/* WinTV USB FM */
 
+/* Hitachi, Ltd. products */
+#define	USB_PRODUCT_HITACHI_DZMV100A	0x0004		/* DVD-CAM DZ-MV100A Camcorder */
+
 /* HP products */
 #define	USB_PRODUCT_HP_895C	0x0004		/* DeskJet 895C */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
@@ -652,6 +694,7 @@
 #define	USB_PRODUCT_HP_CDW8200	0x0207		/* CD-Writer Plus 8200e */
 #define	USB_PRODUCT_HP_810C	0x0304		/* DeskJet 810C/812C */
 #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_5200C	0x0401		/* Scanjet 5200C */
 #define	USB_PRODUCT_HP_830C	0x0404		/* DeskJet 830C */
@@ -659,8 +702,10 @@
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
 #define	USB_PRODUCT_HP_840C	0x0604		/* DeskJet 840c */
 #define	USB_PRODUCT_HP_5300C	0x0701		/* Scanjet 5300C */
-#define	USB_PRODUCT_HP_930C	0x1204		/* DeskJet 930c */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
+#define	USB_PRODUCT_HP_5400C	0x1005		/* Scanjet 5400C */
+#define	USB_PRODUCT_HP_930C	0x1204		/* DeskJet 930c */
+#define	USB_PRODUCT_HP_P2000U	0x1801		/* Inkjet P-2000U */
 #define	USB_PRODUCT_HP_640C	0x2004		/* DeskJet 640c */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 
@@ -690,6 +735,9 @@
 #define	USB_PRODUCT_INTEL_EASYPC_CAMERA	0x0110		/* Easy PC Camera */
 #define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
 
+/* Intersil products */
+#define	USB_PRODUCT_INTERSIL_PRISM_2X	0x3642		/* Prism2.x WLAN */
+
 /* I/O DATA products */
 #define	USB_PRODUCT_IODATA_USBETT	0x0901		/* USB ETT */
 #define	USB_PRODUCT_IODATA_USBETTX	0x0904		/* USB ETTX */
@@ -703,21 +751,22 @@
 /* Jaton products */
 #define	USB_PRODUCT_JATON_EDA	0x5704		/* Ethernet Device Adapter */
 
+/* Kawasaki LSI products */
+#define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* 10BT Ethernet */
+#define	USB_PRODUCT_KLSI_DUH3E10BTN	0x0009		/* 10BT Ethernet */
+
 /* Kawatsu products */
 #define	USB_PRODUCT_KAWATSU_MH4000P	0x0003		/* MiniHub 4000P */
 #define	USB_PRODUCT_KAWATSU_KC180	0x0180		/* KC-180 IrDA */
 
-/* Keisokugiken Corp. products */
+/* Keisokugiken products */
 #define	USB_PRODUCT_KEISOKUGIKEN_USBDAQ	0x0068		/* HKS-0200 USBDAQ */
 
-/* Kawasaki LSI products */
-#define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* 10BT Ethernet */
-#define	USB_PRODUCT_KLSI_DUH3E10BTN	0x0009		/* 10BT Ethernet */
-
 /* Kensington products */
 #define	USB_PRODUCT_KENSINGTON_ORBIT	0x1003		/* Orbit USB/PS2 trackball */
 #define	USB_PRODUCT_KENSINGTON_TURBOBALL	0x1005		/* TurboBall */
 #define	USB_PRODUCT_KENSINGTON_ORBIT_MAC	0x1009		/* Orbit USB trackball for Mac */
+#define	USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA	0x5002		/* VideoCAM VGA */
 
 /* Keyspan products */
 #define	USB_PRODUCT_KEYSPAN_USA28	0x0101		/* USA-28 serial adapter */
@@ -726,6 +775,7 @@
 #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 */
 
 /* Kingston products */
@@ -766,6 +816,8 @@
 #define	USB_PRODUCT_LINKSYS_USB100TX	0x2203		/* USB100TX Ethernet */
 #define	USB_PRODUCT_LINKSYS_USB100H1	0x2204		/* USB100H1 Ethernet/HPNA */
 #define	USB_PRODUCT_LINKSYS_USB10TA	0x2206		/* USB10TA Ethernet */
+#define	USB_PRODUCT_LINKSYS_WUSB11	0x2211		/* WUSB11 802.11b */
+#define	USB_PRODUCT_LINKSYS_WUSB11_25	0x2212		/* WUSB11 802.11b v2.5 */
 #define	USB_PRODUCT_LINKSYS_USB10TX2	0x400b		/* USB10TX */
 
 /* Logitech products */
@@ -807,6 +859,7 @@
 #define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUATX5	0x0005		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUA2TX5	0x0009		/* LUA2-TX Ethernet */
+#define	USB_PRODUCT_MELCO_LUAKTX	0x0012		/* LUA-KTX Ethernet */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
@@ -838,8 +891,16 @@
 /* Midiman products */
 #define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
 
+/* Minds At Work LLC products */
+#define	USB_PRODUCT_MINDSATWORK_DW	0x0001		/* Digital Wallet */
+
+/* Minolta Co., Ltd. */
+#define	USB_PRODUCT_MINOLTA_S304	0x4007		/* Dimage S304 */
+#define	USB_PRODUCT_MINOLTA_X	0x4009		/* Dimage X */
+
 /* Mitsumi products */
 #define	USB_PRODUCT_MITSUMI_CDRRW	0x0000		/* CD-R/RW Drive */
+#define	USB_PRODUCT_MITSUMI_FDD	0x6901		/* FDD */
 
 /* Mobility products */
 #define	USB_PRODUCT_MOBILITY_EA	0x0204		/* Ethernet */
@@ -877,10 +938,11 @@
 
 /* NetChip Technology Products */
 #define	USB_PRODUCT_NETCHIP_TURBOCONNECT	0x1080		/* Turbo-Connect */
+#define	USB_PRODUCT_NETCHIP_CLIK40	0xa140		/* Clik! 40 */
 
 /* Netgear products */
 #define	USB_PRODUCT_NETGEAR_EA101	0x1001		/* Ethernet */
-#define	USB_PRODUCT_NETGEAR_EA101X	0x1001		/* Ethernet */
+#define	USB_PRODUCT_NETGEAR_EA101X	0x1002		/* Ethernet */
 
 /* Nikon products */
 #define	USB_PRODUCT_NIKON_E990	0x0102		/* Digital Camera E990 */
@@ -890,18 +952,34 @@
 #define	USB_PRODUCT_OLYMPUS_C1	0x0102		/* C-1 Digital Camera */
 #define	USB_PRODUCT_OLYMPUS_C700	0x0105		/* C-700 Ultra Zoom */
 
-/* OmniVision Technologies products */
+/* OmniVision Technologies, Inc. products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
 #define	USB_PRODUCT_OMNIVISION_OV511PLUS	0xa511		/* OV511+ Camera */
 
-/* Palm Computing */
+/* OnSpec Electronic, Inc. */
+#define	USB_PRODUCT_ONSPEC_MD2	0x0103		/* disk */
+#define	USB_PRODUCT_ONSPEC_MDCFEB	0xa000		/* MDCFE-B USB CF Reader */
+#define	USB_PRODUCT_ONSPEC_SIIGMS	0xa001		/* Memory Stick+CF Reader/Writer */
+#define	USB_PRODUCT_ONSPEC_DATAFAB3	0xa003		/* Datafab-based Reader */
+#define	USB_PRODUCT_ONSPEC_DATAFAB4	0xa004		/* Datafab-based Reader */
+#define	USB_PRODUCT_ONSPEC_PNYCFSM	0xa005		/* PNY/Datafab CF+SM Reader */
+#define	USB_PRODUCT_ONSPEC_STECHCFSM	0xa006		/* Simple Tech/Datafab CF+SM Reader */
+#define	USB_PRODUCT_ONSPEC_LC1	0xa109		/* CF + SM Combo (LC1) */
+#define	USB_PRODUCT_ONSPEC_MD1II	0xb006		/* Datafab MD1-II PC-Card Reader */
+
+/* Palm Computing, Inc. product */
 #define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
 #define	USB_PRODUCT_PALM_M500	0x0001		/* Palm m500 */
 #define	USB_PRODUCT_PALM_M505	0x0002		/* Palm m505 */
+#define	USB_PRODUCT_PALM_M125	0x0040		/* Palm m125 */
 
 /* Panasonic products */
+#define	USB_PRODUCT_PANASONIC_LS120	0x0901		/* LS-120 Camera */
 #define	USB_PRODUCT_PANASONIC_SDCAAE	0x1b00		/* MultiMediaCard Adapter */
 
+/* Pen Driver */
+#define	USB_PRODUCT_PEN_USBDISK	0x0d7d		/* USB Disk */
+
 /* Peracom products */
 #define	USB_PRODUCT_PERACOM_SERIAL1	0x0001		/* Serial Converter */
 #define	USB_PRODUCT_PERACOM_ENET	0x0002		/* Ethernet */
@@ -971,6 +1049,9 @@
 /* Rainbow Technologies products */
 #define	USB_PRODUCT_RAINBOW_IKEY2000	0x1200		/* i-Key 2000 */
 
+/* RATOC Systems products */
+#define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial adapter REX-USB60 */
+
 /* Roland products */
 #define	USB_PRODUCT_ROLAND_UM1	0x0009		/* UM-1 MIDI I/F */
 #define	USB_PRODUCT_ROLAND_UM880N	0x0014		/* EDIROL UM-880 MIDI I/F (native) */
@@ -999,6 +1080,7 @@
 #define	USB_PRODUCT_SHUTTLE_EUSB	0x0001		/* E-USB Bridge */
 #define	USB_PRODUCT_SHUTTLE_EUSCSI	0x0002		/* eUSCSI Bridge */
 #define	USB_PRODUCT_SHUTTLE_SDDR09	0x0003		/* ImageMate SDDR09 */
+#define	USB_PRODUCT_SHUTTLE_EUSBSMCF	0x0005		/* eUSB SmartMedia / CompactFlash Adapter */
 #define	USB_PRODUCT_SHUTTLE_ZIOMMC	0x0006		/* eUSB MultiMediaCard Adapter */
 #define	USB_PRODUCT_SHUTTLE_HIFD	0x0007		/* Sony Hifd */
 #define	USB_PRODUCT_SHUTTLE_EUSBATAPI	0x0009		/* eUSB ATA/ATAPI Adapter */
@@ -1007,6 +1089,9 @@
 #define	USB_PRODUCT_SHUTTLE_EUSCSI_C	0x000c		/* eUSCSI Bridge */
 #define	USB_PRODUCT_SHUTTLE_CDRW	0x0101		/* CD-RW Device */
 
+/* Siemens products */
+#define	USB_PRODUCT_SIEMENS_SPEEDSTREAM	0x1001		/* SpeedStream USB */
+
 /* Sigmatel products */
 #define	USB_PRODUCT_SIGMATEL_IRDA	0x4200		/* IrDA */
 
@@ -1027,6 +1112,7 @@
 /* SMC products */
 #define	USB_PRODUCT_SMC_2102USB	0x0100		/* 10Mbps Ethernet */
 #define	USB_PRODUCT_SMC_2202USB	0x0200		/* 10/100 Ethernet */
+#define	USB_PRODUCT_SMC2_2020HUB	0x2020		/* USB Hub */
 
 /* SOHOware products */
 #define	USB_PRODUCT_SOHOWARE_NUB100	0x9100		/* 10/100 Ethernet */
@@ -1036,8 +1122,10 @@
 
 /* SONY products */
 #define	USB_PRODUCT_SONY_DSC	0x0010		/* Sony DSC Cameras */
+#define	USB_PRODUCT_SONY_NWMS7	0x0025		/* Memorystick NW-MS7 */
 #define	USB_PRODUCT_SONY_DRIVEV2	0x002b		/* Harddrive V2 */
 #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		/* Sony Clie v3.5 */
 #define	USB_PRODUCT_SONY_CLIE_40	0x0066		/* Sony Clie v4.0 */
@@ -1049,6 +1137,10 @@
 /* STSN products */
 #define	USB_PRODUCT_STSN_STSN0001	0x0001		/* Internet Access Device */
 
+/* SUN Corporation products */
+#define	USB_PRODUCT_SUNTAC_PS64P1	0x0005		/* SUNTAC U-Cable type P1 */
+#define	USB_PRODUCT_SUNTAC_VS10U	0x0009		/* SUNTAC Slipper U */
+
 /* Sun Microsystems products */
 #define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
 /* XXX The above is a North American PC style keyboard possibly */
@@ -1078,6 +1170,7 @@
 /* Texas Intel products */
 #define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
 #define	USB_PRODUCT_TI_TUSB2046	0x2046		/* TUSB2046 hub */
+#define	USB_PRODUCT_TI_NEXII	0x5409		/* Nex II Digital */
 
 /* Thrustmaster products */
 #define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
@@ -1124,15 +1217,15 @@
 /* Y-E Data products */
 #define	USB_PRODUCT_YEDATA_FLASHBUSTERU	0x0000		/* Flashbuster-U */
 
-/* Yano products */
-#define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
-
 /* Yamaha products */
 #define	USB_PRODUCT_YAMAHA_UX256	0x1000		/* UX256 MIDI I/F */
 #define	USB_PRODUCT_YAMAHA_UX96	0x1008		/* UX96 MIDI I/F */
 
-/* Zoom Telephonics products */
-#define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L */
+/* Yano products */
+#define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
+
+/* Zoom Telephonics, Inc. products */
+#define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax Modem */
 
 /* ZyXEL Communication Co. products */
 #define	USB_PRODUCT_ZYXEL_OMNI56K	0x1500		/* Omni 56K Plus */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index e7a1979f8a4..1e84ae19099 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.42 2002/01/03 19:16:07 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.43 2002/04/01 21:36:16 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.42 2002/01/03 19:15:39 nate Exp 
+ *	OpenBSD: usbdevs,v 1.43 2002/04/01 21:35:52 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */
+/* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -209,6 +209,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Acerscan 620U",
 	},
 	{
+	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25,
+	    0,
+	    "Actiontec Electronics",
+	    "Prism2.5 WLAN",
+	},
+	{
 	    USB_VENDOR_ACTISYS, USB_PRODUCT_ACTISYS_IR2000U,
 	    0,
 	    "ACTiSYS",
@@ -227,6 +233,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "I/O Board, rev. 1",
 	},
 	{
+	    USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_205,
+	    0,
+	    "Addonics Technology",
+	    "Cable 205",
+	},
+	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    0,
 	    "ADMtek",
@@ -461,6 +473,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "F5U002 Parallel adapter",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI,
+	    0,
+	    "Belkin Components",
+	    "SCSI Adaptor",
+	},
+	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    0,
 	    "Billionton Systems",
@@ -494,7 +512,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,
 	    0,
 	    "Behavior Tech. Computer",
-	    "Keyboard",
+	    "Keyboard/Mouse",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
@@ -539,12 +557,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Andromeda hub",
 	},
 	{
+	    USB_VENDOR_CASIO, USB_PRODUCT_CASIO_QV,
+	    0,
+	    "CASIO",
+	    "QV DigitalCamera",
+	},
+	{
 	    USB_VENDOR_CASIO, USB_PRODUCT_CASIO_NAMELAND,
 	    0,
 	    "CASIO",
 	    "CASIO Nameland EZ-USB",
 	},
 	{
+	    USB_VENDOR_CCYU, USB_PRODUCT_CCYU_EASYDISK,
+	    0,
+	    "CCYU Technology",
+	    "EasyDisk Portable",
+	},
+	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
 	    0,
 	    "Cherry Mikroschalter",
@@ -593,12 +623,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "iPAQ PocketPC",
 	},
 	{
+	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_A1500,
+	    0,
+	    "Compaq",
+	    "A1500",
+	},
+	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_PJB100,
 	    0,
 	    "Compaq",
 	    "Personal Jukebox PJB100",
 	},
 	{
+	    USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
+	    0,
+	    "Concord Camera",
+	    "Eye Q 3x",
+	},
+	{
 	    USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
 	    0,
 	    "Connectix",
@@ -617,6 +659,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FEther USB-TX",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLAN_USB_USB_11,
+	    0,
+	    "Corega",
+	    "WirelessLAN USB-11",
+	},
+	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS,
 	    0,
 	    "Corega",
@@ -659,6 +707,54 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FM Radio",
 	},
 	{
+	    USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
+	    0,
+	    "Daisy Technology",
+	    "PhotoClip Camera",
+	},
+	{
+	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
+	    0,
+	    "Dallas Semiconductor",
+	    "J-6502 speakers",
+	},
+	{
+	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON,
+	    0,
+	    "Dallas Semiconductor",
+	    "USB-FOB/iBUTTON",
+	},
+	{
+	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
+	    0,
+	    "Diamond",
+	    "Rio 500 USB",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
+	    0,
+	    "Digi International",
+	    "AccelePort 2",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
+	    0,
+	    "Digi International",
+	    "AccelePort 4",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
+	    0,
+	    "Digi International",
+	    "AccelePort 8",
+	},
+	{
+	    USB_VENDOR_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2,
+	    0,
+	    "Digital Stream",
+	    "PS/2 Active Adapter",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4,
 	    0,
 	    "D-Link",
@@ -707,48 +803,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10/100 Ethernet",
 	},
 	{
-	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
-	    0,
-	    "Dallas Semiconductor",
-	    "J-6502 speakers",
-	},
-	{
-	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON,
-	    0,
-	    "Dallas Semiconductor",
-	    "USB-FOB/iBUTTON",
-	},
-	{
-	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
-	    0,
-	    "Diamond",
-	    "Rio 500 USB",
-	},
-	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
-	    0,
-	    "Digi International",
-	    "AccelePort 2",
-	},
-	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
-	    0,
-	    "Digi International",
-	    "AccelePort 4",
-	},
-	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
-	    0,
-	    "Digi International",
-	    "AccelePort 8",
-	},
-	{
-	    USB_VENDOR_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2,
-	    0,
-	    "Digital Stream",
-	    "PS/2 Active Adapter",
-	},
-	{
 	    USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0,
 	    0,
 	    "DMI",
@@ -785,6 +839,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LD-USB/TX",
 	},
 	{
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX,
+	    0,
+	    "Elecom",
+	    "LD-USBL/TX",
+	},
+	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2,
 	    0,
 	    "Elecom",
@@ -1007,6 +1067,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CF-writer/MP3 Player",
 	},
 	{
+	    USB_VENDOR_GREENHOUSE2, USB_PRODUCT_GREENHOUSE2_USBKR100,
+	    0,
+	    "GREENHOUSE",
+	    "GH-USB100B Ethernet",
+	},
+	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
 	    0,
 	    "Griffin Technology",
@@ -1019,6 +1085,12 @@ 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",
@@ -1049,6 +1121,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WinTV USB FM",
 	},
 	{
+	    USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DZMV100A,
+	    0,
+	    "Hitachi",
+	    "DVD-CAM DZ-MV100A Camcorder",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_895C,
 	    0,
 	    "Hewlett Packard",
@@ -1133,6 +1211,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 4300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_CD4E,
+	    0,
+	    "Hewlett Packard",
+	    "CD-Writer+ CD-4e",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_G85XI,
 	    0,
 	    "Hewlett Packard",
@@ -1175,16 +1259,28 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 5300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
+	    0,
+	    "Hewlett Packard",
+	    "Deskjet 970Cse",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5400C,
+	    0,
+	    "Hewlett Packard",
+	    "Scanjet 5400C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
 	    0,
 	    "Hewlett Packard",
 	    "DeskJet 930c",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_P2000U,
 	    0,
 	    "Hewlett Packard",
-	    "Deskjet 970Cse",
+	    "Inkjet P-2000U",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
@@ -1283,6 +1379,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "82930 test board",
 	},
 	{
+	    USB_VENDOR_INTERSIL, USB_PRODUCT_INTERSIL_PRISM_2X,
+	    0,
+	    "Intersil",
+	    "Prism2.x WLAN",
+	},
+	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT,
 	    0,
 	    "I/O Data",
@@ -1325,6 +1427,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Ethernet Device Adapter",
 	},
 	{
+	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
+	    0,
+	    "Kawasaki LSI",
+	    "10BT Ethernet",
+	},
+	{
+	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN,
+	    0,
+	    "Kawasaki LSI",
+	    "10BT Ethernet",
+	},
+	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
 	    0,
 	    "Kawatsu Semiconductor",
@@ -1343,18 +1457,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "HKS-0200 USBDAQ",
 	},
 	{
-	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
-	    0,
-	    "Kawasaki LSI",
-	    "10BT Ethernet",
-	},
-	{
-	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN,
-	    0,
-	    "Kawasaki LSI",
-	    "10BT Ethernet",
-	},
-	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT,
 	    0,
 	    "Kensington",
@@ -1373,6 +1475,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Orbit USB trackball for Mac",
 	},
 	{
+	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA,
+	    0,
+	    "Kensington",
+	    "VideoCAM VGA",
+	},
+	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
 	    0,
 	    "Keyspan",
@@ -1409,6 +1517,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USA-49W serial adapter",
 	},
 	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q,
+	    0,
+	    "Keyspan",
+	    "USA-19Q serial adapter",
+	},
+	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10_NF,
 	    0,
 	    "Keyspan",
@@ -1553,6 +1667,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB10TA Ethernet",
 	},
 	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11,
+	    0,
+	    "Linksys",
+	    "WUSB11 802.11b",
+	},
+	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11_25,
+	    0,
+	    "Linksys",
+	    "WUSB11 802.11b v2.5",
+	},
+	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
 	    0,
 	    "Linksys",
@@ -1739,6 +1865,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LUA2-TX Ethernet",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAKTX,
+	    0,
+	    "Melco",
+	    "LUA-KTX Ethernet",
+	},
+	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    0,
 	    "Metricom",
@@ -1859,12 +1991,36 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Midisport 2x2",
 	},
 	{
+	    USB_VENDOR_MINDSATWORK, USB_PRODUCT_MINDSATWORK_DW,
+	    0,
+	    "Minds At Work",
+	    "Digital Wallet",
+	},
+	{
+	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_S304,
+	    0,
+	    "Minolta",
+	    "Dimage S304",
+	},
+	{
+	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_X,
+	    0,
+	    "Minolta",
+	    "Dimage X",
+	},
+	{
 	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
 	    0,
 	    "Mitsumi",
 	    "CD-R/RW Drive",
 	},
 	{
+	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_FDD,
+	    0,
+	    "Mitsumi",
+	    "FDD",
+	},
+	{
 	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA,
 	    0,
 	    "Mobility",
@@ -1979,6 +2135,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Turbo-Connect",
 	},
 	{
+	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK40,
+	    0,
+	    "NetChip Technology",
+	    "Clik! 40",
+	},
+	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
 	    0,
 	    "BayNETGEAR",
@@ -2027,6 +2189,60 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "OV511+ Camera",
 	},
 	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD2,
+	    0,
+	    "OnSpec Electronic",
+	    "disk",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDCFEB,
+	    0,
+	    "OnSpec Electronic",
+	    "MDCFE-B USB CF Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SIIGMS,
+	    0,
+	    "OnSpec Electronic",
+	    "Memory Stick+CF Reader/Writer",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB3,
+	    0,
+	    "OnSpec Electronic",
+	    "Datafab-based Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB4,
+	    0,
+	    "OnSpec Electronic",
+	    "Datafab-based Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_PNYCFSM,
+	    0,
+	    "OnSpec Electronic",
+	    "PNY/Datafab CF+SM Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_STECHCFSM,
+	    0,
+	    "OnSpec Electronic",
+	    "Simple Tech/Datafab CF+SM Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_LC1,
+	    0,
+	    "OnSpec Electronic",
+	    "CF + SM Combo (LC1)",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II,
+	    0,
+	    "OnSpec Electronic",
+	    "Datafab MD1-II PC-Card Reader",
+	},
+	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
 	    0,
 	    "Palm Computing",
@@ -2045,12 +2261,30 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Palm m505",
 	},
 	{
+	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M125,
+	    0,
+	    "Palm Computing",
+	    "Palm m125",
+	},
+	{
+	    USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120,
+	    0,
+	    "Panasonic (Matsushita)",
+	    "LS-120 Camera",
+	},
+	{
 	    USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_SDCAAE,
 	    0,
 	    "Panasonic (Matsushita)",
 	    "MultiMediaCard Adapter",
 	},
 	{
+	    USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK,
+	    0,
+	    "Pen Drive",
+	    "USB Disk",
+	},
+	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
 	    "Peracom Networks",
@@ -2309,6 +2543,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "i-Key 2000",
 	},
 	{
+	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
+	    0,
+	    "RATOC Systems",
+	    "USB serial adapter REX-USB60",
+	},
+	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
 	    0,
 	    "Roland",
@@ -2399,6 +2639,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ImageMate SDDR09",
 	},
 	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBSMCF,
+	    0,
+	    "Shuttle Technology",
+	    "eUSB SmartMedia / CompactFlash Adapter",
+	},
+	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,
 	    0,
 	    "Shuttle Technology",
@@ -2441,6 +2687,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CD-RW Device",
 	},
 	{
+	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
+	    0,
+	    "Siemens",
+	    "SpeedStream USB",
+	},
+	{
 	    USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA,
 	    0,
 	    "Sigmatel",
@@ -2495,6 +2747,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10/100 Ethernet",
 	},
 	{
+	    USB_VENDOR_SMC2, USB_PRODUCT_SMC2_2020HUB,
+	    0,
+	    "Standard Microsystems",
+	    "USB Hub",
+	},
+	{
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
 	    0,
 	    "SOHOware",
@@ -2513,6 +2771,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sony DSC Cameras",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_NWMS7,
+	    0,
+	    "Sony",
+	    "Memorystick NW-MS7",
+	},
+	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DRIVEV2,
 	    0,
 	    "Sony",
@@ -2525,6 +2789,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Memorystick MSAC-US1",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_HANDYCAM,
+	    0,
+	    "Sony",
+	    "Handycam",
+	},
+	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
 	    0,
 	    "Sony",
@@ -2561,6 +2831,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Internet Access Device",
 	},
 	{
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
+	    0,
+	    "SUN Corporation",
+	    "SUNTAC U-Cable type P1",
+	},
+	{
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
+	    0,
+	    "SUN Corporation",
+	    "SUNTAC Slipper U",
+	},
+	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
 	    0,
 	    "Sun Microsystems",
@@ -2651,6 +2933,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "TUSB2046 hub",
 	},
 	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
+	    0,
+	    "Texas Instruments",
+	    "Nex II Digital",
+	},
+	{
 	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
 	    0,
 	    "Thrustmaster",
@@ -2789,12 +3077,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Flashbuster-U",
 	},
 	{
-	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
-	    0,
-	    "Yano",
-	    "U640MO-03",
-	},
-	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256,
 	    0,
 	    "YAMAHA",
@@ -2807,10 +3089,16 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UX96 MIDI I/F",
 	},
 	{
+	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
+	    0,
+	    "Yano",
+	    "U640MO-03",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
 	    "Zoom Telephonics",
-	    "2986L",
+	    "2986L Fax Modem",
 	},
 	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_OMNI56K,
@@ -2909,6 +3197,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SMC2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Standard Microsystems",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_GRAVIS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Advanced Gravis Computer",
@@ -3065,6 +3359,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_HITACHI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Hitachi",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACERP, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Acer Peripherals",
@@ -3467,6 +3767,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_RATOC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "RATOC Systems",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ZYXEL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "ZyXEL Communication",
@@ -3563,6 +3869,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SUNTAC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "SUN Corporation",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LEXAR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Lexar Media",
@@ -3731,12 +4043,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SIEMENS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Siemens",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ADVANCELOGIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Avance Logic",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MINOLTA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Minolta",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CHPRODUCTS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "CH Products",
@@ -3971,6 +4295,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ONSPEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "OnSpec Electronic",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_APG, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "APG Cash Drawer",
@@ -4181,6 +4511,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CONCORDCAMERA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Concord Camera",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BIOMETRIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "American Biometric Company",
@@ -4229,6 +4565,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MINDSATWORK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Minds At Work",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_INTERSIL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Intersil",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ALTIUS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Altius Solutions",
@@ -4349,6 +4697,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GREENHOUSE2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "GREENHOUSE",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ADDONICS2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Addonics Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AGATE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Agate Technologies",
@@ -4361,12 +4721,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PEN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Pen Drive",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MOTOROLA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Motorola",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CCYU, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "CCYU Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PLX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "PLX",
@@ -4439,6 +4811,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_DAISY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Daisy Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_INTEL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Intel",