Regen.

2 files changed, 418 insertions, 120 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 6fa0f18..4a69556 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,11 +4,11 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.17 2000/03/29 19:44:48 wpaul Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.20 2000/04/03 14:47:43 n_hibma Exp 
  */
 
 /*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -48,20 +48,21 @@
  * List of known USB vendors
  */
 
-#define	USB_VENDOR_AOX	0x03e8		/* AOX Inc. */
-#define	USB_VENDOR_ATMEL	0x03eb		/* Atmel Corporation */
+#define	USB_VENDOR_AOX	0x03e8		/* AOX, Inc. */
+#define	USB_VENDOR_ATMEL	0x03eb		/* Atmel Corp. */
 #define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
 #define	USB_VENDOR_ADAPTEC	0x03f3		/* Adaptec, Inc. */
-#define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs Inc. */
+#define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs, Inc. */
+#define	USB_VENDOR_FUTURE	0x0403		/* Future Technology Devices */
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
 #define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak Corp. */
-#define	USB_VENDOR_MELCO	0x0411		/* Melco Inc. */
-#define	USB_VENDOR_ADI	0x0422		/* ADI Systems Inc. */
+#define	USB_VENDOR_MELCO	0x0411		/* Melco, Inc. */
+#define	USB_VENDOR_ADI	0x0422		/* ADI Systems, Inc. */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology Corp. */
 #define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. Ltd. */
 #define	USB_VENDOR_SUN	0x0430		/* Sun Microsystems */
 #define	USB_VENDOR_AMD	0x0438		/* Advanced Micro Devices */
-#define	USB_VENDOR_LEXMARK	0x043d		/* Lexmark International Inc. */
+#define	USB_VENDOR_LEXMARK	0x043d		/* Lexmark International, Inc. */
 #define	USB_VENDOR_NANAO	0x0440		/* NANAO Corp. */
 #define	USB_VENDOR_ALPS	0x044e		/* Alps Electric Co., Ltd. */
 #define	USB_VENDOR_THRUST	0x044f		/* Thrustmaster */
@@ -70,19 +71,21 @@
 #define	USB_VENDOR_KYE	0x0458		/* KYE Systems Corp. */
 #define	USB_VENDOR_MICROSOFT	0x045e		/* Microsoft */
 #define	USB_VENDOR_PRIMAX	0x0461		/* Primax Electronics */
-#define	USB_VENDOR_AMP	0x0464		/* AMP Incorporated */
+#define	USB_VENDOR_AMP	0x0464		/* AMP, Inc. */
 #define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter GmbH */
 #define	USB_VENDOR_MEGATRENDS	0x046b		/* American Megatrends */
-#define	USB_VENDOR_LOGITECH	0x046d		/* Logitech Inc. */
-#define	USB_VENDOR_BTC	0x046e		/* Behavior Tech. Computer Corporation */
+#define	USB_VENDOR_LOGITECH	0x046d		/* Logitech, Inc. */
+#define	USB_VENDOR_BTC	0x046e		/* Behavior Tech. Computer */
 #define	USB_VENDOR_PHILIPS	0x0471		/* Philips */
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix Corp. */
+#define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
-#define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals Inc. */
-#define	USB_VENDOR_CANON	0x04a9		/* Canon Inc. */
+#define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals, Inc. */
+#define	USB_VENDOR_CANON	0x04a9		/* Canon, Inc. */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
+#define	USB_VENDOR_IODATA	0x04bb		/* I/O Data */
 #define	USB_VENDOR_3COMUSR	0x04c1		/* U.S. Robotics */
 #define	USB_VENDOR_KONICA	0x04c8		/* Konica Corp. */
 #define	USB_VENDOR_ALTEC	0x04d2		/* Altec Lansing Technologies, Inc. */
@@ -92,24 +95,24 @@
 #define	USB_VENDOR_BROTHER	0x04f9		/* Brother Industries, Ltd. */
 #define	USB_VENDOR_DALLAS	0x04fa		/* Dallas Semiconductor */
 #define	USB_VENDOR_ACER	0x0502		/* Acer, Inc. */
-#define	USB_VENDOR_3COM	0x0506		/* 3Com Corporation */
+#define	USB_VENDOR_3COM	0x0506		/* 3Com Corp. */
 #define	USB_VENDOR_AZTECH	0x0509		/* Aztech Systems Ltd */
 #define	USB_VENDOR_BELKIN	0x050d		/* Belkin Components */
 #define	USB_VENDOR_KAWATSU	0x050f		/* Kawatsu Semiconductor, Inc. */
 #define	USB_VENDOR_APC	0x051d		/* American Power Conversion */
-#define	USB_VENDOR_CONNECTEK	0x0522		/* Advanced Connectek USA Inc. */
+#define	USB_VENDOR_CONNECTEK	0x0522		/* Advanced Connectek USA, Inc. */
 #define	USB_VENDOR_NETCHIP	0x0525		/* NetChip Technology */
 #define	USB_VENDOR_ALTRA	0x0527		/* ALTRA */
 #define	USB_VENDOR_ATI	0x0528		/* ATI Technologies, Inc. */
 #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_ANCHOR	0x0547		/* Anchor Chips, Inc. */
 #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. */
-#define	USB_VENDOR_MUSTEK	0x055f		/* Mustek Systems Inc. */
-#define	USB_VENDOR_TELEX	0x0562		/* Telex Communications Inc. */
-#define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks Inc. */
+#define	USB_VENDOR_MUSTEK	0x055f		/* Mustek Systems, Inc. */
+#define	USB_VENDOR_TELEX	0x0562		/* Telex Communications, Inc. */
+#define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks, Inc. */
 #define	USB_VENDOR_WACOM	0x056a		/* WACOM Corp. Ltd. */
 #define	USB_VENDOR_ETEK	0x056c		/* e-TEK Labs */
 #define	USB_VENDOR_EIZO	0x056d		/* EIZO */
@@ -117,6 +120,7 @@
 #define	USB_VENDOR_BAFO	0x0576		/* BAFO/Quality Computer Accessories */
 #define	USB_VENDOR_YEDATA	0x057b		/* Y-E Data */
 #define	USB_VENDOR_AVM	0x057c		/* AVM GmbH */
+#define	USB_VENDOR_QUICKSHOT	0x057f		/* Quickshot */
 #define	USB_VENDOR_ROCKFIRE	0x0583		/* Rockfire */
 #define	USB_VENDOR_ALCOR	0x058f		/* Alcor Micro, Inc. */
 #define	USB_VENDOR_IOMEGA	0x059b		/* Iomega Corp. */
@@ -125,6 +129,7 @@
 #define	USB_VENDOR_OMNIVISION	0x05a9		/* OmniVision */
 #define	USB_VENDOR_INSYSTEM	0x05ab		/* In-System Design */
 #define	USB_VENDOR_APPLE	0x05ac		/* Apple Computer */
+#define	USB_VENDOR_DIGI	0x05c5		/* Digi International */
 #define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix Corp */
 #define	USB_VENDOR_ELSA	0x05cc		/* ELSA Gmbh */
 #define	USB_VENDOR_BRAINBOXES	0x05d1		/* Brainboxes Limited */
@@ -144,16 +149,16 @@
 #define	USB_VENDOR_ALARIS	0x0620		/* Alaris, Inc. */
 #define	USB_VENDOR_APEX	0x0624		/* Apex, Inc. */
 #define	USB_VENDOR_AVISION	0x0638		/* Avision, Inc. */
-#define	USB_VENDOR_LINKSYS	0x066b		/* Linksys Inc. */
+#define	USB_VENDOR_LINKSYS	0x066b		/* Linksys, Inc. */
 #define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America, Inc. */
 #define	USB_VENDOR_AIWA	0x0677		/* Aiwa Co., Ltd. */
 #define	USB_VENDOR_ACARD	0x0678		/* ACARD Technology Corp. */
 #define	USB_VENDOR_ADVANCELOGIC	0x0680		/* Avance Logic, Inc. */
-#define	USB_VENDOR_ASKEY	0x069a		/* Askey Computer Corporation */
+#define	USB_VENDOR_ASKEY	0x069a		/* Askey Computer Corp. */
 #define	USB_VENDOR_ALCATELT	0x06b9		/* Alcatel Telecom */
 #define	USB_VENDOR_AGFA	0x06bd		/* AGFA-Gevaert NV */
 #define	USB_VENDOR_ASIAMD	0x06be		/* Asia Microelectronic Development, Inc. */
-#define	USB_VENDOR_BIZLINK	0x06c4		/* Bizlink International Corporation */
+#define	USB_VENDOR_BIZLINK	0x06c4		/* Bizlink International Corp. */
 #define	USB_VENDOR_AASHIMA	0x06d6		/* Aashima Technology B.V. */
 #define	USB_VENDOR_MULTITECH	0x06e0		/* MultiTech */
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies, Inc. */
@@ -164,13 +169,14 @@
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
-#define	USB_VENDOR_BRIMAX	0x078e		/* Brimax Inc. */
+#define	USB_VENDOR_BRIMAX	0x078e		/* Brimax, Inc. */
 #define	USB_VENDOR_AXIS	0x0792		/* Axis Communications AB */
-#define	USB_VENDOR_ABL	0x0794		/* ABL Electronics Corporation */
+#define	USB_VENDOR_ABL	0x0794		/* ABL Electronics Corp. */
 #define	USB_VENDOR_ALFADATA	0x079d		/* Alfadata Computer Corp. */
-#define	USB_VENDOR_BE	0x07a4		/* Be Incorporated */
-#define	USB_VENDOR_ADMTEK	0x07a6		/* ADMtek Incorporated */
+#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_ABOCOM	0x07b8		/* AboCom Systems, Inc. */
 #define	USB_VENDOR_KEISOKUGIKEN	0x07c1		/* Keisokugiken Corp. */
 #define	USB_VENDOR_APG	0x07c5		/* APG Cash Drawer */
@@ -178,24 +184,25 @@
 #define	USB_VENDOR_ALLIEDTELESYN	0x07c9		/* Allied Telesyn International */
 #define	USB_VENDOR_AVERMEDIA	0x07ca		/* AVerMedia Technologies, Inc. */
 #define	USB_VENDOR_SIIG	0x07cc		/* SIIG */
-#define	USB_VENDOR_APTIO	0x07d2		/* Aptio Products Inc. */
+#define	USB_VENDOR_APTIO	0x07d2		/* Aptio Products, Inc. */
 #define	USB_VENDOR_ARASAN	0x07da		/* Arasan Chip Systems */
-#define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable Corporation */
-#define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics Inc. */
+#define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable Corp. */
+#define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics, Inc. */
 #define	USB_VENDOR_BROADLOGIC	0x0827		/* BroadLogic, Inc. */
-#define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring Inc. */
+#define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring, Inc. */
 #define	USB_VENDOR_ACTIONSTAR	0x0835		/* Action Star Enterprise Co., Ltd. */
-#define	USB_VENDOR_ACCTON	0x083a		/* Accton Technology Corporation */
+#define	USB_VENDOR_PALM	0x0830		/* Palm Computing, Inc. */
+#define	USB_VENDOR_ACCTON	0x083a		/* Accton Technology Corp. */
 #define	USB_VENDOR_DIAMOND	0x0841		/* Diamond */
-#define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR Inc. */
-#define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire Inc. */
-#define	USB_VENDOR_ADESSOKBTEK	0x087c		/* ADESSO/Kbtek America Inc. */
-#define	USB_VENDOR_APT	0x0880		/* APT Technologies Inc. */
+#define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR, Inc. */
+#define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire, Inc. */
+#define	USB_VENDOR_ADESSOKBTEK	0x087c		/* ADESSO/Kbtek America, Inc. */
+#define	USB_VENDOR_APT	0x0880		/* APT Technologies, Inc. */
 #define	USB_VENDOR_BOCARESEARCH	0x0885		/* Boca Research, Inc. */
 #define	USB_VENDOR_ANDREA	0x08a8		/* Andrea Electronics */
 #define	USB_VENDOR_BURRBROWN	0x08bb		/* Burr-Brown Japan, Ltd. */
 #define	USB_VENDOR_2WIRE	0x08c8		/* 2Wire, Inc */
-#define	USB_VENDOR_AIPTEK	0x08ca		/* AIPTEK International Inc. */
+#define	USB_VENDOR_AIPTEK	0x08ca		/* AIPTEK International, Inc. */
 #define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems, Inc. */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec, Inc. */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems, Inc. */
@@ -207,16 +214,16 @@
 #define	USB_VENDOR_ALTIUS	0x09b3		/* Altius Solutions, Inc. */
 #define	USB_VENDOR_ARRIS	0x09c1		/* Arris Interactive LLC */
 #define	USB_VENDOR_ACTIVCARD	0x09c3		/* ACTIVCARD, INC. */
-#define	USB_VENDOR_ACTISYS	0x09c4		/* ACTiSYS Corporation */
+#define	USB_VENDOR_ACTISYS	0x09c4		/* ACTiSYS Corp. */
 #define	USB_VENDOR_AFOURTECH	0x09da		/* A-FOUR TECH CO., LTD. */
-#define	USB_VENDOR_AIMEX	0x09dc		/* AIMEX Corporation */
+#define	USB_VENDOR_AIMEX	0x09dc		/* AIMEX Corp. */
 #define	USB_VENDOR_ADDONICS	0x09df		/* Addonics Technologies Corp. */
 #define	USB_VENDOR_AKAI	0x09e8		/* AKAI professional M.I. Corp. */
 #define	USB_VENDOR_ARESCOM	0x09f5		/* ARESCOM */
 #define	USB_VENDOR_BAY	0x09f9		/* Bay Associates */
 #define	USB_VENDOR_ALTERA	0x09fb		/* Altera */
 #define	USB_VENDOR_ASAHIOPTICAL	0x0a17		/* Asahi Optical Co., Ltd. */
-#define	USB_VENDOR_BOCASYSTEMS	0x0a43		/* Boca Systems Inc. */
+#define	USB_VENDOR_BOCASYSTEMS	0x0a43		/* Boca Systems, Inc. */
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom Corp. */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
@@ -235,12 +242,18 @@
 #define	USB_PRODUCT_3COM_3C19250	0x03E8		/* 3C19250 Ethernet adapter */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
 
+#define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect Ethernet USB Adapter */
+
+#define	USB_PRODUCT_3COMUSR_OFFICECONN	0x0082		/* 3Com OfficeConnect Analog Modem */
+#define	USB_PRODUCT_3COMUSR_USRISDN	0x008f		/* 3Com U.S. Robotics Pro ISDN TA */
+#define	USB_PRODUCT_3COMUSR_HOMECONN	0x009d		/* 3Com HomeConnect camera */
 #define	USB_PRODUCT_3COMUSR_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
 
-/* Acer Peripherals Inc. products */
+
+/* Acer Peripherals, Inc. products */
 #define	USB_PRODUCT_ACERP_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
 
-/* ActiveWire Inc. 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 firmware */
 
@@ -257,6 +270,7 @@
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
 /* Altec Lansing products */
+#define	USB_PRODUCT_ALTEC_ADA70	0x0070		/* ADA70 Speakers */
 #define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
 
 /* American Power Conversion products */
@@ -265,7 +279,7 @@
 /* Anchor products */
 #define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
 
-/* AOX Inc. products */
+/* AOX, Inc. products */
 #define	USB_PRODUCT_AOX_USB101	0x0008		/* USB ethernet controller engine */
 
 /* ATen products */
@@ -284,7 +298,7 @@
 /* Behavior Technology Computer products */
 #define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard with mouse port */
 
-/* Canon Inc. products */
+/* Canon, Inc. products */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
 
 /* CATC products */
@@ -299,6 +313,7 @@
 
 /* Chic Technology products */
 #define	USB_PRODUCT_CHIC_MOUSE1	0x0001		/* mouse */
+#define	USB_PRODUCT_CHIC_CYPRESS	0x0003		/* Cypress USB Mouse */
 
 /* Chicony products */
 #define	USB_PRODUCT_CHICONY_KB8933	0x0001		/* KB-8933 keyboard */
@@ -326,6 +341,11 @@
 /* Diamond products */
 #define	USB_PRODUCT_DIAMOND_RIO500USB	0x0001		/* Rio 500 USB */
 
+/* Digi International products */
+#define	USB_PRODUCT_DIGI_ACCELEPORT2	0x0002		/* AccelePort USB 2 */
+#define	USB_PRODUCT_DIGI_ACCELEPORT4	0x0004		/* AccelePort USB 4 */
+#define	USB_PRODUCT_DIGI_ACCELEPORT8	0x0008		/* AccelePort USB 8 */
+
 /* EIZO products */
 #define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
 #define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
@@ -355,12 +375,22 @@
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
-/* Handspring Inc. */
+/* Freecom products */
+#define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
+
+/* Future Technology Devices products */
+#define	USB_PRODUCT_FUTURE_SERIAL	0x8372		/* Serial converter */
+
+/* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 
 /* HP products */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
 #define	USB_PRODUCT_HP_S20	0x0102		/* Photosmart S20 */
+#define	USB_PRODUCT_HP_4200C	0x0105		/* ScanJet 4200C */
+#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_6300C	0x0601		/* Scanjet 6300C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
@@ -376,9 +406,15 @@
 /* Intel products */
 #define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
 
+/* I/O DATA products */
+#define	USB_PRODUCT_IODATA_USBETTX	0x0904		/* USB ETTX */
+
 /* Iomega products */
 #define	USB_PRODUCT_IOMEGA_ZIP100	0x0001		/* Zip 100 */
 
+/* Kawasaki products */
+#define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* USB ethernet controller engine */
+
 /* Kawatsu products */
 #define	USB_PRODUCT_KAWATSU_MH4000P	0x0003		/* MiniHub 4000P */
 
@@ -388,7 +424,12 @@
 /* Kawasaki LSI products (?) */
 #define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* 10BT Ethernet adapter, in the DU-H3E */
 
+/* Kensington products */
+#define	USB_PRODUCT_KENSINGTON_ORBIT	0x1003		/* Orbit USB/PS2 trackball */
+#define	USB_PRODUCT_KENSINGTON_TURBOBALL	0x1005		/* TurboBall */
+
 /* Kodak products */
+#define	USB_PRODUCT_KODAK_DC220	0x0100		/* Digital Science DC220 */
 #define	USB_PRODUCT_KODAK_DC260	0x0110		/* Digital Science DC260 */
 #define	USB_PRODUCT_KODAK_DC265	0x0111		/* Digital Science DC265 */
 #define	USB_PRODUCT_KODAK_DC290	0x0112		/* Digital Science DC290 */
@@ -400,6 +441,7 @@
 
 /* KYE products */
 #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 */
 
 /* Lexmark products */
@@ -415,8 +457,12 @@
 #define	USB_PRODUCT_LOGITECH_M4848	0x0301		/* M4848 mouse */
 #define	USB_PRODUCT_LOGITECH_QUICKCAM	0x0801		/* QuickCam */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO	0x0810		/* QuickCam Pro */
+#define	USB_PRODUCT_LOGITECH_N43	0xc000		/* N43 */
 #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_WMPAD	0xc208		/* WingMan GamePad Extreme */
+#define	USB_PRODUCT_LOGITECH_WMJOY	0xc281		/* WingMan Force joystick */
 
 /* Lucent products */
 #define	USB_PRODUCT_LUCENT_EVALKIT	0x1001		/* USS-720 evaluation kit */
@@ -424,14 +470,17 @@
 /* Macally products */
 #define	USB_PRODUCT_MACALLY_MOUSE1	0x0101		/* mouse */
 
-/* Melco Inc products */
+/* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LU-ATX Ethernet */
 
 /* Microsoft products */
+#define	USB_PRODUCT_MICROSOFT_SIDEPREC	0x0008		/* SideWinder Precision Pro */
 #define	USB_PRODUCT_MICROSOFT_INTELLIMOUSE	0x0009		/* IntelliMouse */
 #define	USB_PRODUCT_MICROSOFT_NATURALKBD	0x000b		/* Natural Keyboard Elite */
 #define	USB_PRODUCT_MICROSOFT_DDS80	0x0014		/* Digital Sound System 80 */
 #define	USB_PRODUCT_MICROSOFT_SIDEWINDER	0x001a		/* Sidewinder Precision Racing Wheel */
+#define	USB_PRODUCT_MICROSOFT_INTELLIEYE	0x0025		/* IntelliEye mouse */
+#define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Keyboard Pro */
 
 /* Midiman products */
 #define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
@@ -455,9 +504,12 @@
 /* Netgear products */
 #define	USB_PRODUCT_NETGEAR_EA101	0x1001		/* Ethernet adapter */
 
-/* OmniVision Technologies Inc. products */
+/* OmniVision Technologies, Inc. products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
 
+/* Palm Computing, Inc. */
+#define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
+
 /* Peracom products */
 #define	USB_PRODUCT_PERACOM_SERIAL1	0x0001		/* Serial Converter */
 #define	USB_PRODUCT_PERACOM_ENET	0x0002		/* Ethernet adapter */
@@ -468,7 +520,7 @@
 #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_DSS150	0x0471		/* DSS XXX Digital Speaker System */
+#define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
 
 /* P.I. Engineering products */
 #define	USB_PRODUCT_PIENGINEERING_PS2USB	0x020b		/* PS2 to Mac USB Adapter */
@@ -479,6 +531,10 @@
 /* Primax products */
 #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 */
+
+/* Quickshot products */
+#define	USB_PRODUCT_QUICKSHOT_STRIKEPAD	0x6238		/* USB StrikePad */
 
 /* Rockfire products */
 #define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
@@ -529,9 +585,11 @@
 
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
-
+#define	USB_PRODUCT_WACOM_GRAPHIRE	0x0010		/* Graphire */
+#define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
+ 
 /* Y-E Data products */
 #define	USB_PRODUCT_YEDATA_FLASHBUSTERU	0x0000		/* Flashbuster-U */
 
-/* Zoom Telephonics Inc. products */
+/* Zoom Telephonics, Inc. products */
 #define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax modem */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index ddc6e7c..8307eda 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,11 +4,11 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.17 2000/03/29 19:44:48 wpaul Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.20 2000/04/03 14:47:43 n_hibma Exp 
  */
 
 /*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -48,22 +48,46 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
 	    0,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    "HomeConnect USB Camera",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
 	    0,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    "3C19250 Ethernet adapter",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
+	    0,
+	    "3Com Corp.",
+	    "HomeConnect Ethernet USB Adapter",
+	},
+	{
+	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
+	    0,
+	    "U.S. Robotics",
+	    "3Com OfficeConnect Analog Modem",
+	},
+	{
+	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USRISDN,
+	    0,
+	    "U.S. Robotics",
+	    "3Com U.S. Robotics Pro ISDN TA",
+	},
+	{
+	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_HOMECONN,
+	    0,
+	    "U.S. Robotics",
+	    "3Com HomeConnect camera",
+	},
+	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USR56K,
 	    0,
 	    "U.S. Robotics",
@@ -72,25 +96,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
 	    0,
-	    "Acer Peripherals Inc.",
+	    "Acer Peripherals, Inc.",
 	    "Acerscan C310U",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
 	    0,
-	    "ActiveWire Inc.",
+	    "ActiveWire, Inc.",
 	    "I/O Board",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1,
 	    0,
-	    "ActiveWire Inc.",
+	    "ActiveWire, Inc.",
 	    "I/O Board, rev. 1 firmware",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    0,
-	    "ADMtek Incorporated",
+	    "ADMtek, Inc.",
 	    "AN986 USB Ethernet adapter",
 	},
 	{
@@ -112,6 +136,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB-HASP 0.06",
 	},
 	{
+	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
+	    0,
+	    "Altec Lansing Technologies, Inc.",
+	    "ADA70 Speakers",
+	},
+	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
 	    0,
 	    "Altec Lansing Technologies, Inc.",
@@ -126,13 +156,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    0,
-	    "Anchor Chips Inc.",
+	    "Anchor Chips, Inc.",
 	    "EZUSB",
 	},
 	{
 	    USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
 	    0,
-	    "AOX Inc.",
+	    "AOX, Inc.",
 	    "USB ethernet controller engine",
 	},
 	{
@@ -162,13 +192,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,
 	    0,
-	    "Behavior Tech. Computer Corporation",
+	    "Behavior Tech. Computer",
 	    "Keyboard with mouse port",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
 	    0,
-	    "Canon Inc.",
+	    "Canon, Inc.",
 	    "PowerShot S10",
 	},
 	{
@@ -214,6 +244,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "mouse",
 	},
 	{
+	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_CYPRESS,
+	    0,
+	    "Chic Technology",
+	    "Cypress USB Mouse",
+	},
+	{
 	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933,
 	    0,
 	    "Chicony Electronics Co., Ltd.",
@@ -280,6 +316,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Rio 500 USB",
 	},
 	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 2",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 4",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 8",
+	},
+	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
 	    0,
 	    "EIZO",
@@ -370,9 +424,21 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "GamePad Pro",
 	},
 	{
+	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
+	    0,
+	    "Freecom",
+	    "Connector for DVD drive",
+	},
+	{
+	    USB_VENDOR_FUTURE, USB_PRODUCT_FUTURE_SERIAL,
+	    0,
+	    "Future Technology Devices",
+	    "Serial converter",
+	},
+	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
-	    "Handspring Inc.",
+	    "Handspring, Inc.",
 	    "Handspring Visor",
 	},
 	{
@@ -388,6 +454,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Photosmart S20",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_4200C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 4200C",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_6200C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 6200C",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_S20b,
+	    0,
+	    "Hewlett Packard",
+	    "PhotoSmart S20",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_3300C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 3300C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200,
 	    0,
 	    "Hewlett Packard",
@@ -436,12 +526,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "82930 test board",
 	},
 	{
+	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
+	    0,
+	    "I/O Data",
+	    "USB ETTX",
+	},
+	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
 	    0,
 	    "Iomega Corp.",
 	    "Zip 100",
 	},
 	{
+	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
+	    0,
+	    "Kawasaki LSI",
+	    "USB ethernet controller engine",
+	},
+	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
 	    0,
 	    "Kawatsu Semiconductor, Inc.",
@@ -460,6 +562,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "10BT Ethernet adapter, in the DU-H3E",
 	},
 	{
+	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT,
+	    0,
+	    "Kensington",
+	    "Orbit USB/PS2 trackball",
+	},
+	{
+	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_TURBOBALL,
+	    0,
+	    "Kensington",
+	    "TurboBall",
+	},
+	{
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220,
+	    0,
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC220",
+	},
+	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260,
 	    0,
 	    "Eastman Kodak Corp.",
@@ -502,6 +622,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Niche mouse",
 	},
 	{
+	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NETSCROLL,
+	    0,
+	    "KYE Systems Corp.",
+	    "Genius NetScroll mouse",
+	},
+	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000,
 	    0,
 	    "KYE Systems Corp.",
@@ -510,64 +636,88 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
 	    0,
-	    "Lexmark International Inc.",
+	    "Lexmark International, Inc.",
 	    "Optra S 2450",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T,
 	    0,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
 	    "USB10T Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX,
 	    0,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
 	    "USB100TX Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA,
 	    0,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
 	    "USB10TA Ethernet",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "M2452 keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "M4848 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "QuickCam",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "QuickCam Pro",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
+	    0,
+	    "Logitech, Inc.",
+	    "N43",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N48,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "N48 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MBA47,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "M-BA47 mouse",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMMOUSE,
+	    0,
+	    "Logitech, Inc.",
+	    "WingMan Gaming Mouse",
+	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
+	    0,
+	    "Logitech, Inc.",
+	    "WingMan GamePad Extreme",
+	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY,
+	    0,
+	    "Logitech, Inc.",
+	    "WingMan Force joystick",
+	},
+	{
 	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT,
 	    0,
 	    "Lucent",
@@ -582,10 +732,16 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
 	    0,
-	    "Melco Inc.",
+	    "Melco, Inc.",
 	    "LU-ATX Ethernet",
 	},
 	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC,
+	    0,
+	    "Microsoft",
+	    "SideWinder Precision Pro",
+	},
+	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIMOUSE,
 	    0,
 	    "Microsoft",
@@ -610,6 +766,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Sidewinder Precision Racing Wheel",
 	},
 	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE,
+	    0,
+	    "Microsoft",
+	    "IntelliEye mouse",
+	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO,
+	    0,
+	    "Microsoft",
+	    "Internet Keyboard Pro",
+	},
+	{
 	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
 	    0,
 	    "Midiman",
@@ -630,7 +798,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
-	    "Mustek Systems Inc.",
+	    "Mustek Systems, Inc.",
 	    "MDC-800 digital camera",
 	},
 	{
@@ -654,7 +822,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
 	    0,
-	    "BayNETGEAR Inc.",
+	    "BayNETGEAR, Inc.",
 	    "Ethernet adapter",
 	},
 	{
@@ -664,27 +832,33 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "OV511 Camera",
 	},
 	{
+	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
+	    0,
+	    "Palm Computing, Inc.",
+	    "USB Serial Adaptor",
+	},
+	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "Serial Converter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "Ethernet adapter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "At Home Ethernet Adapter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "Ethernet adapter",
 	},
 	{
@@ -709,7 +883,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
 	    0,
 	    "Philips",
-	    "DSS XXX Digital Speaker System",
+	    "DSS 150 Digital Speaker System",
 	},
 	{
 	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
@@ -736,6 +910,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Mouse-in-a-Box",
 	},
 	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_PCGAUMS1,
+	    0,
+	    "Primax Electronics",
+	    "Sony PCGA-UMS1",
+	},
+	{
+	    USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD,
+	    0,
+	    "Quickshot",
+	    "USB StrikePad",
+	},
+	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
 	    0,
 	    "Rockfire",
@@ -804,7 +990,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
-	    "Telex Communications Inc.",
+	    "Telex Communications, Inc.",
 	    "Enhanced USB Microphone",
 	},
 	{
@@ -838,6 +1024,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "CT-0405-U Tablet",
 	},
 	{
+	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GRAPHIRE,
+	    0,
+	    "WACOM Corp. Ltd.",
+	    "Graphire",
+	},
+	{
+	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_INTUOSA5,
+	    0,
+	    "WACOM Corp. Ltd.",
+	    "Intuos A5",
+	},
+	{
 	    USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,
 	    0,
 	    "Y-E Data",
@@ -846,19 +1044,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
-	    "Zoom Telephonics Inc.",
+	    "Zoom Telephonics, Inc.",
 	    "2986L Fax modem",
 	},
 	{
 	    USB_VENDOR_AOX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AOX Inc.",
+	    "AOX, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ATMEL, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Atmel Corporation",
+	    "Atmel Corp.",
 	    NULL,
 	},
 	{
@@ -876,7 +1074,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERLABS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Labs Inc.",
+	    "Acer Labs, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_FUTURE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Future Technology Devices",
 	    NULL,
 	},
 	{
@@ -894,13 +1098,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MELCO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Melco Inc.",
+	    "Melco, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADI, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADI Systems Inc.",
+	    "ADI Systems, Inc.",
 	    NULL,
 	},
 	{
@@ -930,7 +1134,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LEXMARK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Lexmark International Inc.",
+	    "Lexmark International, Inc.",
 	    NULL,
 	},
 	{
@@ -984,7 +1188,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AMP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AMP Incorporated",
+	    "AMP, Inc.",
 	    NULL,
 	},
 	{
@@ -1002,13 +1206,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LOGITECH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BTC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Behavior Tech. Computer Corporation",
+	    "Behavior Tech. Computer",
 	    NULL,
 	},
 	{
@@ -1024,6 +1228,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_KENSINGTON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Kensington",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LUCENT, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Lucent",
@@ -1038,13 +1248,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Peripherals Inc.",
+	    "Acer Peripherals, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_CANON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Canon Inc.",
+	    "Canon, Inc.",
 	    NULL,
 	},
 	{
@@ -1060,6 +1270,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_IODATA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "I/O Data",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_3COMUSR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "U.S. Robotics",
@@ -1116,7 +1332,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_3COM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    NULL,
 	},
 	{
@@ -1146,7 +1362,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CONNECTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Advanced Connectek USA Inc.",
+	    "Advanced Connectek USA, Inc.",
 	    NULL,
 	},
 	{
@@ -1182,7 +1398,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANCHOR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Anchor Chips Inc.",
+	    "Anchor Chips, Inc.",
 	    NULL,
 	},
 	{
@@ -1206,19 +1422,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MUSTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Mustek Systems Inc.",
+	    "Mustek Systems, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_TELEX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Telex Communications Inc.",
+	    "Telex Communications, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_PERACOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    NULL,
 	},
 	{
@@ -1264,6 +1480,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_QUICKSHOT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Quickshot",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ROCKFIRE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Rockfire",
@@ -1312,6 +1534,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_DIGI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Digi International",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_QTRONIX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Qtronix Corp",
@@ -1428,7 +1656,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LINKSYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
 	    NULL,
 	},
 	{
@@ -1458,7 +1686,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ASKEY, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Askey Computer Corporation",
+	    "Askey Computer Corp.",
 	    NULL,
 	},
 	{
@@ -1482,7 +1710,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BIZLINK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Bizlink International Corporation",
+	    "Bizlink International Corp.",
 	    NULL,
 	},
 	{
@@ -1548,7 +1776,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BRIMAX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Brimax Inc.",
+	    "Brimax, Inc.",
 	    NULL,
 	},
 	{
@@ -1560,7 +1788,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ABL, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ABL Electronics Corporation",
+	    "ABL Electronics Corp.",
 	    NULL,
 	},
 	{
@@ -1572,13 +1800,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Be Incorporated",
+	    "Be, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADMTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADMtek Incorporated",
+	    "ADMtek, Inc.",
 	    NULL,
 	},
 	{
@@ -1588,6 +1816,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_FREECOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Freecom",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ABOCOM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "AboCom Systems, Inc.",
@@ -1632,7 +1866,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_APTIO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Aptio Products Inc.",
+	    "Aptio Products, Inc.",
 	    NULL,
 	},
 	{
@@ -1644,13 +1878,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ALLIEDCABLE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Allied Cable Corporation",
+	    "Allied Cable Corp.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ZOOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Zoom Telephonics Inc.",
+	    "Zoom Telephonics, Inc.",
 	    NULL,
 	},
 	{
@@ -1662,7 +1896,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HANDSPRING, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Handspring Inc.",
+	    "Handspring, Inc.",
 	    NULL,
 	},
 	{
@@ -1672,9 +1906,15 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PALM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Palm Computing, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACCTON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Accton Technology Corporation",
+	    "Accton Technology Corp.",
 	    NULL,
 	},
 	{
@@ -1686,25 +1926,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NETGEAR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "BayNETGEAR Inc.",
+	    "BayNETGEAR, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ActiveWire Inc.",
+	    "ActiveWire, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADESSOKBTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADESSO/Kbtek America Inc.",
+	    "ADESSO/Kbtek America, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_APT, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "APT Technologies Inc.",
+	    "APT Technologies, Inc.",
 	    NULL,
 	},
 	{
@@ -1734,7 +1974,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AIPTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AIPTEK International Inc.",
+	    "AIPTEK International, Inc.",
 	    NULL,
 	},
 	{
@@ -1806,7 +2046,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACTISYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ACTiSYS Corporation",
+	    "ACTiSYS Corp.",
 	    NULL,
 	},
 	{
@@ -1818,7 +2058,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AIMEX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AIMEX Corporation",
+	    "AIMEX Corp.",
 	    NULL,
 	},
 	{
@@ -1860,7 +2100,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BOCASYSTEMS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Boca Systems Inc.",
+	    "Boca Systems, Inc.",
 	    NULL,
 	},
 	{