sync

2 files changed, 834 insertions, 22 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index eb22476db4a..afd13d5e160 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs.h,v 1.24 2000/11/08 18:13:30 aaron Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.25 2000/11/16 19:02:32 aaron Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.24 2000/11/06 20:08:57 mickey Exp 
+ *	OpenBSD
  */
-/* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */
+/* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  *    must display the following acknowledgement:
  *        This product includes software developed by the NetBSD
  *        Foundation, Inc. and its contributors.
- * 4. nEITher the name of The NetBSD Foundation nor the names of its
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
@@ -53,6 +53,7 @@
 #define	USB_VENDOR_ATMEL	0x03eb		/* Atmel Corp. */
 #define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
 #define	USB_VENDOR_ADAPTEC	0x03f3		/* Adaptec, Inc. */
+#define	USB_VENDOR_NATIONAL	0x0400		/* National Semiconductor */
 #define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs, Inc. */
 #define	USB_VENDOR_FTDI	0x0403		/* Future Technology Devices */
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
@@ -86,12 +87,29 @@
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq Computers */
 #define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals, Inc. */
+#define	USB_VENDOR_VISIONEER	0x04a7		/* Visioneer */
 #define	USB_VENDOR_CANON	0x04a9		/* Canon, Inc. */
+#define	USB_VENDOR_IBM	0x04b3		/* IBM Corporation */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
+#define	USB_VENDOR_RAINBOW	0x04b9		/* Rainbow Technologies */
 #define	USB_VENDOR_IODATA	0x04bb		/* I/O Data */
 #define	USB_VENDOR_3COMUSR	0x04c1		/* U.S. Robotics */
+#define	USB_VENDOR_METHODE	0x04c2		/* Methode Electronics Far East PTE Ltd. */
+#define	USB_VENDOR_MAXISWITCH	0x04c3		/* Maxi Switch, Inc. */
+#define	USB_VENDOR_LOCKHEEDMER	0x04c4		/* Lockheed Martin Energy Research */
+#define	USB_VENDOR_FUJITSU	0x04c5		/* Fujitsu Ltd. */
+#define	USB_VENDOR_TOSHIBAAM	0x04c6		/* Toshiba America Electronic Components */
+#define	USB_VENDOR_MICROMACRO	0x04c7		/* Micro Macro Technologies */
 #define	USB_VENDOR_KONICA	0x04c8		/* Konica Corp. */
+#define	USB_VENDOR_LITEON	0x04ca		/* Lite-On Technology Corp. */
+#define	USB_VENDOR_FUJIPHOTO	0x04cb		/* Fuji Photo Film Co., Ltd. */
+#define	USB_VENDOR_PHILIPSSEMI	0x04cc		/* Philips Semiconductors */
+#define	USB_VENDOR_TATUNG	0x04cd		/* Tatung Co. Of America */
+#define	USB_VENDOR_SCANLOGIC	0x04ce		/* ScanLogic Corp. */
+#define	USB_VENDOR_MYSON	0x04cf		/* Myson Technology Inc. */
+#define	USB_VENDOR_DIGI2	0x04d0		/* Digi International */
+#define	USB_VENDOR_ITTCANON	0x04d1		/* ITT Canon */
 #define	USB_VENDOR_ALTEC	0x04d2		/* Altec Lansing Technologies, Inc. */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_ANNABOOKS	0x04ed		/* Annabooks */
@@ -111,6 +129,7 @@
 #define	USB_VENDOR_AKS	0x0529		/* Aladdin Knowledge Systems */
 #define	USB_VENDOR_UNIACCESS	0x0540		/* Universal Access */
 #define	USB_VENDOR_ANCHOR	0x0547		/* Anchor Chips, Inc. */
+#define	USB_VENDOR_SONY	0x054c		/* Sony Corp. */
 #define	USB_VENDOR_VISION	0x0553		/* VLSI Vision Ltd. */
 #define	USB_VENDOR_ASAHIKASEI	0x0556		/* Asahi Kasei Microsystems Co., Ltd */
 #define	USB_VENDOR_ATEN	0x0557		/* ATEN International Co. Ltd. */
@@ -127,10 +146,12 @@
 #define	USB_VENDOR_AVM	0x057c		/* AVM GmbH */
 #define	USB_VENDOR_QUICKSHOT	0x057f		/* Quickshot */
 #define	USB_VENDOR_ROCKFIRE	0x0583		/* Rockfire */
+#define	USB_VENDOR_ZYXEL	0x0586		/* ZyXEL Communication Co. */
 #define	USB_VENDOR_ALCOR	0x058f		/* Alcor Micro, Inc. */
 #define	USB_VENDOR_IOMEGA	0x059b		/* Iomega Corp. */
 #define	USB_VENDOR_ATREND	0x059c		/* A-Trend Technology Co., Ltd. */
 #define	USB_VENDOR_AID	0x059d		/* Advanced Input Devices */
+#define	USB_VENDOR_LACIE	0x059f		/* LaCie */
 #define	USB_VENDOR_OMNIVISION	0x05a9		/* OmniVision */
 #define	USB_VENDOR_INSYSTEM	0x05ab		/* In-System Design */
 #define	USB_VENDOR_APPLE	0x05ac		/* Apple Computer */
@@ -139,8 +160,14 @@
 #define	USB_VENDOR_ELSA	0x05cc		/* ELSA Gmbh */
 #define	USB_VENDOR_BRAINBOXES	0x05d1		/* Brainboxes Limited */
 #define	USB_VENDOR_AXIOHM	0x05d9		/* Axiohm Transaction Solutions */
+#define	USB_VENDOR_MICROTEK	0x05da		/* Microtek */
+#define	USB_VENDOR_SYMBOL	0x05e0		/* Symbol Technologies */
+#define	USB_VENDOR_GENESYS	0x05e3		/* Genesys Logic, Inc. */
+#define	USB_VENDOR_FUJI	0x05e5		/* Fuji Electric Co., Ltd. */
+#define	USB_VENDOR_KEITHLEY	0x05e6		/* Keithley Instruments */
 #define	USB_VENDOR_EIZONANAO	0x05e7		/* EIZO Nanao */
 #define	USB_VENDOR_KLSI	0x05e9		/* Kawasaki LSI */
+#define	USB_VENDOR_FFC	0x05eb		/* FFC Limited */
 #define	USB_VENDOR_ANKO	0x05ef		/* Anko Electronic Co., Ltd. */
 #define	USB_VENDOR_PIENGINEERING	0x05f3		/* P.I. Engineering */
 #define	USB_VENDOR_AOC	0x05f6		/* AOC International */
@@ -177,15 +204,19 @@
 #define	USB_VENDOR_MCT	0x0711		/* MCT Corp. */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
+#define	USB_VENDOR_GRIFFIN	0x077d		/* Griffin Technology, Inc. */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
 #define	USB_VENDOR_BRIMAX	0x078e		/* Brimax, Inc. */
 #define	USB_VENDOR_AXIS	0x0792		/* Axis Communications AB */
 #define	USB_VENDOR_ABL	0x0794		/* ABL Electronics Corp. */
 #define	USB_VENDOR_ALFADATA	0x079d		/* Alfadata Computer Corp. */
+#define	USB_VENDOR_NATIONALTECH	0x07a2		/* National Technical Systems */
+#define	USB_VENDOR_ONNTO	0x07a3		/* Onnto Corp. */
 #define	USB_VENDOR_BE	0x07a4		/* Be, Inc. */
 #define	USB_VENDOR_ADMTEK	0x07a6		/* ADMtek, Inc. */
 #define	USB_VENDOR_COREGA	0x07aa		/* Corega */
 #define	USB_VENDOR_FREECOM	0x07ab		/* Freecom */
+#define	USB_VENDOR_MICROTECH	0x07af		/* Microtech */
 #define	USB_VENDOR_ABOCOM	0x07b8		/* AboCom Systems, Inc. */
 #define	USB_VENDOR_KEISOKUGIKEN	0x07c1		/* Keisokugiken Corp. */
 #define	USB_VENDOR_APG	0x07c5		/* APG Cash Drawer */
@@ -219,6 +250,7 @@
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec, Inc. */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems, Inc. */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
+#define	USB_VENDOR_YANO	0x094f		/* Yano */
 #define	USB_VENDOR_KINGSTON	0x0951		/* Kingston Technology */
 #define	USB_VENDOR_BLUEWATER	0x0956		/* BlueWater Systems, Inc. */
 #define	USB_VENDOR_AGILENT	0x0957		/* Agilent Technologies, Inc. */
@@ -235,17 +267,21 @@
 #define	USB_VENDOR_ARESCOM	0x09f5		/* ARESCOM */
 #define	USB_VENDOR_BAY	0x09f9		/* Bay Associates */
 #define	USB_VENDOR_ALTERA	0x09fb		/* Altera */
+#define	USB_VENDOR_TREK	0x0a16		/* Trek Technology */
 #define	USB_VENDOR_ASAHIOPTICAL	0x0a17		/* Asahi Optical Co., Ltd. */
 #define	USB_VENDOR_BOCASYSTEMS	0x0a43		/* Boca Systems, Inc. */
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom Corp. */
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
+#define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components (2nd) */
+#define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems, Inc. */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics, Inc. */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link Corp */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
+#define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
 
 /*
  * List of known products.  Grouped by vendor.
@@ -266,6 +302,9 @@
 
 /* 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 */
 
 /* ActiveWire, Inc. products */
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD	0x0100		/* I/O Board */
@@ -280,12 +319,22 @@
 /* Agiler products */
 #define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
 
+/* AGFA products */
+#define	USB_PRODUCT_AGFA_SNAPSCAN1212U	0x0001		/* SnapScan 1212U */
+#define	USB_PRODUCT_AGFA_SNAPSCANTOUCH	0x0100		/* SnapScan Touch */
+#define	USB_PRODUCT_AGFA_SNAPSCAN1212U2	0x2061		/* SnapScan 1212U */
+
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
 /* Alcor Micro, Inc. products */
 #define	USB_PRODUCT_ALCOR2_KBD_HUB	0x2802		/* Kbd Hub */
 
+#define	USB_PRODUCT_ALCOR_MA_KBD_HUB	0x9213		/* MacAlly Kbd Hub */
+#define	USB_PRODUCT_ALCOR_AU9814	0x9215		/* AU9814 Hub */
+#define	USB_PRODUCT_ALCOR_SM_KBD	0x9410		/* MicroConnectors/StrongMan Keyboard */
+#define	USB_PRODUCT_ALCOR_NEC_KBD_HUB	0x9472		/* NEC Kbd Hub */
+
 /* Altec Lansing products */
 #define	USB_PRODUCT_ALTEC_ADA70	0x0070		/* ADA70 Speakers */
 #define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
@@ -295,16 +344,26 @@
 
 /* Anchor products */
 #define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
+#define	USB_PRODUCT_ANCHOR_EZLINK	0x2720		/* EZLINK */
 
 /* AOX, Inc. products */
 #define	USB_PRODUCT_AOX_USB101	0x0008		/* USB ethernet controller engine */
 
+/* Apple Computer products */
+#define	USB_PRODUCT_APPLE_OPTMOUSE	0x0302		/* Optical mouse */
+#define	USB_PRODUCT_APPLE_SPEAKERS	0x1101		/* Speakers */
+
 /* ATen products */
 #define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
 #define	USB_PRODUCT_ATEN_UC10T	0x2002		/* 10Mbps ethernet adapter */
+#define	USB_PRODUCT_ATEN_UC232A	0x2008		/* Serial adapter */
+
+/* Avision products */
+#define	USB_PRODUCT_AVISION_1200U	0x0268		/* 1200U scanner */
 
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
+#define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel printer adapter */
 
 /* Billionton products */
 #define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 FastEthernet Adapter */
@@ -392,11 +451,17 @@
 #define	USB_PRODUCT_ENTREGA_1S9	0x0093		/* 1S9 serial connector */
 #define	USB_PRODUCT_ENTREGA_EZUSB	0x8000		/* EZ-USB */
 /*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
+#define	USB_PRODUCT_ENTREGA_2U4S	0x8004		/* 2U4S serial connector/usb hub */
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
 /* Epson products */
+#define	USB_PRODUCT_EPSON_PRINTER1	0x0001		/* USB Printer */
 #define	USB_PRODUCT_EPSON_PRINTER2	0x0002		/* ISD USB Smart Cable for Mac */
 #define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD USB Smart Cable */
+#define	USB_PRODUCT_EPSON_636	0x0101		/* Perfection 636U / 636Photo scanner */
+#define	USB_PRODUCT_EPSON_610	0x0103		/* Perfection 610 scanner */
+#define	USB_PRODUCT_EPSON_1200	0x0104		/* Perfection 1200U / 1200Photo scanner */
+#define	USB_PRODUCT_EPSON_1600	0x0107		/* Expression 1600 */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
@@ -407,12 +472,18 @@
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
+/* Griffin Technology */
+#define	USB_PRODUCT_GRIFFIN_IMATE	0x0405		/* iMate, ABD adapter */
+
 /* Freecom products */
 #define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
 
 /* Future Technology Devices products */
 #define	USB_PRODUCT_FTDI_SERIAL	0x8372		/* Serial converter */
 
+/* Fuji photo products */
+#define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
+
 /* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 
@@ -423,11 +494,18 @@
 #define	USB_PRODUCT_HP_6200C	0x0201		/* ScanJet 6200C */
 #define	USB_PRODUCT_HP_S20b	0x0202		/* PhotoSmart S20 */
 #define	USB_PRODUCT_HP_3300C	0x0205		/* ScanJet 3300C */
-#define	USB_PRODUCT_HP_5200	0x0401		/* Scanjet 5200 */
+#define	USB_PRODUCT_HP_5200C	0x0401		/* Scanjet 5200C */
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
+#define	USB_PRODUCT_HP_5300C	0x0701		/* Scanjet 5300C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 
+/* HP products */
+#define	USB_PRODUCT_HP2_C500	0x6002		/* PhotoSmart C500 */
+
+/* IBM Corporation */
+#define	USB_PRODUCT_IBM_USBCDROMDRIVE	0x4427		/* USB CD-ROM Drive */
+
 /* Inside Out Networks products */
 #define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 serial ports */
 
@@ -435,6 +513,7 @@
 #define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel printer adapter */
 #define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter ISD110 */
 #define	USB_PRODUCT_INSYSTEM_ISD105	0x0202		/* IDE adapter ISD105 */
+#define	USB_PRODUCT_INSYSTEM_USBCABLE	0x081a		/* USB cable */
 
 /* Intel products */
 #define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
@@ -480,6 +559,10 @@
 #define	USB_PRODUCT_KYE_NICHE	0x0001		/* Niche mouse */
 #define	USB_PRODUCT_KYE_NETSCROLL	0x0003		/* Genius NetScroll mouse */
 #define	USB_PRODUCT_KYE_FLIGHT2000	0x1004		/* Flight 2000 joystick */
+#define	USB_PRODUCT_KYE_VIVIDPRO	0x2001		/* ColorPage Vivid-Pro scanner */
+
+/* LaCie products */
+#define	USB_PRODUCT_LACIE_CDRW	0xa602		/* CD R/W */
 
 /* Lexmark products */
 #define	USB_PRODUCT_LEXMARK_S2450	0x0009		/* Optra S 2450 */
@@ -502,6 +585,7 @@
 #define	USB_PRODUCT_LOGITECH_N48	0xc001		/* N48 mouse */
 #define	USB_PRODUCT_LOGITECH_MBA47	0xc002		/* M-BA47 mouse */
 #define	USB_PRODUCT_LOGITECH_WMMOUSE	0xc004		/* WingMan Gaming 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_QUICKCAMPRO2	0xd001		/* QuickCam Pro */
@@ -531,6 +615,15 @@
 #define	USB_PRODUCT_MICROSOFT_INTELLIEYE	0x0025		/* IntelliEye mouse */
 #define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Keyboard Pro */
 
+/* Microtek products */
+#define	USB_PRODUCT_MICROTEK_X6U	0x0099		/* ScanMaker X6 - X6U */
+#define	USB_PRODUCT_MICROTEK_336CX	0x0094		/* Phantom 336CX - C3 scanner */
+#define	USB_PRODUCT_MICROTEK_336CX2	0x00a0		/* Phantom 336CX - C3 scanner */
+#define	USB_PRODUCT_MICROTEK_C6	0x009a		/* Phantom C6 scanner */
+#define	USB_PRODUCT_MICROTEK_V6USL	0x00a3		/* ScanMaker V6USL */
+#define	USB_PRODUCT_MICROTEK_V6USL2	0x80a3		/* ScanMaker V6USL */
+#define	USB_PRODUCT_MICROTEK_V6UL	0x80ac		/* ScanMaker V6UL */
+
 /* Midiman products */
 #define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
 
@@ -541,8 +634,15 @@
 #define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA-USB modem */
 
 /* Mustek products */
+#define	USB_PRODUCT_MUSTEK_1200CU	0x0001		/* 1200 CU scanner */
+#define	USB_PRODUCT_MUSTEK_600CU	0x0002		/* 600 CU scanner */
+#define	USB_PRODUCT_MUSTEK_1200USB	0x0003		/* 1200 USB scanner */
+#define	USB_PRODUCT_MUSTEK_1200UB	0x0006		/* 1200 UB scanner */
 #define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
 
+/* National Semiconductor */
+#define	USB_PRODUCT_NATIONAL_BEARPAW	0x1000		/* BearPaw 1200 */
+
 /* NEC products */
 #define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
 #define	USB_PRODUCT_NEC_HUB_B	0x55ab		/* hub */
@@ -580,6 +680,18 @@
 #define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
 
 /* Primax products */
+#define	USB_PRODUCT_PRIMAX_G2X300	0x0300		/* G2-200 scanner */
+#define	USB_PRODUCT_PRIMAX_G2E300	0x0301		/* G2E-300 scanner */
+#define	USB_PRODUCT_PRIMAX_G2300	0x0302		/* G2-300 scanner */
+#define	USB_PRODUCT_PRIMAX_G2E3002	0x0303		/* G2E-300 scanner */
+#define	USB_PRODUCT_PRIMAX_9600	0x0340		/* Colorado USB 9600 scanner */
+#define	USB_PRODUCT_PRIMAX_600U	0x0341		/* Colorado 600u scanner */
+#define	USB_PRODUCT_PRIMAX_19200	0x0360		/* Colorado USB 19200 scanner */
+#define	USB_PRODUCT_PRIMAX_1200U	0x0361		/* Colorado 1200u scanner */
+#define	USB_PRODUCT_PRIMAX_G600	0x0380		/* G2-600 scanner */
+#define	USB_PRODUCT_PRIMAX_636I	0x0381		/* ReadyScan 636i */
+#define	USB_PRODUCT_PRIMAX_G2600	0x0382		/* G2-600 scanner */
+#define	USB_PRODUCT_PRIMAX_G2E600	0x0383		/* G2E-600 scanner */
 #define	USB_PRODUCT_PRIMAX_COMFORT	0x4d01		/* Comfort */
 #define	USB_PRODUCT_PRIMAX_MOUSEINABOX	0x4d02		/* Mouse-in-a-Box */
 #define	USB_PRODUCT_PRIMAX_PCGAUMS1	0x4d04		/* Sony PCGA-UMS1 */
@@ -587,16 +699,20 @@
 /* Prolific products */
 #define	USB_PRODUCT_PROLIFIC_PL2301	0x0000		/* PL2301 Host-Host interface */
 #define	USB_PRODUCT_PROLIFIC_PL2302	0x0001		/* PL2302 Host-Host interface */
+#define	USB_PRODUCT_PROLIFIC_ATAPI4	0x2307		/* ATAPI-4 Bridge Controller */
+
+/* Qtronix products */
+#define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
 
 /* Quickshot products */
 #define	USB_PRODUCT_QUICKSHOT_STRIKEPAD	0x6238		/* USB StrikePad */
 
+/* Rainbow Technologies products */
+#define	USB_PRODUCT_RAINBOW_IKEY2000	0x1200		/* i-Key 2000 */
+
 /* Rockfire products */
 #define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
 
-/* Qtronix products */
-#define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
-
 /* SanDisk products */
 #define	USB_PRODUCT_SANDISK_IMAGEMATE	0x0001		/* USB ImageMate */
 
@@ -619,6 +735,10 @@
 /* SOLID YEAR products */
 #define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Solid Year USB keyboard */
 
+/* SONY products */
+#define	USB_PRODUCT_SONY_DSC	0x0010		/* Sony DSC cameras */
+#define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC memory stick slot */
+
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* USB Communicator */
 
@@ -626,9 +746,11 @@
 #define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
 /* XXX The above is a North American PC style keyboard possibly */
 
-/* Diamond (Supra) products */
+/* Supra products */
+#define	USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K	0x07da		/* Supra Express 56K modem */
+#define	USB_PRODUCT_DIAMOND2_SUPRA2890	0x0b4a		/* SupraMax 2890 56K Modem */
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 USB */
-
+ 
 /* TEAC products */
 #define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB floppy */
 
@@ -641,12 +763,30 @@
 /* Thrustmaster products */
 #define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
 
+/* Trek Technology products */
+#define	USB_PRODUCT_TREK_THUMBDRIVE	0x1111		/* ThumbDrive */
+
+/* UMAX products */
+#define	USB_PRODUCT_UMAX_ASTRA1236U	0x0002		/* Astra 1236U Scanner */
+#define	USB_PRODUCT_UMAX_ASTRA1220U	0x0010		/* Astra 1220U Scanner */
+#define	USB_PRODUCT_UMAX_ASTRA2000U	0x0030		/* Astra 2000U Scanner */
+#define	USB_PRODUCT_UMAX_ASTRA2100U	0x0130		/* Astra 2100U Scanner */
+#define	USB_PRODUCT_UMAX_ASTRA2200U	0x0230		/* Astra 2200U Scanner */
+
 /* Universal Access products */
 #define	USB_PRODUCT_UNIACCESS_PANACHE	0x0101		/* Panache Surf USB ISDN Adapter */
 
 /* Vision products */
 #define	USB_PRODUCT_VISION_VC6452V002	0x0002		/* CPiA Camera */
 
+/* Visioneer products */
+#define	USB_PRODUCT_VISIONEER_7600	0x0211		/* OneTouch 7600 */
+#define	USB_PRODUCT_VISIONEER_5300	0x0221		/* OneTouch 5300 */
+#define	USB_PRODUCT_VISIONEER_6100	0x0231		/* OneTouch 6100 */
+#define	USB_PRODUCT_VISIONEER_6200	0x0311		/* OneTouch 6200 */
+#define	USB_PRODUCT_VISIONEER_8100	0x0321		/* OneTouch 8100 */
+#define	USB_PRODUCT_VISIONEER_8600	0x0331		/* OneTouch 8600 */
+								       
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
 #define	USB_PRODUCT_WACOM_GRAPHIRE	0x0010		/* Graphire */
@@ -655,5 +795,11 @@
 /* Y-E Data products */
 #define	USB_PRODUCT_YEDATA_FLASHBUSTERU	0x0000		/* Flashbuster-U */
 
+/* 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_980N	0x2011		/* Scorpion-980N keyboard */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index de7c8be9071..00f2c79b433 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.24 2000/11/08 18:13:30 aaron Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.25 2000/11/16 19:02:32 aaron Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.24 2000/11/06 20:08:57 mickey Exp 
+ *	OpenBSD
  */
-/* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */
+/* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  *    must display the following acknowledgement:
  *        This product includes software developed by the NetBSD
  *        Foundation, Inc. and its contributors.
- * 4. nEITher the name of The NetBSD Foundation nor the names of its
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
@@ -101,6 +101,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Acerscan C310U",
 	},
 	{
+	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U,
+	    0,
+	    "Acer Peripherals, Inc.",
+	    "Acerscan 320U",
+	},
+	{
+	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U,
+	    0,
+	    "Acer Peripherals, Inc.",
+	    "Acerscan 640U",
+	},
+	{
+	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U,
+	    0,
+	    "Acer Peripherals, Inc.",
+	    "Acerscan 620U",
+	},
+	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
 	    0,
 	    "ActiveWire, Inc.",
@@ -131,6 +149,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "mouse 29UO",
 	},
 	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U,
+	    0,
+	    "AGFA-Gevaert NV",
+	    "SnapScan 1212U",
+	},
+	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH,
+	    0,
+	    "AGFA-Gevaert NV",
+	    "SnapScan Touch",
+	},
+	{
+	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2,
+	    0,
+	    "AGFA-Gevaert NV",
+	    "SnapScan 1212U",
+	},
+	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
 	    "Aladdin Knowledge Systems",
@@ -143,6 +179,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Kbd Hub",
 	},
 	{
+	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB,
+	    0,
+	    "Alcor Micro, Inc.",
+	    "MacAlly Kbd Hub",
+	},
+	{
+	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU9814,
+	    0,
+	    "Alcor Micro, Inc.",
+	    "AU9814 Hub",
+	},
+	{
+	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_SM_KBD,
+	    0,
+	    "Alcor Micro, Inc.",
+	    "MicroConnectors/StrongMan Keyboard",
+	},
+	{
+	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_NEC_KBD_HUB,
+	    0,
+	    "Alcor Micro, Inc.",
+	    "NEC Kbd Hub",
+	},
+	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
 	    0,
 	    "Altec Lansing Technologies, Inc.",
@@ -167,12 +227,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "EZUSB",
 	},
 	{
+	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZLINK,
+	    0,
+	    "Anchor Chips, Inc.",
+	    "EZLINK",
+	},
+	{
 	    USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
 	    0,
 	    "AOX, Inc.",
 	    "USB ethernet controller engine",
 	},
 	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE,
+	    0,
+	    "Apple Computer",
+	    "Optical mouse",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS,
+	    0,
+	    "Apple Computer",
+	    "Speakers",
+	},
+	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    0,
 	    "ATEN International Co. Ltd.",
@@ -185,6 +263,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "10Mbps ethernet adapter",
 	},
 	{
+	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A,
+	    0,
+	    "ATEN International Co. Ltd.",
+	    "Serial adapter",
+	},
+	{
+	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
+	    0,
+	    "Avision, Inc.",
+	    "1200U scanner",
+	},
+	{
+	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
+	    0,
+	    "Belkin Components (2nd)",
+	    "F5U002 Parallel printer adapter",
+	},
+	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    0,
 	    "Billionton Systems, Inc.",
@@ -443,6 +539,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "EZ-USB",
 	},
 	{
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2U4S,
+	    0,
+	    "Entrega",
+	    "2U4S serial connector/usb hub",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER1,
+	    0,
+	    "Seiko Epson Corp.",
+	    "USB Printer",
+	},
+	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2,
 	    0,
 	    "Seiko Epson Corp.",
@@ -455,6 +563,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ISD USB Smart Cable",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636,
+	    0,
+	    "Seiko Epson Corp.",
+	    "Perfection 636U / 636Photo scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610,
+	    0,
+	    "Seiko Epson Corp.",
+	    "Perfection 610 scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200,
+	    0,
+	    "Seiko Epson Corp.",
+	    "Perfection 1200U / 1200Photo scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600,
+	    0,
+	    "Seiko Epson Corp.",
+	    "Expression 1600",
+	},
+	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
 	    0,
 	    "e-TEK Labs",
@@ -473,6 +605,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "GamePad Pro",
 	},
 	{
+	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
+	    0,
+	    "Griffin Technology, Inc.",
+	    "iMate, ABD adapter",
+	},
+	{
 	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
 	    0,
 	    "Freecom",
@@ -485,6 +623,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Serial converter",
 	},
 	{
+	    USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
+	    0,
+	    "Fuji Photo Film Co., Ltd.",
+	    "Mass Storage",
+	},
+	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
 	    "Handspring, Inc.",
@@ -527,10 +671,10 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ScanJet 3300C",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_5200,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
 	    0,
 	    "Hewlett Packard",
-	    "Scanjet 5200",
+	    "Scanjet 5200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
@@ -539,6 +683,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 6300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
+	    0,
+	    "Hewlett Packard",
+	    "Scanjet 5300C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
 	    0,
 	    "Hewlett Packard",
@@ -551,6 +701,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Photosmart P1100",
 	},
 	{
+	    USB_VENDOR_HP2, USB_PRODUCT_HP2_C500,
+	    0,
+	    "Hewlett Packard",
+	    "PhotoSmart C500",
+	},
+	{
+	    USB_VENDOR_IBM, USB_PRODUCT_IBM_USBCDROMDRIVE,
+	    0,
+	    "IBM Corporation",
+	    "USB CD-ROM Drive",
+	},
+	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
 	    0,
 	    "Inside Out Networks",
@@ -575,6 +737,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "IDE adapter ISD105",
 	},
 	{
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE,
+	    0,
+	    "In-System Design",
+	    "USB cable",
+	},
+	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
 	    0,
 	    "Intel",
@@ -701,6 +869,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Flight 2000 joystick",
 	},
 	{
+	    USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO,
+	    0,
+	    "KYE Systems Corp.",
+	    "ColorPage Vivid-Pro scanner",
+	},
+	{
+	    USB_VENDOR_LACIE, USB_PRODUCT_LACIE_CDRW,
+	    0,
+	    "LaCie",
+	    "CD R/W",
+	},
+	{
 	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
 	    0,
 	    "Lexmark International, Inc.",
@@ -797,6 +977,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "WingMan Gaming Mouse",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
+	    0,
+	    "Logitech, Inc.",
+	    "USB-PS/2 Trackball",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
 	    0,
 	    "Logitech, Inc.",
@@ -893,6 +1079,48 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Internet Keyboard Pro",
 	},
 	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U,
+	    0,
+	    "Microtek",
+	    "ScanMaker X6 - X6U",
+	},
+	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX,
+	    0,
+	    "Microtek",
+	    "Phantom 336CX - C3 scanner",
+	},
+	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2,
+	    0,
+	    "Microtek",
+	    "Phantom 336CX - C3 scanner",
+	},
+	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6,
+	    0,
+	    "Microtek",
+	    "Phantom C6 scanner",
+	},
+	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL,
+	    0,
+	    "Microtek",
+	    "ScanMaker V6USL",
+	},
+	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2,
+	    0,
+	    "Microtek",
+	    "ScanMaker V6USL",
+	},
+	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL,
+	    0,
+	    "Microtek",
+	    "ScanMaker V6UL",
+	},
+	{
 	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
 	    0,
 	    "Midiman",
@@ -911,12 +1139,42 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "MT5634ZBA-USB modem",
 	},
 	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU,
+	    0,
+	    "Mustek Systems, Inc.",
+	    "1200 CU scanner",
+	},
+	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU,
+	    0,
+	    "Mustek Systems, Inc.",
+	    "600 CU scanner",
+	},
+	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB,
+	    0,
+	    "Mustek Systems, Inc.",
+	    "1200 USB scanner",
+	},
+	{
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB,
+	    0,
+	    "Mustek Systems, Inc.",
+	    "1200 UB scanner",
+	},
+	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
 	    "Mustek Systems, Inc.",
 	    "MDC-800 digital camera",
 	},
 	{
+	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW,
+	    0,
+	    "National Semiconductor",
+	    "BearPaw 1200",
+	},
+	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
 	    0,
 	    "NEC",
@@ -1025,6 +1283,78 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "test board",
 	},
 	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
+	    0,
+	    "Primax Electronics",
+	    "G2-200 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300,
+	    0,
+	    "Primax Electronics",
+	    "G2E-300 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300,
+	    0,
+	    "Primax Electronics",
+	    "G2-300 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002,
+	    0,
+	    "Primax Electronics",
+	    "G2E-300 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600,
+	    0,
+	    "Primax Electronics",
+	    "Colorado USB 9600 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U,
+	    0,
+	    "Primax Electronics",
+	    "Colorado 600u scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200,
+	    0,
+	    "Primax Electronics",
+	    "Colorado USB 19200 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U,
+	    0,
+	    "Primax Electronics",
+	    "Colorado 1200u scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600,
+	    0,
+	    "Primax Electronics",
+	    "G2-600 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I,
+	    0,
+	    "Primax Electronics",
+	    "ReadyScan 636i",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600,
+	    0,
+	    "Primax Electronics",
+	    "G2-600 scanner",
+	},
+	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600,
+	    0,
+	    "Primax Electronics",
+	    "G2E-600 scanner",
+	},
+	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_COMFORT,
 	    0,
 	    "Primax Electronics",
@@ -1055,22 +1385,34 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "PL2302 Host-Host interface",
 	},
 	{
+	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_ATAPI4,
+	    0,
+	    "Prolific Technology Inc.",
+	    "ATAPI-4 Bridge Controller",
+	},
+	{
+	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
+	    0,
+	    "Qtronix Corp",
+	    "Scorpion-980N keyboard",
+	},
+	{
 	    USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD,
 	    0,
 	    "Quickshot",
 	    "USB StrikePad",
 	},
 	{
-	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
+	    USB_VENDOR_RAINBOW, USB_PRODUCT_RAINBOW_IKEY2000,
 	    0,
-	    "Rockfire",
-	    "gamepad 203USB",
+	    "Rainbow Technologies",
+	    "i-Key 2000",
 	},
 	{
-	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
+	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
 	    0,
-	    "Qtronix Corp",
-	    "Scorpion-980N keyboard",
+	    "Rockfire",
+	    "gamepad 203USB",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE,
@@ -1121,6 +1463,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Solid Year USB keyboard",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC,
+	    0,
+	    "Sony Corp.",
+	    "Sony DSC cameras",
+	},
+	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
+	    0,
+	    "Sony Corp.",
+	    "Sony MSC memory stick slot",
+	},
+	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
 	    0,
 	    "STMicroelectronics",
@@ -1133,6 +1487,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Type 6 USB",
 	},
 	{
+	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
+	    0,
+	    "Diamond (Supra)",
+	    "Supra Express 56K modem",
+	},
+	{
+	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRA2890,
+	    0,
+	    "Diamond (Supra)",
+	    "SupraMax 2890 56K Modem",
+	},
+	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO600USB,
 	    0,
 	    "Diamond (Supra)",
@@ -1163,6 +1529,42 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Fusion Digital Gamepad",
 	},
 	{
+	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
+	    0,
+	    "Trek Technology",
+	    "ThumbDrive",
+	},
+	{
+	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U,
+	    0,
+	    "UMAX Data Systems, Inc.",
+	    "Astra 1236U Scanner",
+	},
+	{
+	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U,
+	    0,
+	    "UMAX Data Systems, Inc.",
+	    "Astra 1220U Scanner",
+	},
+	{
+	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U,
+	    0,
+	    "UMAX Data Systems, Inc.",
+	    "Astra 2000U Scanner",
+	},
+	{
+	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U,
+	    0,
+	    "UMAX Data Systems, Inc.",
+	    "Astra 2100U Scanner",
+	},
+	{
+	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U,
+	    0,
+	    "UMAX Data Systems, Inc.",
+	    "Astra 2200U Scanner",
+	},
+	{
 	    USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
 	    0,
 	    "Universal Access",
@@ -1175,6 +1577,42 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "CPiA Camera",
 	},
 	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_7600,
+	    0,
+	    "Visioneer",
+	    "OneTouch 7600",
+	},
+	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_5300,
+	    0,
+	    "Visioneer",
+	    "OneTouch 5300",
+	},
+	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100,
+	    0,
+	    "Visioneer",
+	    "OneTouch 6100",
+	},
+	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6200,
+	    0,
+	    "Visioneer",
+	    "OneTouch 6200",
+	},
+	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8100,
+	    0,
+	    "Visioneer",
+	    "OneTouch 8100",
+	},
+	{
+	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8600,
+	    0,
+	    "Visioneer",
+	    "OneTouch 8600",
+	},
+	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
 	    0,
 	    "WACOM Corp. Ltd.",
@@ -1199,12 +1637,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Flashbuster-U",
 	},
 	{
+	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
+	    0,
+	    "Yano",
+	    "U640MO-03",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
 	    "Zoom Telephonics, Inc.",
 	    "2986L Fax modem",
 	},
 	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_980N,
+	    0,
+	    "ZyXEL Communication Co.",
+	    "Scorpion-980N keyboard",
+	},
+	{
 	    USB_VENDOR_AOX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "AOX, Inc.",
@@ -1229,6 +1679,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_NATIONAL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "National Semiconductor",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACERLABS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Acer Labs, Inc.",
@@ -1427,12 +1883,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_VISIONEER, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Visioneer",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CANON, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Canon, Inc.",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_IBM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "IBM Corporation",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CYPRESS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Cypress Semiconductor",
@@ -1445,6 +1913,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_RAINBOW, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Rainbow Technologies",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_IODATA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "I/O Data",
@@ -1457,12 +1931,96 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_METHODE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Methode Electronics Far East PTE Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_MAXISWITCH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Maxi Switch, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_LOCKHEEDMER, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Lockheed Martin Energy Research",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_FUJITSU, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Fujitsu Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_TOSHIBAAM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Toshiba America Electronic Components",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_MICROMACRO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Micro Macro Technologies",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_KONICA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Konica Corp.",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_LITEON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Lite-On Technology Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_FUJIPHOTO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Fuji Photo Film Co., Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_PHILIPSSEMI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Philips Semiconductors",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_TATUNG, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Tatung Co. Of America",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SCANLOGIC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ScanLogic Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_MYSON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Myson Technology Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_DIGI2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Digi International",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ITTCANON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ITT Canon",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ALTEC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Altec Lansing Technologies, Inc.",
@@ -1577,6 +2135,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SONY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Sony Corp.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_VISION, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "VLSI Vision Ltd.",
@@ -1673,6 +2237,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ZYXEL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ZyXEL Communication Co.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ALCOR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Alcor Micro, Inc.",
@@ -1697,6 +2267,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_LACIE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "LaCie",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_OMNIVISION, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "OmniVision",
@@ -1745,6 +2321,36 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MICROTEK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Microtek",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_SYMBOL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Symbol Technologies",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_GENESYS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Genesys Logic, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_FUJI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Fuji Electric Co., Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_KEITHLEY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Keithley Instruments",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_EIZONANAO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "EIZO Nanao",
@@ -1757,6 +2363,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_FFC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "FFC Limited",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ANKO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Anko Electronic Co., Ltd.",
@@ -1973,6 +2585,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GRIFFIN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Griffin Technology, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SANDISK, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "SanDisk Corp",
@@ -2003,6 +2621,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_NATIONALTECH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "National Technical Systems",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ONNTO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Onnto Corp.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Be, Inc.",
@@ -2027,6 +2657,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MICROTECH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Microtech",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ABOCOM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "AboCom Systems, Inc.",
@@ -2225,6 +2861,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_YANO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Yano",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_KINGSTON, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Kingston Technology",
@@ -2321,6 +2963,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_TREK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Trek Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ASAHIOPTICAL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Asahi Optical Co., Ltd.",
@@ -2357,6 +3005,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BELKIN2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Belkin Components (2nd)",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_UMAX, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "UMAX Data Systems, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_INSIDEOUT, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Inside Out Networks",
@@ -2386,5 +3046,11 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Intel",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_HP2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Hewlett Packard",
+	    NULL,
+	},
 	{ 0, 0, 0, NULL, NULL, }
 };