Regenerate.

1 files changed, 168 insertions, 152 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index fd37075..23e541b 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.72 2002/01/03 18:56:35 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.76 2002/02/02 21:09:54 joe Exp 
  */
 
 /*
@@ -64,277 +64,293 @@
  *	# commit the derived files after the $ FreeBSD $ has been updated.
  *	cvs commit usbdevs.h usbdevs_data.h
  *
- * Please note that these IDs do not do anything. Adding an ID in usbdevs and
+ * Please note that these IDs do not do anything. Adding an ID here and
  * regenerating the usbdevs.h and usbdevs_data.h only makes a symbolic name
- * available to the source code and does not change any functionality, nor does
- * it make your device available to a specific driver.  It will however make
- * the descriptive string available if a device does not provide the string
- * itself.
+ * available to the source code and does not change any functionality, nor
+ * does it make your device available to a specific driver.
+ * It will however make the descriptive string available if a device does not
+ * provide the string itself.
  *
  * After adding a vendor ID VNDR and a product ID PRDCT you will have the
  * following extra defines:
  * #define USB_VENDOR_VNDR              0x????
  * #define USB_PRODUCT_VNDR_PRDCT       0x????
  *
- * You will have to add these defines to the respective probe routines to make
- * the device recognised by the appropriate device driver.
+ * You may have to add these defines to the respective probe routines to
+ * make the device recognised by the appropriate device driver.
  */
 
-#define	USB_VENDOR_AOX	0x03e8		/* AOX, Inc. */
-#define	USB_VENDOR_ATMEL	0x03eb		/* Atmel Corp. */
+#define	USB_VENDOR_AOX	0x03e8		/* AOX */
+#define	USB_VENDOR_ATMEL	0x03eb		/* Atmel */
 #define	USB_VENDOR_MITSUMI	0x03ee		/* Mitsumi */
-#define	USB_VENDOR_HP	0x03f0		/* Hewlett-Packard */
-#define	USB_VENDOR_ADAPTEC	0x03f3		/* Adaptec, Inc. */
+#define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
+#define	USB_VENDOR_ADAPTEC	0x03f3		/* Adaptec */
 #define	USB_VENDOR_NATIONAL	0x0400		/* National Semiconductor */
-#define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs, Inc. */
+#define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs */
 #define	USB_VENDOR_FTDI	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_KODAK	0x040a		/* Eastman Kodak */
+#define	USB_VENDOR_MELCO	0x0411		/* Melco */
 #define	USB_VENDOR_CREATIVE	0x041e		/* Creative */
-#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_ADI	0x0422		/* ADI Systems */
+#define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology */
+#define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. */
 #define	USB_VENDOR_SUN	0x0430		/* Sun Microsystems */
 #define	USB_VENDOR_TAUGA	0x0436		/* Taugagreining HF */
 #define	USB_VENDOR_AMD	0x0438		/* Advanced Micro Devices */
-#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_LEXMARK	0x043d		/* Lexmark International */
+#define	USB_VENDOR_NANAO	0x0440		/* NANAO */
+#define	USB_VENDOR_ALPS	0x044e		/* Alps Electric */
 #define	USB_VENDOR_THRUST	0x044f		/* Thrustmaster */
 #define	USB_VENDOR_TI	0x0451		/* Texas Instruments */
-#define	USB_VENDOR_ANALOGDEVICES	0x0456		/* Analog Devices, Inc. */
-#define	USB_VENDOR_KYE	0x0458		/* KYE Systems Corp. */
+#define	USB_VENDOR_ANALOGDEVICES	0x0456		/* Analog Devices */
+#define	USB_VENDOR_KYE	0x0458		/* KYE Systems */
 #define	USB_VENDOR_DIAMOND2	0x045a		/* Diamond (Supra) */
 #define	USB_VENDOR_MICROSOFT	0x045e		/* Microsoft */
 #define	USB_VENDOR_PRIMAX	0x0461		/* Primax Electronics */
-#define	USB_VENDOR_AMP	0x0464		/* AMP, Inc. */
-#define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter GmbH */
+#define	USB_VENDOR_AMP	0x0464		/* AMP */
+#define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter */
 #define	USB_VENDOR_MEGATRENDS	0x046b		/* American Megatrends */
-#define	USB_VENDOR_LOGITECH	0x046d		/* Logitech, Inc. */
+#define	USB_VENDOR_LOGITECH	0x046d		/* Logitech */
 #define	USB_VENDOR_BTC	0x046e		/* Behavior Tech. Computer */
 #define	USB_VENDOR_PHILIPS	0x0471		/* Philips */
-#define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix Corp. */
+#define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix */
 #define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
-#define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA Corp. */
+#define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq Computers */
-#define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals, Inc. */
+#define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals */
 #define	USB_VENDOR_VISIONEER	0x04a7		/* Visioneer */
-#define	USB_VENDOR_CANON	0x04a9		/* Canon, Inc. */
+#define	USB_VENDOR_CANON	0x04a9		/* Canon */
 #define	USB_VENDOR_NIKON	0x04b0		/* Nikon */
 #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_EPSON	0x04b8		/* Seiko Epson */
 #define	USB_VENDOR_RAINBOW	0x04b9		/* Rainbow Technologies */
 #define	USB_VENDOR_IODATA	0x04bb		/* I/O Data */
-#define	USB_VENDOR_TDK	0x04bf		/* TDK Corp. */
+#define	USB_VENDOR_TDK	0x04bf		/* TDK */
 #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_METHODE	0x04c2		/* Methode Electronics Far East */
+#define	USB_VENDOR_MAXISWITCH	0x04c3		/* Maxi Switch */
 #define	USB_VENDOR_LOCKHEEDMER	0x04c4		/* Lockheed Martin Energy Research */
-#define	USB_VENDOR_FUJITSU	0x04c5		/* Fujitsu Ltd. */
+#define	USB_VENDOR_FUJITSU	0x04c5		/* Fujitsu */
 #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_KONICA	0x04c8		/* Konica */
+#define	USB_VENDOR_LITEON	0x04ca		/* Lite-On Technology */
+#define	USB_VENDOR_FUJIPHOTO	0x04cb		/* Fuji Photo Film */
 #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_SCANLOGIC	0x04ce		/* ScanLogic */
+#define	USB_VENDOR_MYSON	0x04cf		/* Myson Technology */
 #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_ALTEC	0x04d2		/* Altec Lansing Technologies */
 #define	USB_VENDOR_PANASONIC	0x04da		/* Panasonic (Matsushita) */
+#define	USB_VENDOR_IIYAMA	0x04e1		/* Iiyama */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_ANNABOOKS	0x04ed		/* Annabooks */
-#define	USB_VENDOR_CHICONY	0x04f2		/* Chicony Electronics Co., Ltd. */
-#define	USB_VENDOR_BROTHER	0x04f9		/* Brother Industries, Ltd. */
+#define	USB_VENDOR_CHICONY	0x04f2		/* Chicony Electronics */
+#define	USB_VENDOR_BROTHER	0x04f9		/* Brother Industries */
 #define	USB_VENDOR_DALLAS	0x04fa		/* Dallas Semiconductor */
-#define	USB_VENDOR_ACER	0x0502		/* Acer, Inc. */
-#define	USB_VENDOR_3COM	0x0506		/* 3Com Corp. */
-#define	USB_VENDOR_AZTECH	0x0509		/* Aztech Systems Ltd */
+#define	USB_VENDOR_ACER	0x0502		/* Acer */
+#define	USB_VENDOR_3COM	0x0506		/* 3Com */
+#define	USB_VENDOR_AZTECH	0x0509		/* Aztech Systems */
 #define	USB_VENDOR_BELKIN	0x050d		/* Belkin Components */
-#define	USB_VENDOR_KAWATSU	0x050f		/* Kawatsu Semiconductor, Inc. */
+#define	USB_VENDOR_KAWATSU	0x050f		/* Kawatsu Semiconductor */
 #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 */
 #define	USB_VENDOR_NETCHIP	0x0525		/* NetChip Technology */
 #define	USB_VENDOR_ALTRA	0x0527		/* ALTRA */
-#define	USB_VENDOR_ATI	0x0528		/* ATI Technologies, Inc. */
+#define	USB_VENDOR_ATI	0x0528		/* ATI Technologies */
 #define	USB_VENDOR_AKS	0x0529		/* Aladdin Knowledge Systems */
 #define	USB_VENDOR_UNIACCESS	0x0540		/* Universal Access */
-#define	USB_VENDOR_XIRLINK	0x0545		/* Xirlink, Inc. */
-#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. */
-#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_ALCOR2	0x0566		/* Alcor Micro, Inc. */
-#define	USB_VENDOR_WACOM	0x056a		/* WACOM Corp. Ltd. */
+#define	USB_VENDOR_XIRLINK	0x0545		/* Xirlink */
+#define	USB_VENDOR_ANCHOR	0x0547		/* Anchor Chips */
+#define	USB_VENDOR_SONY	0x054c		/* Sony */
+#define	USB_VENDOR_VISION	0x0553		/* VLSI Vision */
+#define	USB_VENDOR_ASAHIKASEI	0x0556		/* Asahi Kasei Microsystems */
+#define	USB_VENDOR_ATEN	0x0557		/* ATEN International */
+#define	USB_VENDOR_MUSTEK	0x055f		/* Mustek Systems */
+#define	USB_VENDOR_TELEX	0x0562		/* Telex Communications */
+#define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks */
+#define	USB_VENDOR_ALCOR2	0x0566		/* Alcor Micro */
+#define	USB_VENDOR_WACOM	0x056a		/* WACOM */
 #define	USB_VENDOR_ETEK	0x056c		/* e-TEK Labs */
 #define	USB_VENDOR_EIZO	0x056d		/* EIZO */
-#define	USB_VENDOR_ELECOM	0x056e		/* Elecom Corp. Ltd. */
+#define	USB_VENDOR_ELECOM	0x056e		/* Elecom */
 #define	USB_VENDOR_HAUPPAUGE	0x0573		/* Hauppauge Computer Works */
 #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_ROLAND	0x0582		/* Roland Corp. */
+#define	USB_VENDOR_ROLAND	0x0582		/* Roland */
 #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_RATOC	0x0584		/* RATOC Systems,Inc. */
+#define	USB_VENDOR_ZYXEL	0x0586		/* ZyXEL Communication */
+#define	USB_VENDOR_ALCOR	0x058f		/* Alcor Micro */
+#define	USB_VENDOR_IOMEGA	0x059b		/* Iomega */
+#define	USB_VENDOR_ATREND	0x059c		/* A-Trend Technology */
 #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 */
 #define	USB_VENDOR_DIGI	0x05c5		/* Digi International */
-#define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix Corp */
-#define	USB_VENDOR_ELSA	0x05cc		/* ELSA Gmbh */
+#define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix */
+#define	USB_VENDOR_ELSA	0x05cc		/* ELSA */
 #define	USB_VENDOR_BRAINBOXES	0x05d1		/* Brainboxes Limited */
 #define	USB_VENDOR_ULTIMA	0x05d8		/* Ultima */
 #define	USB_VENDOR_AXIOHM	0x05d9		/* Axiohm Transaction Solutions */
 #define	USB_VENDOR_MICROTEK	0x05da		/* Microtek */
 #define	USB_VENDOR_LEXAR	0x05dc		/* Lexar Media */
 #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_GENESYS	0x05e3		/* Genesys Logic */
+#define	USB_VENDOR_FUJI	0x05e5		/* Fuji Electric */
 #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_FFC	0x05eb		/* FFC */
+#define	USB_VENDOR_ANKO	0x05ef		/* Anko Electronic */
 #define	USB_VENDOR_PIENGINEERING	0x05f3		/* P.I. Engineering */
 #define	USB_VENDOR_AOC	0x05f6		/* AOC International */
 #define	USB_VENDOR_CHIC	0x05fe		/* Chic Technology */
 #define	USB_VENDOR_BARCO	0x0600		/* Barco Display Systems */
-#define	USB_VENDOR_BRIDGE	0x0607		/* Bridge Information Co., Ltd. */
+#define	USB_VENDOR_BRIDGE	0x0607		/* Bridge Information */
 #define	USB_VENDOR_SOLIDYEAR	0x060b		/* Solid Year */
 #define	USB_VENDOR_BIORAD	0x0614		/* Bio-Rad Laboratories */
 #define	USB_VENDOR_MACALLY	0x0618		/* Macally */
-#define	USB_VENDOR_ACTLABS	0x061c		/* Act Labs, Ltd. */
-#define	USB_VENDOR_ALARIS	0x0620		/* Alaris, Inc. */
-#define	USB_VENDOR_APEX	0x0624		/* Apex, Inc. */
-#define	USB_VENDOR_AVISION	0x0638		/* Avision, Inc. */
+#define	USB_VENDOR_ACTLABS	0x061c		/* Act Labs */
+#define	USB_VENDOR_ALARIS	0x0620		/* Alaris */
+#define	USB_VENDOR_APEX	0x0624		/* Apex */
+#define	USB_VENDOR_AVISION	0x0638		/* Avision */
 #define	USB_VENDOR_TEAC	0x0644		/* TEAC */
-#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_PROLIFIC	0x067b		/* Prolific Technology Inc. */
-#define	USB_VENDOR_ADVANCELOGIC	0x0680		/* Avance Logic, Inc. */
+#define	USB_VENDOR_LINKSYS	0x066b		/* Linksys */
+#define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America */
+#define	USB_VENDOR_SIGMATEL	0x066f		/* Sigmatel */
+#define	USB_VENDOR_AIWA	0x0677		/* Aiwa */
+#define	USB_VENDOR_ACARD	0x0678		/* ACARD Technology */
+#define	USB_VENDOR_PROLIFIC	0x067b		/* Prolific Technology */
+#define	USB_VENDOR_ADVANCELOGIC	0x0680		/* Avance Logic */
 #define	USB_VENDOR_HAGIWARA	0x0693		/* Hagiwara Sys-Com */
 #define	USB_VENDOR_CTX	0x0698		/* Chuntex */
-#define	USB_VENDOR_ASKEY	0x069a		/* Askey Computer Corp. */
+#define	USB_VENDOR_ASKEY	0x069a		/* Askey Computer */
+#define	USB_VENDOR_SAITEK	0x06a3		/* Saitek */
 #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 Corp. */
+#define	USB_VENDOR_AGFA	0x06bd		/* AGFA-Gevaert */
+#define	USB_VENDOR_ASIAMD	0x06be		/* Asia Microelectronic Development */
+#define	USB_VENDOR_BIZLINK	0x06c4		/* Bizlink International */
 #define	USB_VENDOR_KEYSPAN	0x06cd		/* Keyspan */
-#define	USB_VENDOR_AASHIMA	0x06d6		/* Aashima Technology B.V. */
+#define	USB_VENDOR_AASHIMA	0x06d6		/* Aashima Technology */
 #define	USB_VENDOR_MULTITECH	0x06e0		/* MultiTech */
-#define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies, Inc. */
+#define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies */
 #define	USB_VENDOR_ALCATELM	0x06e4		/* Alcatel Microelectronics */
 #define	USB_VENDOR_SIRIUS	0x06ea		/* Sirius Technologies */
 #define	USB_VENDOR_BOSTON	0x06fd		/* Boston Acoustics */
-#define	USB_VENDOR_SMC	0x0707		/* Standard Microsystems Corp */
-#define	USB_VENDOR_PUTERCOM	0x0708		/* Putercom Co., Ltd. */
-#define	USB_VENDOR_MCT	0x0711		/* MCT Corp. */
+#define	USB_VENDOR_SMC	0x0707		/* Standard Microsystems */
+#define	USB_VENDOR_PUTERCOM	0x0708		/* Putercom */
+#define	USB_VENDOR_MCT	0x0711		/* MCT */
+#define	USB_VENDOR_DIGITALSTREAM	0x074e		/* Digital Stream */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
-#define	USB_VENDOR_GRIFFIN	0x077d		/* Griffin Technology, Inc. */
+#define	USB_VENDOR_GRIFFIN	0x077d		/* Griffin Technology */
 #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_BRIMAX	0x078e		/* Brimax */
+#define	USB_VENDOR_AXIS	0x0792		/* Axis Communications */
+#define	USB_VENDOR_ABL	0x0794		/* ABL Electronics */
+#define	USB_VENDOR_ALFADATA	0x079d		/* Alfadata Computer */
 #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_ONNTO	0x07a3		/* Onnto */
+#define	USB_VENDOR_BE	0x07a4		/* Be */
+#define	USB_VENDOR_ADMTEK	0x07a6		/* ADMtek */
 #define	USB_VENDOR_COREGA	0x07aa		/* Corega */
 #define	USB_VENDOR_FREECOM	0x07ab		/* Freecom */
 #define	USB_VENDOR_MICROTECH	0x07af		/* Microtech */
 #define	USB_VENDOR_OLYMPUS	0x07b4		/* Olympus */
-#define	USB_VENDOR_ABOCOM	0x07b8		/* AboCom Systems, Inc. */
-#define	USB_VENDOR_KEISOKUGIKEN	0x07c1		/* Keisokugiken Corp. */
+#define	USB_VENDOR_ABOCOM	0x07b8		/* AboCom Systems */
+#define	USB_VENDOR_KEISOKUGIKEN	0x07c1		/* Keisokugiken */
 #define	USB_VENDOR_APG	0x07c5		/* APG Cash Drawer */
-#define	USB_VENDOR_BUG	0x07c8		/* B.U.G., Inc. */
+#define	USB_VENDOR_BUG	0x07c8		/* B.U.G. */
 #define	USB_VENDOR_ALLIEDTELESYN	0x07c9		/* Allied Telesyn International */
-#define	USB_VENDOR_AVERMEDIA	0x07ca		/* AVerMedia Technologies, Inc. */
+#define	USB_VENDOR_AVERMEDIA	0x07ca		/* AVerMedia Technologies */
 #define	USB_VENDOR_SIIG	0x07cc		/* SIIG */
 #define	USB_VENDOR_CASIO	0x07cf		/* CASIO */
-#define	USB_VENDOR_APTIO	0x07d2		/* Aptio Products, Inc. */
+#define	USB_VENDOR_APTIO	0x07d2		/* Aptio Products */
 #define	USB_VENDOR_ARASAN	0x07da		/* Arasan Chip Systems */
-#define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable Corp. */
+#define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable */
 #define	USB_VENDOR_STSN	0x07ef		/* STSN */
-#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_ACTIONSTAR	0x0835		/* Action Star Enterprise Co., Ltd. */
-#define	USB_VENDOR_PALM	0x0830		/* Palm Computing, Inc. */
-#define	USB_VENDOR_ACCTON	0x083a		/* Accton Technology Corp. */
+#define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics */
+#define	USB_VENDOR_BROADLOGIC	0x0827		/* BroadLogic */
+#define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring */
+#define	USB_VENDOR_ACTIONSTAR	0x0835		/* Action Star Enterprise */
+#define	USB_VENDOR_PALM	0x0830		/* Palm Computing */
+#define	USB_VENDOR_ACCTON	0x083a		/* Accton Technology */
 #define	USB_VENDOR_DIAMOND	0x0841		/* Diamond */
-#define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR, Inc. */
-#define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire, Inc. */
+#define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR */
+#define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire */
+#define	USB_VENDOR_PORTGEAR	0x085a		/* PortGear */
 #define	USB_VENDOR_METRICOM	0x0870		/* Metricom */
-#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_ADESSOKBTEK	0x087c		/* ADESSO/Kbtek America */
+#define	USB_VENDOR_JATON	0x087d		/* Jaton */
+#define	USB_VENDOR_APT	0x0880		/* APT Technologies */
+#define	USB_VENDOR_BOCARESEARCH	0x0885		/* Boca Research */
 #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_SMARTBRIDGES	0x08d1		/* SmartBridges Pte Ltd. */
-#define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems, Inc. */
-#define	USB_VENDOR_EXTENDED	0x08e9		/* Extended Systems, Inc. */
+#define	USB_VENDOR_BURRBROWN	0x08bb		/* Burr-Brown Japan */
+#define	USB_VENDOR_2WIRE	0x08c8		/* 2Wire */
+#define	USB_VENDOR_AIPTEK	0x08ca		/* AIPTEK International */
+#define	USB_VENDOR_SMARTBRIDGES	0x08d1		/* SmartBridges */
+#define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems */
+#define	USB_VENDOR_EXTENDED	0x08e9		/* Extended Systems */
 #define	USB_VENDOR_MSYSTEMS	0x08ec		/* M-Systems */
-#define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec, Inc. */
-#define	USB_VENDOR_ALATION	0x0910		/* Alation Systems, Inc. */
+#define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec */
+#define	USB_VENDOR_ALATION	0x0910		/* Alation Systems */
 #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. */
+#define	USB_VENDOR_BLUEWATER	0x0956		/* BlueWater Systems */
+#define	USB_VENDOR_AGILENT	0x0957		/* Agilent Technologies */
+#define	USB_VENDOR_PORTSMITH	0x095a		/* Portsmith */
 #define	USB_VENDOR_ADIRONDACK	0x0976		/* Adirondack Wire & Cable */
-#define	USB_VENDOR_BECKHOFF	0x0978		/* Beckhoff Gmbh */
-#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 Corp. */
-#define	USB_VENDOR_AFOURTECH	0x09da		/* A-FOUR TECH CO., LTD. */
-#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_BECKHOFF	0x0978		/* Beckhoff */
+#define	USB_VENDOR_ALTIUS	0x09b3		/* Altius Solutions */
+#define	USB_VENDOR_ARRIS	0x09c1		/* Arris Interactive */
+#define	USB_VENDOR_ACTIVCARD	0x09c3		/* ACTIVCARD */
+#define	USB_VENDOR_ACTISYS	0x09c4		/* ACTiSYS */
+#define	USB_VENDOR_AFOURTECH	0x09da		/* A-FOUR TECH */
+#define	USB_VENDOR_AIMEX	0x09dc		/* AIMEX */
+#define	USB_VENDOR_ADDONICS	0x09df		/* Addonics Technologies */
+#define	USB_VENDOR_AKAI	0x09e8		/* AKAI professional M.I. */
 #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_GREENHOUSE	0x0a6b		/* GREENHOUSE Co., Ltd. */
+#define	USB_VENDOR_ASAHIOPTICAL	0x0a17		/* Asahi Optical */
+#define	USB_VENDOR_BOCASYSTEMS	0x0a43		/* Boca Systems */
+#define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom */
+#define	USB_VENDOR_GREENHOUSE	0x0a6b		/* GREENHOUSE */
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
+#define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
+#define	USB_VENDOR_NEC2	0x0b62		/* NEC */
+#define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
+#define	USB_VENDOR_DMI	0x0c0b		/* DMI */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
-#define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components (2nd) */
-#define	USB_VENDOR_SILICONPORTALS	0x1527		/* Silicon Portals Inc. */
-#define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems, Inc. */
+#define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
+#define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
+#define	USB_VENDOR_MOBILITY	0x1342		/* Mobility */
+#define	USB_VENDOR_SHARK	0x13d2		/* Shark */
+#define	USB_VENDOR_SILICONPORTALS	0x1527		/* Silicon Portals */
+#define	USB_VENDOR_SOHOWARE	0x15e8		/* SOHOware */
+#define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems */
 #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_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 */
+#define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
 
 /*
  * List of known products.  Grouped by vendor.
@@ -344,7 +360,7 @@
 #define	USB_PRODUCT_3COM_HOMECONN	0x009d		/* HomeConnect USB Camera */
 #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_3COM_3C460	0x11f8		/* HomeConnect 3C460 */
 
 #define	USB_PRODUCT_3COMUSR_OFFICECONN	0x0082		/* 3Com OfficeConnect Analog Modem */
 #define	USB_PRODUCT_3COMUSR_USRISDN	0x008f		/* 3Com U.S. Robotics Pro ISDN TA */
@@ -355,7 +371,7 @@
 #define	USB_PRODUCT_ABOCOM_URE450	0x4000		/* URE450 Ethernet Adapter */
 #define	USB_PRODUCT_ABOCOM_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
 
-/* Accton Technology Corp. products */
+/* Accton products */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet Adapter */
 
 /* Acer Peripherals, Inc. products */
@@ -645,7 +661,7 @@
 /* Keisokugiken Corp. products */
 #define	USB_PRODUCT_KEISOKUGIKEN_USBDAQ	0x0068		/* HKS-0200 USBDAQ */
 
-/* Kawasaki LSI products (?) */
+/* Kawasaki products */
 #define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* 10BT Ethernet adapter, in the DU-H3E */
 
 /* Kensington products */
@@ -727,9 +743,9 @@
 
 /* MCT Corp. */
 #define	USB_PRODUCT_MCT_HUB0100	0x0100		/* Hub */
+#define	USB_PRODUCT_MCT_DU_H3SP_USB232	0x0200		/* D-Link DU-H3SP USB BAY Hub */
 #define	USB_PRODUCT_MCT_USB232	0x0210		/* USB-232 Interface */
 #define	USB_PRODUCT_MCT_SITECOM_USB232	0x0230		/* Sitecom USB-232 Products */
-#define	USB_PRODUCT_MCT_DU_H3SP_USB232	0x0200		/* D-Link DU-H3SP USB BAY Hub */
 
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
@@ -790,8 +806,8 @@
 #define	USB_PRODUCT_MSYSTEMS_DISKONKEY	0x0010		/* DiskOnKey */
 
 /* National Semiconductor */
-#define	USB_PRODUCT_NATIONAL_BEARPAW1200	0x1000		/* BearPaw 1200 scanner */
-#define	USB_PRODUCT_NATIONAL_BEARPAW2400	0x1001		/* BearPaw 2400 scanner */
+#define	USB_PRODUCT_NATIONAL_BEARPAW1200	0x1000		/* BearPaw 1200 */
+#define	USB_PRODUCT_NATIONAL_BEARPAW2400	0x1001		/* BearPaw 2400 */
 
 /* NEC products */
 #define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */