kernel bloat is a sin

1 files changed, 185 insertions, 185 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 993ac55da41..486f5c2f140 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.28 2000/12/05 21:37:39 deraadt Exp $
+$OpenBSD: usbdevs,v 1.29 2000/12/05 22:58:00 deraadt Exp $
 /* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */
 
 /*
@@ -42,237 +42,237 @@ $OpenBSD: usbdevs,v 1.28 2000/12/05 21:37:39 deraadt Exp $
  * List of known USB vendors
  */
 
-vendor AOX		0x03e8	AOX, Inc.
-vendor ATMEL		0x03eb	Atmel Corp.
+vendor AOX		0x03e8	AOX
+vendor ATMEL		0x03eb	Atmel
 vendor HP		0x03f0	Hewlett Packard
-vendor ADAPTEC		0x03f3	Adaptec, Inc.
+vendor ADAPTEC		0x03f3	Adaptec
 vendor NATIONAL		0x0400	National Semiconductor
-vendor ACERLABS		0x0402	Acer Labs, Inc.
+vendor ACERLABS		0x0402	Acer Labs
 vendor FTDI		0x0403	Future Technology Devices
 vendor NEC		0x0409	NEC
-vendor KODAK		0x040a	Eastman Kodak Corp.
-vendor MELCO		0x0411	Melco, Inc.
+vendor KODAK		0x040a	Eastman Kodak
+vendor MELCO		0x0411	Melco
 vendor CREATIVELABS	0x041e	Creative Labs
-vendor ADI		0x0422	ADI Systems, Inc.
-vendor CATC		0x0423	Computer Access Technology Corp.
-vendor GRAVIS		0x0428	Advanced Gravis Computer Tech. Ltd.
+vendor ADI		0x0422	ADI Systems
+vendor CATC		0x0423	Computer Access Technology
+vendor GRAVIS		0x0428	Advanced Gravis Computer Tech.
 vendor SUN		0x0430	Sun Microsystems
 vendor AMD		0x0438	Advanced Micro Devices
-vendor LEXMARK		0x043d	Lexmark International, Inc.
+vendor LEXMARK		0x043d	Lexmark International
 vendor NANAO		0x0440	NANAO Corp.
-vendor ALPS		0x044e	Alps Electric Co., Ltd.
+vendor ALPS		0x044e	Alps Electric
 vendor THRUST		0x044f	Thrustmaster
 vendor TI		0x0451	Texas Instruments
-vendor ANALOGDEVICES	0x0456	Analog Devices, Inc.
-vendor KYE		0x0458	KYE Systems Corp.
+vendor ANALOGDEVICES	0x0456	Analog Devices
+vendor KYE		0x0458	KYE Systems
 vendor DIAMOND2		0x045a	Diamond (Supra)
 vendor MICROSOFT	0x045e	Microsoft
 vendor PRIMAX		0x0461	Primax Electronics
-vendor AMP		0x0464	AMP, Inc.
-vendor CHERRY		0x046a	Cherry Mikroschalter GmbH
+vendor AMP		0x0464	AMP
+vendor CHERRY		0x046a	Cherry Mikroschalter
 vendor MEGATRENDS	0x046b	American Megatrends
-vendor LOGITECH		0x046d	Logitech, Inc.
+vendor LOGITECH		0x046d	Logitech
 vendor BTC		0x046e	Behavior Tech. Computer
 vendor PHILIPS		0x0471	Philips
-vendor CONNECTIX	0x0478	Connectix Corp.
+vendor CONNECTIX	0x0478	Connectix
 vendor KENSINGTON	0x047d	Kensington
 vendor LUCENT		0x047e	Lucent
 vendor STMICRO		0x0483	STMicroelectronics
 vendor COMPAQ		0x049f	Compaq Computers
-vendor ACERP		0x04a5	Acer Peripherals, Inc.
+vendor ACERP		0x04a5	Acer Peripherals
 vendor VISIONEER	0x04a7	Visioneer
-vendor CANON		0x04a9	Canon, Inc.
+vendor CANON		0x04a9	Canon
 vendor IBM		0x04b3	IBM Corporation
 vendor CYPRESS		0x04b4	Cypress Semiconductor
 vendor EPSON		0x04b8	Seiko Epson Corp.
 vendor RAINBOW		0x04b9	Rainbow Technologies
 vendor IODATA		0x04bb	I/O Data
 vendor 3COMUSR		0x04c1	U.S. Robotics
-vendor METHODE		0x04c2	Methode Electronics Far East PTE Ltd.
-vendor MAXISWITCH	0x04c3	Maxi Switch, Inc.
+vendor METHODE		0x04c2	Methode Electronics Far East
+vendor MAXISWITCH	0x04c3	Maxi Switch
 vendor LOCKHEEDMER	0x04c4	Lockheed Martin Energy Research
-vendor FUJITSU		0x04c5	Fujitsu Ltd.
+vendor FUJITSU		0x04c5	Fujitsu
 vendor TOSHIBAAM	0x04c6	Toshiba America Electronic Components
 vendor MICROMACRO	0x04c7	Micro Macro Technologies
-vendor KONICA		0x04c8	Konica Corp.
-vendor LITEON		0x04ca	Lite-On Technology Corp.
-vendor FUJIPHOTO	0x04cb	Fuji Photo Film Co., Ltd.
+vendor KONICA		0x04c8	Konica
+vendor LITEON		0x04ca	Lite-On Technology
+vendor FUJIPHOTO	0x04cb	Fuji Photo Film
 vendor PHILIPSSEMI	0x04cc	Philips Semiconductors
 vendor TATUNG		0x04cd	Tatung Co. Of America
-vendor SCANLOGIC	0x04ce	ScanLogic Corp.
-vendor MYSON		0x04cf	Myson Technology Inc.
+vendor SCANLOGIC	0x04ce	ScanLogic
+vendor MYSON		0x04cf	Myson Technology
 vendor DIGI2		0x04d0	Digi International
 vendor ITTCANON		0x04d1	ITT Canon
-vendor ALTEC		0x04d2	Altec Lansing Technologies, Inc.
+vendor ALTEC		0x04d2	Altec Lansing Technologies
 vendor SHUTTLE		0x04e6	Shuttle Technology
 vendor ANNABOOKS	0x04ed	Annabooks
-vendor CHICONY		0x04f2	Chicony Electronics Co., Ltd.
-vendor BROTHER		0x04f9	Brother Industries, Ltd.
+vendor CHICONY		0x04f2	Chicony Electronics
+vendor BROTHER		0x04f9	Brother Industries
 vendor DALLAS		0x04fa	Dallas Semiconductor
-vendor ACER		0x0502	Acer, Inc.
-vendor 3COM		0x0506	3Com Corp.
-vendor AZTECH		0x0509	Aztech Systems Ltd
+vendor ACER		0x0502	Acer
+vendor 3COM		0x0506	3Com
+vendor AZTECH		0x0509	Aztech Systems
 vendor BELKIN		0x050d	Belkin Components
-vendor KAWATSU		0x050f	Kawatsu Semiconductor, Inc.
+vendor KAWATSU		0x050f	Kawatsu Semiconductor
 vendor APC		0x051d	American Power Conversion
-vendor CONNECTEK	0x0522	Advanced Connectek USA, Inc.
+vendor CONNECTEK	0x0522	Advanced Connectek USA
 vendor NETCHIP		0x0525	NetChip Technology
 vendor ALTRA		0x0527	ALTRA
-vendor ATI		0x0528	ATI Technologies, Inc.
+vendor ATI		0x0528	ATI Technologies
 vendor AKS		0x0529	Aladdin Knowledge Systems
 vendor UNIACCESS	0x0540	Universal Access
-vendor ANCHOR		0x0547	Anchor Chips, Inc.
-vendor SONY		0x054c	Sony Corp.
-vendor VISION		0x0553	VLSI Vision Ltd.
-vendor ASAHIKASEI	0x0556	Asahi Kasei Microsystems Co., Ltd
-vendor ATEN		0x0557	ATEN International Co. Ltd.
-vendor MUSTEK		0x055f	Mustek Systems, Inc.
-vendor TELEX		0x0562	Telex Communications, Inc.
-vendor PERACOM		0x0565	Peracom Networks, Inc.
-vendor ALCOR2		0x0566	Alcor Micro, Inc.
-vendor WACOM		0x056a	WACOM Corp. Ltd.
+vendor ANCHOR		0x0547	Anchor Chips
+vendor SONY		0x054c	Sony
+vendor VISION		0x0553	VLSI Vision
+vendor ASAHIKASEI	0x0556	Asahi Kasei Microsystems
+vendor ATEN		0x0557	ATEN International
+vendor MUSTEK		0x055f	Mustek Systems
+vendor TELEX		0x0562	Telex Communications
+vendor PERACOM		0x0565	Peracom Networks
+vendor ALCOR2		0x0566	Alcor Micro
+vendor WACOM		0x056a	WACOM
 vendor ETEK		0x056c	e-TEK Labs
 vendor EIZO		0x056d	EIZO
-vendor ELECOM		0x056e	Elecom Corp. Ltd.
+vendor ELECOM		0x056e	Elecom
 vendor BAFO		0x0576	BAFO/Quality Computer Accessories
 vendor YEDATA		0x057b	Y-E Data
-vendor AVM		0x057c	AVM GmbH
+vendor AVM		0x057c	AVM
 vendor QUICKSHOT	0x057f	Quickshot
 vendor ROCKFIRE		0x0583	Rockfire
-vendor ZYXEL		0x0586	ZyXEL Communication Co.
-vendor ALCOR		0x058f	Alcor Micro, Inc.
-vendor IOMEGA		0x059b	Iomega Corp.
-vendor ATREND		0x059c	A-Trend Technology Co., Ltd.
+vendor ZYXEL		0x0586	ZyXEL Communication
+vendor ALCOR		0x058f	Alcor Micro
+vendor IOMEGA		0x059b	Iomega
+vendor ATREND		0x059c	A-Trend Technology
 vendor AID		0x059d	Advanced Input Devices
 vendor LACIE		0x059f	LaCie
 vendor OMNIVISION	0x05a9	OmniVision
 vendor INSYSTEM		0x05ab	In-System Design
 vendor APPLE		0x05ac	Apple Computer
 vendor DIGI		0x05c5	Digi International
-vendor QTRONIX		0x05c7	Qtronix Corp
-vendor ELSA		0x05cc	ELSA Gmbh
+vendor QTRONIX		0x05c7	Qtronix
+vendor ELSA		0x05cc	ELSA
 vendor BRAINBOXES	0x05d1	Brainboxes Limited
 vendor AXIOHM		0x05d9	Axiohm Transaction Solutions
 vendor MICROTEK		0x05da	Microtek
 vendor SYMBOL		0x05e0	Symbol Technologies
-vendor GENESYS		0x05e3	Genesys Logic, Inc.
-vendor FUJI		0x05e5	Fuji Electric Co., Ltd.
+vendor GENESYS		0x05e3	Genesys Logic
+vendor FUJI		0x05e5	Fuji Electric
 vendor KEITHLEY		0x05e6	Keithley Instruments
 vendor EIZONANAO	0x05e7	EIZO Nanao
 vendor KLSI		0x05e9	Kawasaki LSI
 vendor FFC		0x05eb	FFC Limited
-vendor ANKO		0x05ef	Anko Electronic Co., Ltd.
+vendor ANKO		0x05ef	Anko Electronic
 vendor PIENGINEERING	0x05f3	P.I. Engineering
 vendor AOC		0x05f6	AOC International
 vendor CHIC		0x05fe	Chic Technology
 vendor BARCO		0x0600	Barco Display Systems
-vendor BRIDGE		0x0607	Bridge Information Co., Ltd.
+vendor BRIDGE		0x0607	Bridge Information
 vendor SOLIDYEAR	0x060b	Solid Year
 vendor BIORAD		0x0614	Bio-Rad Laboratories
 vendor MACALLY		0x0618	Macally
-vendor ACTLABS		0x061c	Act Labs, Ltd.
-vendor ALARIS		0x0620	Alaris, Inc.
-vendor APEX		0x0624	Apex, Inc.
-vendor AVISION		0x0638	Avision, Inc.
+vendor ACTLABS		0x061c	Act Labs
+vendor ALARIS		0x0620	Alaris
+vendor APEX		0x0624	Apex
+vendor AVISION		0x0638	Avision
 vendor TEAC		0x0644	TEAC
-vendor LINKSYS		0x066b	Linksys, Inc.
-vendor ACERSA		0x066e	Acer Semiconductor America, Inc.
-vendor AIWA		0x0677	Aiwa Co., Ltd.
-vendor ACARD		0x0678	ACARD Technology Corp.
-vendor PROLIFIC		0x067b	Prolific Technology Inc.
-vendor ADVANCELOGIC	0x0680	Avance Logic, Inc.
+vendor LINKSYS		0x066b	Linksys
+vendor ACERSA		0x066e	Acer Semiconductor America
+vendor AIWA		0x0677	Aiwa
+vendor ACARD		0x0678	ACARD Technology
+vendor PROLIFIC		0x067b	Prolific Technology
+vendor ADVANCELOGIC	0x0680	Avance Logic
 vendor CTX		0x0698	Chuntex
-vendor ASKEY		0x069a	Askey Computer Corp.
+vendor ASKEY		0x069a	Askey Computer
 vendor ALCATELT		0x06b9	Alcatel Telecom
 vendor AGFA		0x06bd	AGFA-Gevaert NV
-vendor ASIAMD		0x06be	Asia Microelectronic Development, Inc.
-vendor BIZLINK		0x06c4	Bizlink International Corp.
+vendor ASIAMD		0x06be	Asia Microelectronic Development
+vendor BIZLINK		0x06c4	Bizlink International
 vendor AASHIMA		0x06d6	Aashima Technology B.V.
 vendor MULTITECH	0x06e0	MultiTech
-vendor ADS		0x06e1	ADS Technologies, Inc.
+vendor ADS		0x06e1	ADS Technologies
 vendor ALCATELM		0x06e4	Alcatel Microelectronics
 vendor SIRIUS		0x06ea	Sirius Technologies
 vendor BOSTON		0x06fd	Boston Acoustics
-vendor SMC		0x0707	Standard Microsystems Corp
-vendor MCT		0x0711	MCT Corp.
+vendor SMC		0x0707	Standard Microsystems
+vendor MCT		0x0711	MCT
 vendor AUREAL		0x0755	Aureal Semiconductor
 vendor MIDIMAN		0x0763	Midiman
-vendor GRIFFIN		0x077d	Griffin Technology, Inc.
-vendor SANDISK		0x0781	SanDisk Corp
-vendor BRIMAX		0x078e	Brimax, Inc.
+vendor GRIFFIN		0x077d	Griffin Technology
+vendor SANDISK		0x0781	SanDisk
+vendor BRIMAX		0x078e	Brimax
 vendor AXIS		0x0792	Axis Communications AB
-vendor ABL		0x0794	ABL Electronics Corp.
-vendor ALFADATA		0x079d	Alfadata Computer Corp.
+vendor ABL		0x0794	ABL Electronics
+vendor ALFADATA		0x079d	Alfadata Computer
 vendor NATIONALTECH	0x07a2	National Technical Systems
-vendor ONNTO		0x07a3	Onnto Corp.
-vendor BE		0x07a4	Be, Inc.
-vendor ADMTEK		0x07a6	ADMtek, Inc.
+vendor ONNTO		0x07a3	Onnto
+vendor BE		0x07a4	Be
+vendor ADMTEK		0x07a6	ADMtek
 vendor COREGA		0x07aa	Corega
 vendor FREECOM		0x07ab	Freecom
 vendor MICROTECH	0x07af	Microtech
-vendor ABOCOM		0x07b8	AboCom Systems, Inc.
-vendor KEISOKUGIKEN	0x07c1	Keisokugiken Corp.
+vendor ABOCOM		0x07b8	AboCom Systems
+vendor KEISOKUGIKEN	0x07c1	Keisokugiken
 vendor APG		0x07c5	APG Cash Drawer
-vendor BUG		0x07c8	B.U.G., Inc.
+vendor BUG		0x07c8	B.U.G.
 vendor ALLIEDTELESYN	0x07c9	Allied Telesyn International
-vendor AVERMEDIA	0x07ca	AVerMedia Technologies, Inc.
+vendor AVERMEDIA	0x07ca	AVerMedia Technologies
 vendor SIIG		0x07cc	SIIG
-vendor APTIO		0x07d2	Aptio Products, Inc.
+vendor APTIO		0x07d2	Aptio Products
 vendor ARASAN		0x07da	Arasan Chip Systems
-vendor ALLIEDCABLE	0x07e6	Allied Cable Corp.
-vendor ZOOM		0x0803	Zoom Telephonics, Inc.
-vendor BROADLOGIC	0x0827	BroadLogic, Inc.
-vendor HANDSPRING	0x082d	Handspring, Inc.
-vendor ACTIONSTAR	0x0835	Action Star Enterprise Co., Ltd.
-vendor PALM		0x0830	Palm Computing, Inc.
-vendor ACCTON		0x083a	Accton Technology Corp.
+vendor ALLIEDCABLE	0x07e6	Allied Cable
+vendor ZOOM		0x0803	Zoom Telephonics
+vendor BROADLOGIC	0x0827	BroadLogic
+vendor HANDSPRING	0x082d	Handspring
+vendor ACTIONSTAR	0x0835	Action Star Enterprise
+vendor PALM		0x0830	Palm Computing
+vendor ACCTON		0x083a	Accton Technology
 vendor DIAMOND		0x0841	Diamond
-vendor NETGEAR		0x0846	BayNETGEAR, Inc.
-vendor ACTIVEWIRE	0x0854	ActiveWire, Inc.
+vendor NETGEAR		0x0846	BayNETGEAR
+vendor ACTIVEWIRE	0x0854	ActiveWire
 vendor METRICOM		0x0870	Metricom
-vendor ADESSOKBTEK	0x087c	ADESSO/Kbtek America, Inc.
-vendor APT		0x0880	APT Technologies, Inc.
-vendor BOCARESEARCH	0x0885	Boca Research, Inc.
+vendor ADESSOKBTEK	0x087c	ADESSO/Kbtek America
+vendor APT		0x0880	APT Technologies
+vendor BOCARESEARCH	0x0885	Boca Research
 vendor ANDREA		0x08a8	Andrea Electronics
-vendor BURRBROWN	0x08bb	Burr-Brown Japan, Ltd.
+vendor BURRBROWN	0x08bb	Burr-Brown Japan
 vendor 2WIRE		0x08c8	2Wire, Inc
-vendor AIPTEK		0x08ca	AIPTEK International, Inc.
-vendor SMARTBRIDGES	0x08d1	SmartBridges Pte Ltd.
-vendor BILLIONTON	0x08dd	Billionton Systems, Inc.
-vendor EXTENDED		0x08e9	Extended Systems, Inc.
-vendor AUTHENTEC	0x08ff	AuthenTec, Inc.
-vendor ALATION		0x0910	Alation Systems, Inc.
+vendor AIPTEK		0x08ca	AIPTEK International
+vendor SMARTBRIDGES	0x08d1	SmartBridges
+vendor BILLIONTON	0x08dd	Billionton Systems
+vendor EXTENDED		0x08e9	Extended Systems
+vendor AUTHENTEC	0x08ff	AuthenTec
+vendor ALATION		0x0910	Alation Systems
 vendor BIOMETRIC	0x0929	American Biometric Company
 vendor YANO		0x094f	Yano
 vendor KINGSTON		0x0951	Kingston Technology
-vendor BLUEWATER	0x0956	BlueWater Systems, Inc.
-vendor AGILENT		0x0957	Agilent Technologies, Inc.
+vendor BLUEWATER	0x0956	BlueWater Systems
+vendor AGILENT		0x0957	Agilent Technologies
 vendor ADIRONDACK	0x0976	Adirondack Wire & Cable
-vendor BECKHOFF		0x0978	Beckhoff Gmbh
-vendor ALTIUS		0x09b3	Altius Solutions, Inc.
-vendor ARRIS		0x09c1	Arris Interactive LLC
-vendor ACTIVCARD	0x09c3	ACTIVCARD, INC.
-vendor ACTISYS		0x09c4	ACTiSYS Corp.
-vendor AFOURTECH	0x09da	A-FOUR TECH CO., LTD.
-vendor AIMEX		0x09dc	AIMEX Corp.
-vendor ADDONICS		0x09df	Addonics Technologies Corp.
-vendor AKAI		0x09e8	AKAI professional M.I. Corp.
+vendor BECKHOFF		0x0978	Beckhoff
+vendor ALTIUS		0x09b3	Altius Solutions
+vendor ARRIS		0x09c1	Arris Interactive
+vendor ACTIVCARD	0x09c3	ACTIVCARD
+vendor ACTISYS		0x09c4	ACTiSYS
+vendor AFOURTECH	0x09da	A-FOUR TECH
+vendor AIMEX		0x09dc	AIMEX
+vendor ADDONICS		0x09df	Addonics Technologies
+vendor AKAI		0x09e8	AKAI professional M.I.
 vendor ARESCOM		0x09f5	ARESCOM
 vendor BAY		0x09f9	Bay Associates
 vendor ALTERA		0x09fb	Altera
 vendor TREK		0x0a16	Trek Technology
-vendor ASAHIOPTICAL	0x0a17	Asahi Optical Co., Ltd.
-vendor BOCASYSTEMS	0x0a43	Boca Systems, Inc.
-vendor BROADCOM		0x0a5c	Broadcom Corp.
+vendor ASAHIOPTICAL	0x0a17	Asahi Optical
+vendor BOCASYSTEMS	0x0a43	Boca Systems
+vendor BROADCOM		0x0a5c	Broadcom
 vendor GEOCAST		0x0a79	Geocast Network Systems
 vendor MOTOROLA		0x1063	Motorola
 vendor PLX		0x10b5	PLX
-vendor BELKIN2		0x1293	Belkin Components (2nd)
-vendor UMAX		0x1606	UMAX Data Systems, Inc.
+vendor BELKIN2		0x1293	Belkin Components
+vendor UMAX		0x1606	UMAX Data Systems
 vendor INSIDEOUT	0x1608	Inside Out Networks
 vendor ENTREGA		0x1645	Entrega
-vendor ACTIONTEC	0x1668	Actiontec Electronics, Inc.
-vendor DLINK		0x2001	D-Link Corp
+vendor ACTIONTEC	0x1668	Actiontec Electronics
+vendor DLINK		0x2001	D-Link
 vendor INTEL		0x8086	Intel
 vendor HP2		0xf003	Hewlett Packard
 
@@ -281,11 +281,11 @@ vendor HP2		0xf003	Hewlett Packard
  */
 
 /* 3Com products */
-product 3COM HOMECONN		0x009d	HomeConnect USB Camera
-product 3COM 3C19250		0x03E8	3C19250 Ethernet adapter
+product 3COM HOMECONN		0x009d	HomeConnect Camera
+product 3COM 3C19250		0x03E8	3C19250 Ethernet
 product 3COM USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 
-product 3COM 3C460		0x11f8	HomeConnect Ethernet USB Adapter
+product 3COM 3C460		0x11f8	HomeConnect Ethernet
 
 product 3COMUSR OFFICECONN	0x0082	3Com OfficeConnect Analog Modem
 product 3COMUSR USRISDN		0x008f	3Com U.S. Robotics Pro ISDN TA
@@ -293,21 +293,21 @@ product 3COMUSR HOMECONN	0x009d	3Com HomeConnect camera
 product 3COMUSR USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 
 
-/* Acer Peripherals, Inc. products */
+/* Acer Peripherals products */
 product ACERP ACERSCAN_C310U	0x12a6	Acerscan C310U
 product ACERP ACERSCAN_320U	0x2022	Acerscan 320U
 product ACERP ACERSCAN_640U	0x2040	Acerscan 640U
 product ACERP ACERSCAN_620U	0x2060	Acerscan 620U
 
-/* ActiveWire, Inc. products */
+/* ActiveWire products */
 product ACTIVEWIRE IOBOARD	0x0100	I/O Board
-product ACTIVEWIRE IOBOARD_FW1	0x0101	I/O Board, rev. 1 firmware
+product ACTIVEWIRE IOBOARD_FW1	0x0101	I/O Board, rev. 1
 
 /* ADMtek products */
-product ADMTEK PEGASUS		0x0986	AN986 USB Ethernet adapter
+product ADMTEK PEGASUS		0x0986	AN986 Ethernet
 
 /* ADS products */
-product ADS UBS10BT		0x0008	UBS-10BT Ethernet adapter
+product ADS UBS10BT		0x0008	UBS-10BT Ethernet
 
 /* Agiler products */
 product ELECOM MOUSE29UO	0x0002	mouse 29UO
@@ -320,7 +320,7 @@ product AGFA SNAPSCAN1212U2	0x2061	SnapScan 1212U
 /* AKS products */
 product AKS USBHASP		0x0001	USB-HASP 0.06
 
-/* Alcor Micro, Inc. products */
+/* Alcor Micro products */
 product ALCOR2 KBD_HUB		0x2802	Kbd Hub
 
 product ALCOR MA_KBD_HUB	0x9213	MacAlly Kbd Hub
@@ -339,8 +339,8 @@ product APC UPSPRO500		0x0002	Back-UPS Pro 500
 product ANCHOR EZUSB		0x2131	EZUSB
 product ANCHOR EZLINK		0x2720	EZLINK
 
-/* AOX, Inc. products */
-product AOX USB101		0x0008	USB ethernet controller engine
+/* AOX products */
+product AOX USB101		0x0008	USB Ethernet controller engine
 
 /* Apple Computer products */
 product APPLE OPTMOUSE		0x0302	Optical mouse
@@ -348,18 +348,18 @@ product APPLE SPEAKERS		0x1101	Speakers
 
 /* ATen products */
 product ATEN UC1284		0x2001	Parallel printer adapter
-product ATEN UC10T		0x2002	10Mbps ethernet adapter
+product ATEN UC10T		0x2002	10Mbps Ethernet
 product ATEN UC232A		0x2008	Serial adapter
 
 /* Avision products */
 product AVISION 1200U		0x0268	1200U scanner
 
 /* Belkin products */
-/*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
+/*product BELKIN F5U111		0x????	F5U111 Ethernet */
 product BELKIN2 F5U002		0x0002	F5U002 Parallel printer adapter
 
 /* Billionton products */
-product BILLIONTON USB100	0x0986	USB100N 10/100 FastEthernet Adapter
+product BILLIONTON USB100	0x0986	USB100N 10/100 Ethernet
 
 /* Brother Industries products */
 product BROTHER HL1050		0x0002	HL-1050 laser printer
@@ -367,12 +367,12 @@ product BROTHER HL1050		0x0002	HL-1050 laser printer
 /* Behavior Technology Computer products */
 product BTC BTC7932		0x6782	Keyboard with mouse port
 
-/* Canon, Inc. products */
+/* Canon products */
 product CANON S10		0x3041	PowerShot S10
 
 /* CATC products */
-product CATC NETMATE		0x000a	Netmate ethernet adapter
-product CATC NETMATE2		0x000c	Netmate2 ethernet adapter
+product CATC NETMATE		0x000a	Netmate Ethernet
+product CATC NETMATE2		0x000c	Netmate2 Ethernet
 product CATC CHIEF		0x000d	USB Chief Bus & Protocol Analyzer
 product CATC ANDROMEDA		0x1237	Andromeda hub
 
@@ -382,7 +382,7 @@ product CHERRY MY3000HUB	0x0003	My3000 hub
 
 /* Chic Technology products */
 product CHIC MOUSE1		0x0001	mouse
-product CHIC CYPRESS		0x0003	Cypress USB Mouse
+product CHIC CYPRESS		0x0003	Cypress Mouse
 
 /* Chicony products */
 product CHICONY KB8933		0x0001	KB-8933 keyboard
@@ -411,10 +411,10 @@ product CYPRESS FMRADIO		0x1002	FM Radio
 
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
-product DLINK DSB650C		0x4000	10Mbps ethernet adapter
-product DLINK DSB650TX		0x4002	10/100 ethernet adapter
-product DLINK DSB650TX_PNA	0x4003	1/10/100 ethernet adapter
-product DLINK DSB650		0xABC1	10/100 ethernet adapter
+product DLINK DSB650C		0x4000	10Mbps Ethernet
+product DLINK DSB650TX		0x4002	10/100 Ethernet
+product DLINK DSB650TX_PNA	0x4003	1/10/100 Ethernet
+product DLINK DSB650		0xABC1	10/100 Ethernet
 
 /* Dallas Semiconductor products */
 product DALLAS J6502		0x4201	J-6502 speakers
@@ -423,9 +423,9 @@ product DALLAS J6502		0x4201	J-6502 speakers
 product DIAMOND RIO500USB	0x0001	Rio 500 USB
 
 /* Digi International products */
-product DIGI ACCELEPORT2	0x0002	AccelePort USB 2
-product DIGI ACCELEPORT4	0x0004	AccelePort USB 4
-product DIGI ACCELEPORT8	0x0008	AccelePort USB 8
+product DIGI ACCELEPORT2	0x0002	AccelePort 2
+product DIGI ACCELEPORT4	0x0004	AccelePort 4
+product DIGI ACCELEPORT8	0x0008	AccelePort 8
 
 /* EIZO products */
 product EIZO HUB		0x0000	hub
@@ -439,7 +439,7 @@ product ENTREGA 1S		0x0001	1S serial connector
 product ENTREGA 2S		0x0002	2S serial connector
 product ENTREGA 1S25		0x0003	1S25 serial connector
 product ENTREGA 4S		0x0004	4S serial connector
-product ENTREGA E45		0x0005	E45 Ethernet adapter
+product ENTREGA E45		0x0005	E45 Ethernet
 product ENTREGA CENTRONICS	0x0006	Centronics connector
 product ENTREGA 1S9		0x0093	1S9 serial connector
 product ENTREGA EZUSB		0x8000	EZ-USB
@@ -449,8 +449,8 @@ product ENTREGA 2U4S		0x8004  2U4S serial connector/usb hub
 
 /* Epson products */
 product EPSON PRINTER1		0x0001	USB Printer
-product EPSON PRINTER2		0x0002	ISD USB Smart Cable for Mac
-product EPSON PRINTER3		0x0003	ISD USB Smart Cable
+product EPSON PRINTER2		0x0002	ISD Smart Cable for Mac
+product EPSON PRINTER3		0x0003	ISD Smart Cable
 product EPSON 636		0x0101	Perfection 636U / 636Photo scanner
 product EPSON 610		0x0103	Perfection 610 scanner
 product EPSON 1200		0x0104	Perfection 1200U / 1200Photo scanner
@@ -477,7 +477,7 @@ product FTDI SERIAL		0x8372	Serial converter
 /* Fuji photo products */
 product FUJIPHOTO MASS0100	0x0100	Mass Storage
 
-/* Handspring, Inc. */
+/* Handspring */
 product HANDSPRING VISOR	0x0100	Handspring Visor
 
 /* HP products */
@@ -521,7 +521,7 @@ product IOMEGA ZIP100		0x0001	Zip 100
 product IOMEGA ZIP250		0x0030	Zip 250
 
 /* Kawasaki products */
-product KLSI DUH3E10BT		0x0008	USB ethernet controller engine
+product KLSI DUH3E10BT		0x0008	USB Ethernet controller engine
 
 /* Kawatsu products */
 product KAWATSU MH4000P		0x0003	MiniHub 4000P
@@ -530,14 +530,14 @@ product KAWATSU MH4000P		0x0003	MiniHub 4000P
 product KEISOKUGIKEN USBDAQ	0x0068	HKS-0200 USBDAQ
 
 /* Kawasaki LSI products (?) */
-product KLSI DUH3E10BT		0x0008	10BT Ethernet adapter, in the DU-H3E
+product KLSI DUH3E10BT		0x0008	10BT Ethernet
 
 /* Kensington products */
 product KENSINGTON ORBIT	0x1003	Orbit USB/PS2 trackball
 product KENSINGTON TURBOBALL	0x1005	TurboBall
 
 /* Kingston products */
-product KINGSTON KNU101TX	0x000a	KNU101TX USB Ethernet
+product KINGSTON KNU101TX	0x000a	KNU101TX Ethernet
 
 /* Kodak products */
 product KODAK DC220		0x0100	Digital Science DC220
@@ -582,7 +582,7 @@ product LOGITECH MBA47		0xc002	M-BA47 mouse
 product LOGITECH WMMOUSE	0xc004	WingMan Gaming Mouse
 product LOGITECH BB13		0xc401	USB-PS/2 Trackball
 product LOGITECH WMPAD		0xc208	WingMan GamePad Extreme
-product LOGITECH WMJOY		0xc281	WingMan Force joystick 
+product LOGITECH WMJOY		0xc281	WingMan Force joystick
 product LOGITECH QUICKCAMPRO2	0xd001	QuickCam Pro
 
 /* Lucent products */
@@ -631,7 +631,7 @@ product MULTITECH ATLAS		0xf101	MT5634ZBA-USB modem
 /* Mustek products */
 product MUSTEK 1200CU		0x0001	1200 CU scanner
 product MUSTEK 600CU		0x0002	600 CU scanner
-product MUSTEK 1200USB		0x0003	1200 USB scanner
+product MUSTEK 1200USB		0x0003	1200 scanner
 product MUSTEK 1200UB		0x0006	1200 UB scanner
 product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
@@ -646,20 +646,20 @@ product NEC HUB_B		0x55ab	hub
 product NETCHIP TURBOCONNECT	0x1080	Turbo-Connect
 
 /* Netgear products */
-product NETGEAR EA101		0x1001	Ethernet adapter
+product NETGEAR EA101		0x1001	Ethernet
 
-/* OmniVision Technologies, Inc. products */
+/* OmniVision Technologies products */
 product OMNIVISION OV511	0x0511	OV511 Camera
 product OMNIVISION OV511PLUS	0xa511	OV511+ Camera
 
-/* Palm Computing, Inc. */
+/* Palm Computing */
 product PALM SERIAL		0x0080	USB Serial Adaptor
 
 /* Peracom products */
 product PERACOM SERIAL1		0x0001	Serial Converter
-product PERACOM ENET		0x0002	Ethernet adapter
-product PERACOM ENET3		0x0003	At Home Ethernet Adapter
-product PERACOM ENET2		0x0005	Ethernet adapter
+product PERACOM ENET		0x0002	Ethernet
+product PERACOM ENET3		0x0003	At-Home Ethernet
+product PERACOM ENET2		0x0005	Ethernet
 
 /* Philips products */
 product PHILIPS DSS350		0x0101	DSS 350 Digital Speaker System
@@ -669,7 +669,7 @@ product PHILIPS PCVC680K	0x0308	PCVC680K Vesta Pro PC Camera
 product PHILIPS DSS150		0x0471	DSS 150 Digital Speaker System
 
 /* P.I. Engineering products */
-product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
+product PIENGINEERING PS2USB	0x020b	PS2 to Mac Adapter
 
 /* PLX products */
 product PLX TESTBOARD		0x9060	test board
@@ -679,9 +679,9 @@ product PRIMAX G2X300		0x0300	G2-200 scanner
 product PRIMAX G2E300		0x0301	G2E-300 scanner
 product PRIMAX G2300		0x0302	G2-300 scanner
 product PRIMAX G2E3002		0x0303	G2E-300 scanner
-product PRIMAX 9600		0x0340	Colorado USB 9600 scanner
+product PRIMAX 9600		0x0340	Colorado 9600 scanner
 product PRIMAX 600U		0x0341	Colorado 600u scanner
-product PRIMAX 19200		0x0360	Colorado USB 19200 scanner
+product PRIMAX 19200		0x0360	Colorado 19200 scanner
 product PRIMAX 1200U		0x0361	Colorado 1200u scanner
 product PRIMAX G600		0x0380	G2-600 scanner
 product PRIMAX 636I		0x0381	ReadyScan 636i
@@ -703,7 +703,7 @@ product QTRONIX 980N		0x2011	Scorpion-980N keyboard
 product QUICKSHOT STRIKEPAD	0x6238	USB StrikePad
 
 /* Rainbow Technologies products */
-product	RAINBOW IKEY2000	0x1200	i-Key 2000  
+product	RAINBOW IKEY2000	0x1200	i-Key 2000
 
 /* Rockfire products */
 product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
@@ -721,21 +721,21 @@ product SIIG DIGIFILMREADER	0x0004	DigiFilm-Combo Reader
 product SIRIUS ROADSTER		0x0001	NetComm Roadster II 56 USB
 
 /* SmartBridges products */
-product SMARTBRIDGES SMARTLINK	0x0001	SmartLink USB ethernet adapter
+product SMARTBRIDGES SMARTLINK	0x0001	SmartLink Ethernet
 
 /* SMC products */
-product SMC 2102USB		0x0100	10Mbps ethernet adapter
-product SMC 2202USB		0x0200	10/100 ethernet adapter
+product SMC 2102USB		0x0100	10Mbps Ethernet
+product SMC 2202USB		0x0200	10/100 Ethernet
 
 /* SOLID YEAR products */
-product SOLIDYEAR KEYBOARD	0x2101	Solid Year USB keyboard
+product SOLIDYEAR KEYBOARD	0x2101	Solid Year keyboard
 
 /* SONY products */
-product SONY DSC		0x0010	Sony DSC cameras
-product SONY MSC		0x0032	Sony MSC memory stick slot
+product SONY DSC		0x0010	Sony DSC Cameras
+product SONY MSC		0x0032	Sony MSC Memorystick slot
 
 /* STMicroelectronics products */
-product STMICRO COMMUNICATOR	0x7554	USB Communicator
+product STMICRO COMMUNICATOR	0x7554	Communicator
 
 /* Sun Microsystems products */
 product SUN KEYBOARD		0x0005	Type 6 USB
@@ -744,16 +744,16 @@ product SUN KEYBOARD		0x0005	Type 6 USB
 /* Supra products */
 product DIAMOND2 SUPRAEXPRESS56K 0x07da	Supra Express 56K modem
 product DIAMOND2 SUPRA2890	0x0b4a	SupraMax 2890 56K Modem
-product DIAMOND2 RIO600USB	0x5001	Rio 600 USB
- 
+product DIAMOND2 RIO600USB	0x5001	Rio 600
+
 /* TEAC products */
-product TEAC FD05PUB		0x0000	FD-05PUB floppy
+product TEAC FD05PUB		0x0000	FD-05PUB Floppy
 
 /* Telex Communications products */
-product TELEX MIC1		0x0001	Enhanced USB Microphone
+product TELEX MIC1		0x0001	Microphone
 
 /* Texas Intel products */
-product TI UTUSB41		0x1446	UT-USB41 hub
+product TI UTUSB41		0x1446	UT-USB41
 
 /* Thrustmaster products */
 product THRUST FUSION_PAD	0xa0a3	Fusion Digital Gamepad
@@ -769,7 +769,7 @@ product UMAX ASTRA2100U		0x0130	Astra 2100U Scanner
 product UMAX ASTRA2200U		0x0230	Astra 2200U Scanner
 
 /* Universal Access products */
-product UNIACCESS PANACHE	0x0101	Panache Surf USB ISDN Adapter
+product UNIACCESS PANACHE	0x0101	Panache Surf ISDN Adapter
 
 /* Vision products */
 product VISION VC6452V002	0x0002	CPiA Camera
@@ -781,19 +781,19 @@ product VISIONEER 6100		0x0231	OneTouch 6100
 product VISIONEER 6200		0x0311	OneTouch 6200
 product VISIONEER 8100		0x0321	OneTouch 8100
 product VISIONEER 8600		0x0331	OneTouch 8600
-								       
+
 /* Wacom products */
 product WACOM CT0405U		0x0000	CT-0405-U Tablet
 product WACOM GRAPHIRE		0x0010	Graphire
 product WACOM INTUOSA5		0x0021	Intuos A5
- 
+
 /* Y-E Data products */
 product YEDATA FLASHBUSTERU	0x0000	Flashbuster-U
 
 /* Yano products */
 product YANO U640MO		0x0101	U640MO-03
 
-/* Zoom Telephonics, Inc. products */
+/* Zoom Telephonics products */
 product ZOOM 2986L		0x9700	2986L Fax modem
 
 /* ZyXEL Communication Co. products */