Add a bunch of USB definitions from NetBSD.

This is part of an ongoing cycle of commits on all the BSDs to
merge the USB vendor and device defintions..

A merge from OpenBSD is still pending.

Submitted by:	barry bouwsma (freebsd-misuser@NOSPAM.dyndns.dk)
Obtained from:	NetBSD
MFC after: 1 week

1 files changed, 625 insertions, 87 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 6ef20f9..48884c0 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -60,6 +60,7 @@ $FreeBSD$
  * make the device recognised by the appropriate device driver.
  */
 
+vendor EGALAX2		0x0123  eGalax, Inc.
 vendor LTS		0x0386	LTS
 vendor AOX		0x03e8	AOX
 vendor THESYS		0x03e9	Thesys Microelectronics
@@ -97,13 +98,13 @@ vendor MCCI		0x040e	MCCI
 vendor MELCO		0x0411	Melco
 vendor WINBOND		0x0416	Winbond Electronics
 vendor PHOENIX		0x041a	Phoenix Technologies Ltd.
-vendor CREATIVE		0x041e	Creative
+vendor CREATIVE		0x041e	Creative Labs
 vendor NOKIA		0x0421	Nokia Corporation
 vendor ADI		0x0422	ADI Systems
 vendor CATC		0x0423	Computer Access Technology
 vendor SMC2		0x0424	Standard Microsystems
 vendor MOTOROLA_HK	0x0425	Motorola Semiconductors HK, Ltd.
-vendor GRAVIS		0x0428	Advanced Gravis Computer Tech.
+vendor GRAVIS		0x0428	Advanced Gravis Computer
 vendor CIRRUSLOGIC	0x0429	Cirrus Logic
 vendor INNOVATIVE	0x042c	Innovative Semiconductors
 vendor MOLEX		0x042f	Molex
@@ -140,31 +141,32 @@ vendor CONNECTIX	0x0478	Connectix
 vendor SEMTECH		0x047a	Semtech Corporation
 vendor KENSINGTON	0x047d	Kensington
 vendor LUCENT		0x047e	Lucent
-vendor KYOCERA		0x0482	Kyocera Corp.
+vendor PLANTRONICS	0x047f	Plantronics
+vendor KYOCERA		0x0482	Kyocera
 vendor STMICRO		0x0483	STMicroelectronics
 vendor FOXCONN		0x0489	Foxconn / Hon Hai
 vendor YAMAHA		0x0499	YAMAHA
-vendor COMPAQ		0x049f	Compaq Computers
-vendor HITACHI		0x04a4	Hitachi, Ltd.
+vendor COMPAQ		0x049f	Compaq
+vendor HITACHI		0x04a4	Hitachi
 vendor ACERP		0x04a5	Acer Peripherals
 vendor VISIONEER	0x04a7	Visioneer
 vendor CANON		0x04a9	Canon
 vendor NIKON		0x04b0	Nikon
 vendor PAN		0x04b1	Pan International
-vendor IBM		0x04b3	IBM Corporation
+vendor IBM		0x04b3	IBM
 vendor CYPRESS		0x04b4	Cypress Semiconductor
 vendor ROHM		0x04b5	ROHM LSI Systems USA
 vendor COMPAL		0x04b7	Compal Electronics
 vendor EPSON		0x04b8	Seiko Epson
 vendor RAINBOW		0x04b9	Rainbow Technologies
-vendor IODATA		0x04bb	I/O Data
+vendor IODATA		0x04bb	I-O Data
 vendor TDK		0x04bf	TDK
 vendor 3COMUSR		0x04c1	U.S. Robotics
 vendor METHODE		0x04c2	Methode Electronics Far East
 vendor MAXISWITCH	0x04c3	Maxi Switch
 vendor LOCKHEEDMER	0x04c4	Lockheed Martin Energy Research
 vendor FUJITSU		0x04c5	Fujitsu
-vendor TOSHIBAAM	0x04c6	Toshiba America Electronic Components
+vendor TOSHIBAAM	0x04c6	Toshiba America
 vendor MICROMACRO	0x04c7	Micro Macro Technologies
 vendor KONICA		0x04c8	Konica
 vendor LITEON		0x04ca	Lite-On Technology
@@ -173,9 +175,9 @@ vendor PHILIPSSEMI	0x04cc	Philips Semiconductors
 vendor TATUNG		0x04cd	Tatung Co. Of America
 vendor SCANLOGIC	0x04ce	ScanLogic
 vendor MYSON		0x04cf	Myson Technology
-vendor DIGI2		0x04d0	Digi International
+vendor DIGI2		0x04d0	Digi
 vendor ITTCANON		0x04d1	ITT Canon
-vendor ALTEC		0x04d2	Altec Lansing Technologies
+vendor ALTEC		0x04d2	Altec Lansing
 vendor LSI		0x04d4	LSI Logic
 vendor MENTORGRAPHICS	0x04d6	Mentor Graphics
 vendor HOLTEK		0x04d9	Holtek Semiconductor
@@ -206,6 +208,7 @@ vendor BELKIN		0x050d	Belkin Components
 vendor KAWATSU		0x050f	Kawatsu Semiconductor
 vendor FCI		0x0514	FCI Electronics
 vendor LONGWELL		0x0516	Longwell Electronics
+vendor COMPOSITE	0x0518	Composite
 vendor STAR		0x0519	Star Micronics
 vendor APC		0x051d	American Power Conversion
 vendor SCIATLANTA	0x051e	Scientific Atlanta
@@ -224,11 +227,11 @@ vendor PREHWERKE	0x053a	Preh Werke Gmbh & Co. KG
 vendor SYNOPSYS		0x053f	Synopsys
 vendor UNIACCESS	0x0540	Universal Access
 vendor VIEWSONIC	0x0543	ViewSonic
-vendor XIRLINK		0x0545	Xirlink / Veo
+vendor XIRLINK		0x0545	Xirlink
 vendor ANCHOR		0x0547	Anchor Chips
 vendor SONY		0x054c	Sony
 vendor FUJIXEROX	0x0550	Fuji Xerox
-vendor VISION		0x0553	VLSI Vision / STMicroelectronics Imaging
+vendor VISION		0x0553	VLSI Vision
 vendor ASAHIKASEI	0x0556	Asahi Kasei Microsystems
 vendor ATEN		0x0557	ATEN International
 vendor MUSTEK		0x055f	Mustek Systems
@@ -245,11 +248,11 @@ vendor CONEXANT		0x0572	Conexant Systems
 vendor HAUPPAUGE	0x0573	Hauppauge Computer Works
 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 ROLAND		0x0582	Roland
 vendor ROCKFIRE		0x0583	Rockfire
-vendor RATOC		0x0584	RATOC Systems, Inc.
+vendor RATOC		0x0584	RATOC Systems
 vendor ZYXEL		0x0586	ZyXEL Communication
 vendor INFINEON		0x058b	Infineon Technologies
 vendor MICREL		0x058d	Micrel Semiconductor
@@ -264,7 +267,7 @@ vendor FUJIFILM		0x05a2	Fuji Film Microdevices
 vendor ARC		0x05a3	ARC International
 vendor ORTEK		0x05a4	Ortek Technology
 vendor BOSE		0x05a7	Bose
-vendor OMNIVISION	0x05a9	OmniVision Technologies
+vendor OMNIVISION	0x05a9	OmniVision
 vendor INSYSTEM		0x05ab	In-System Design
 vendor APPLE		0x05ac	Apple Computer
 vendor YCCABLE		0x05ad	Y.C. Cable U.S.A
@@ -306,8 +309,11 @@ vendor MACALLY		0x0618	Macally
 vendor ACTLABS		0x061c	Act Labs
 vendor ALARIS		0x0620	Alaris
 vendor APEX		0x0624	Apex
+vendor VIVITAR		0x0636	Vivitar
 vendor AVISION		0x0638	Avision
 vendor TEAC		0x0644	TEAC
+vendor SGI		0x065e	Silicon Graphics
+vendor SANWASUPPLY	0x0663	Sanwa Supply
 vendor LINKSYS		0x066b	Linksys
 vendor ACERSA		0x066e	Acer Semiconductor America
 vendor SIGMATEL		0x066f	Sigmatel
@@ -318,6 +324,7 @@ vendor SIEMENS		0x067c	Siemens
 vendor ADVANCELOGIC	0x0680	Avance Logic
 vendor HAGIWARA		0x0693	Hagiwara Sys-Com
 vendor MINOLTA		0x0686	Minolta
+vendor CHPRODUCTS	0x068e	CH Products
 vendor CTX		0x0698	Chuntex
 vendor ASKEY		0x069a	Askey Computer
 vendor SAITEK		0x06a3	Saitek
@@ -331,21 +338,26 @@ vendor MULTITECH	0x06e0	MultiTech
 vendor ADS		0x06e1	ADS Technologies
 vendor ALCATELM		0x06e4	Alcatel Microelectronics
 vendor SIRIUS		0x06ea	Sirius Technologies
+vendor GUILLEMOT	0x06f8	Guillemot
 vendor BOSTON		0x06fd	Boston Acoustics
 vendor SMC		0x0707	Standard Microsystems
 vendor PUTERCOM		0x0708	Putercom
 vendor MCT		0x0711	MCT
+vendor IMATION		0x0718	Imation
 vendor SONYERICSSON	0x0731	Sony Ericsson
+vendor EICON		0x0734	Eicon Networks
 vendor DIGITALSTREAM	0x074e	Digital Stream
 vendor AUREAL		0x0755	Aureal Semiconductor
 vendor MIDIMAN		0x0763	Midiman
 vendor LINKSYS2		0x077b	Linksys
 vendor GRIFFIN		0x077d	Griffin Technology
-vendor SANDISK		0x0781	SanDisk Corp
+vendor SANDISK		0x0781	SanDisk
+vendor JENOPTIK		0x0784  Jenoptik
 vendor LOGITEC		0x0789	Logitec Corp
 vendor BRIMAX		0x078e	Brimax
 vendor AXIS		0x0792	Axis Communications
 vendor ABL		0x0794	ABL Electronics
+vendor SUNCOMM		0x079c	Sun Communications, Inc.
 vendor ALFADATA		0x079d	Alfadata Computer
 vendor NATIONALTECH	0x07a2	National Technical Systems
 vendor ONNTO		0x07a3	Onnto
@@ -358,7 +370,7 @@ vendor GENERALINSTMNTS	0x07b2	General Instruments (Motorola)
 vendor OLYMPUS		0x07b4	Olympus
 vendor ABOCOM		0x07b8	AboCom Systems
 vendor KEISOKUGIKEN	0x07c1	Keisokugiken
-vendor ONSPEC		0x07c4	OnSpec Electronic
+vendor ONSPEC		0x07c4	OnSpec
 vendor APG		0x07c5	APG Cash Drawer
 vendor BUG		0x07c8	B.U.G.
 vendor ALLIEDTELESYN	0x07c9	Allied Telesyn International
@@ -372,9 +384,9 @@ vendor STSN		0x07ef	STSN
 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 SOURCENEXT	0x0833	SOURCENEXT
+vendor ACTIONSTAR	0x0835	Action Star Enterprise
 vendor SAMSUNG_TECHWIN	0x0839	Samsung Techwin
 vendor ACCTON		0x083a	Accton Technology
 vendor DIAMOND		0x0841	Diamond
@@ -382,7 +394,8 @@ vendor NETGEAR		0x0846	BayNETGEAR
 vendor ACTIVEWIRE	0x0854	ActiveWire
 vendor BBELECTRONICS	0x0856	B&B Electronics
 vendor PORTGEAR		0x085a	PortGear
-vendor SYSTEMTALKS	0x086e	System TALKS, Inc.
+vendor NETGEAR2		0x0864	Netgear
+vendor SYSTEMTALKS	0x086e	System Talks
 vendor METRICOM		0x0870	Metricom
 vendor ADESSOKBTEK	0x087c	ADESSO/Kbtek America
 vendor JATON		0x087d	Jaton
@@ -397,20 +410,25 @@ vendor BILLIONTON	0x08dd	Billionton Systems
 vendor EXTENDED		0x08e9	Extended Systems
 vendor MSYSTEMS		0x08ec	M-Systems
 vendor AUTHENTEC	0x08ff	AuthenTec
+vendor AUDIOTECHNICA	0x0909	Audio-Technica
 vendor TRUMPION		0x090a	Trumpion Microelectronics
 vendor ALATION		0x0910	Alation Systems
+vendor CONCORDCAMERA	0x0919	Concord Camera
 vendor GOHUBS		0x0921	GoHubs
 vendor BIOMETRIC	0x0929	American Biometric Company
-vendor TOSHIBA		0x0930	Toshiba Corporation
-vendor PLEXTOR		0x093b	Plextor Corp.
-vendor INTREPIDCS	0x093c	Intrepid Control Systems
+vendor TOSHIBA		0x0930	Toshiba
+vendor PLEXTOR		0x093b	Plextor
+vendor INTREPIDCS	0x093c	Intrepid
 vendor YANO		0x094f	Yano
 vendor KINGSTON		0x0951	Kingston Technology
 vendor BLUEWATER	0x0956	BlueWater Systems
 vendor AGILENT		0x0957	Agilent Technologies
 vendor PORTSMITH	0x095a	Portsmith
+vendor ACERW		0x0967	Acer
 vendor ADIRONDACK	0x0976	Adirondack Wire & Cable
 vendor BECKHOFF		0x0978	Beckhoff
+vendor MINDSATWORK	0x097a	Minds At Work
+vendor POINTCHIPS	0x09a6	PointChips
 vendor INTERSIL		0x09aa	Intersil
 vendor ALTIUS		0x09b3	Altius Solutions
 vendor ARRIS		0x09c1	Arris Interactive
@@ -423,10 +441,11 @@ vendor AKAI		0x09e8	AKAI professional M.I.
 vendor ARESCOM		0x09f5	ARESCOM
 vendor BAY		0x09f9	Bay Associates
 vendor ALTERA		0x09fb	Altera
-vendor CSR		0x0a12	Cambridge Silicon Radio Ltd.
+vendor CSR		0x0a12	Cambridge Silicon Radio
 vendor TREK		0x0a16	Trek Technology
 vendor ASAHIOPTICAL	0x0a17	Asahi Optical
 vendor BOCASYSTEMS	0x0a43	Boca Systems
+vendor MEDIAGEAR	0x0a48	MediaGear
 vendor BROADCOM		0x0a5c	Broadcom
 vendor GREENHOUSE	0x0a6b	GREENHOUSE
 vendor GEOCAST		0x0a79	Geocast Network Systems
@@ -434,33 +453,52 @@ vendor NEODIO		0x0aec	Neodio
 vendor VODAFONE		0x0af0	Vodafone
 vendor TODOS		0x0b0c	Todos Data System
 vendor SIIG2		0x0b39	SIIG
+vendor TEKRAM		0x0b3b	Tekram Technology
 vendor HAL		0x0b41	HAL Corporation
-vendor EMS		0x0b43	EMS Production Ltd.
+vendor EMS		0x0b43	EMS Production
 vendor NEC2		0x0b62	NEC
 vendor ATI2		0x0b6f	ATI
+vendor ZEEVO		0x0b7a	Zeevo, Inc.
+vendor KURUSUGAWA	0x0b7e	Kurusugawa Electronics, Inc.
 vendor ASIX		0x0b95	ASIX Electronics
-vendor REALTEK		0x0bda	RealTek
+vendor USR		0x0baf	U.S. Robotics
+vendor REALTEK		0x0bda	Realtek
+vendor ADDONICS2	0x0bf6	Addonics Technology
 vendor AGATE		0x0c08	Agate Technologies
 vendor DMI		0x0c0b	DMI
-vendor LUWEN		0x0c76	Luwen
+vendor CHICONY2		0x0c45	Chicony Electronics
+vendor SEALEVEL		0x0c52	Sealevel System
+vendor LUWEN		0x0c76	EasyDisk
+vendor ZCOM		0x0cde	Z-Com
+vendor TANGTOP		0x0d3d	Tangtop
 vendor SMC3		0x0d5c	Standard Microsystems
 vendor PNY		0x0d7d	PNY
-vendor MSI		0x0db0	Micro Star International
-vendor HAWKING		0x0e66	Hawking Technologies
+vendor ACDC		0x0d7e  American Computer & Digital Components
+vendor ABC		0x0d8c	ABC
+vendor MSI		0x0db0	Micro Star
+vendor HAWKING		0x0e66	Hawking
+vendor OTI		0x0ea0	Ours Technology
+vendor PILOTECH		0x0eaf  Pilotech
+vendor EGALAX		0x0eef  eGalax
 vendor MICROTUNE	0x0f4d	Microtune, Inc.
 vendor QUALCOMM2	0x1004	Qualcomm
 vendor WESTERN		0x1058	Western Digital
 vendor MOTOROLA		0x1063	Motorola
+vendor CCYU		0x1065	CCYU Technology
 vendor PLX		0x10b5	PLX
 vendor ASANTE		0x10bd	Asante
 vendor JRC		0x1145	Japan Radio Company
 vendor DELORME		0x1163	DeLorme Publishing
-vendor ACERCM		0x1189	Acer Communications & Multimedia Inc.
+vendor SERVERWORKS	0x1166	ServerWorks
+vendor ACERCM		0x1189	Acer Communications & Multimedia
+vendor TSUNAMI		0x1241	Tsunami
 vendor TWINMOS		0x126f	TwinMOS
+vendor CREATIVE2	0x1292	Creative Labs
 vendor BELKIN2		0x1293	Belkin Components
-vendor AINCOMM		0x12fd	Ain Communication Technology
+vendor AINCOMM		0x12fd	Aincomm
 vendor MOBILITY		0x1342	Mobility
 vendor SHARK		0x13d2	Shark
+vendor SILICOM		0x1485	Silicom
 vendor SILICONPORTALS	0x1527	Silicon Portals
 vendor SOHOWARE		0x15e8	SOHOware
 vendor UMAX		0x1606	UMAX Data Systems
@@ -469,9 +507,23 @@ vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics
 vendor LINKSYS3		0x1915	Linksys
 vendor DLINK		0x2001	D-Link
+vendor ERICSSON		0x2282	Ericsson
+vendor MOTOROLA2	0x22b8	Motorola
+vendor TRIPPLITE	0x2478	Tripp-Lite
+vendor HIROSE		0x2631	Hirose Electric
+vendor NHJ		0x2770  NHJ
+vendor PLANEX		0x2c02	Planex Communications
 vendor VIDZMEDIA	0x3275	VidzMedia Pte Ltd
+vendor AEI		0x3334	AEI
+vendor PQI		0x3538	PQI
 vendor DAISY		0x3579	Daisy Technology
+vendor NI		0x3923	National Instruments
+vendor MICRONET		0x3980	Micronet Communications
+vendor IODATA2		0x40bb	I-O Data
+vendor IRIVER		0x4102	iRiver
 vendor DELL		0x413c	Dell
+vendor AVERATEC		0x50c2	Averatec
+vendor ONSPEC2		0x55aa	OnSpec Electronic Inc.
 vendor SITECOM		0x6189	Sitecom
 vendor INTEL		0x8086	Intel
 vendor HP2		0xf003	Hewlett Packard
@@ -482,8 +534,8 @@ vendor HP2		0xf003	Hewlett Packard
 
 /* 3Com products */
 product 3COM HOMECONN		0x009d	HomeConnect USB Camera
-product 3COM 3CREB96		0x00a0	Bluetooth USB dongle
-product 3COM 3C19250		0x03E8	3C19250 Ethernet adapter
+product 3COM 3CREB96		0x00a0	Bluetooth USB Adapter
+product 3COM 3C19250		0x03e8	3C19250 Ethernet adapter
 product 3COM 3CRSHEW696		0x0a01	3CRSHEW696 Wireless adapter
 product 3COM USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 product 3COM 3C460		0x11f8	HomeConnect 3C460
@@ -494,6 +546,11 @@ product 3COMUSR USRISDN		0x008f	3Com U.S. Robotics Pro ISDN TA
 product 3COMUSR HOMECONN	0x009d	3Com HomeConnect camera
 product 3COMUSR USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 
+/* ACDC products */
+product ACDC HUB		0x2315	USB Pen Drive HUB
+product ACDC PEN		0x2317	USB Pen Drive with Secure Write
+product ACDC SECWRITE		0x2316	USB Pen Drive Secure Write
+
 /* AboCom products */
 product ABOCOM XX1		0x110c	XX1
 product ABOCOM XX2		0x200c	XX2
@@ -504,12 +561,15 @@ product ABOCOM XX4		0x4004	XX4
 product ABOCOM XX5		0x4007	XX5
 product ABOCOM XX6		0x400b	XX6
 product ABOCOM XX7		0x400c	XX7
+product ABOCOM LCS8138TX	0x401a	LCS-8138TX
 product ABOCOM XX8		0x4102	XX8
 product ABOCOM XX9		0x4104	XX9
+product ABOCOM UFE2000		0x420a	UFE2000 USB2.0 Fast Ethernet Adapter
 product ABOCOM XX10		0xabc1	XX10
 
 /* Accton products */
 product ACCTON USB320_EC	0x1046	USB320-EC Ethernet Adapter
+product ACCTON 111		0x3503	T-Sinus 111 WLAN
 product ACCTON SS1001		0x5046	SpeedStream Ethernet Adapter
 
 /* Acer Peripherals, Inc. products */
@@ -517,23 +577,46 @@ 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
-product ACERP AWL300		0x9000	AWL300 Wireless adapter
-product ACERP AWL400		0x9001	AWL400 Wireless adapter
+product ACERP ATAPI		0x6003	ATA/ATAPI adapter
+product ACERP AWL300		0x9000	AWL300
+product ACERP AWL400		0x9001	AWL400
+
+/* Acer Products */
+product ACERW WARPLINK		0x0204	Warplink
+
+/* Actiontec products */
+product ACTIONTEC PRISM_25	0x0408	Prism2.5 WLAN
+product ACTIONTEC PRISM_25A	0x0421	Prism2.5 WLAN A
+product ACTIONTEC FREELAN	0x6106	ROPEX FreeLan 802.11b
+product ACTIONTEC UAT1		0x7605	UAT1 Wireless Ethernet adapter
+
+/* ACTiSYS products */
+product ACTISYS IR2000U		0x0011	ACT-IR2000U FIR
 
 /* ActiveWire, Inc. products */
 product ACTIVEWIRE IOBOARD	0x0100	I/O Board
 product ACTIVEWIRE IOBOARD_FW1	0x0101	I/O Board, rev. 1 firmware
 
+/* Adaptec products */
+product ADAPTEC AWN8020		0x0020	AWN-8020 WLAN
+
+/* Addonics products */
+product ADDONICS2 205		0xa001	Cable 205
+
 /* Actiontec, Inc. products */
 product ACTIONTEC UAT1		0x7605	UAT1 Wireless Ethernet adapter
 
 /* ADMtek products */
-product ADMTEK PEGASUS		0x0986	AN986 USB Ethernet adapter
-product ADMTEK PEGASUSII	0x8511	AN8511 USB Ethernet adapter
-product ADMTEK PEGASUSII_2	0x8513	AN8513 USB Ethernet adapter
+product ADMTEK PEGASUS		0x0986	AN986 USB Ethernet
+product ADMTEK PEGASUSII	0x8511	AN8511 USB Ethernet
+product ADMTEK PEGASUSII_2	0x8513	AN8513 Ethernet
 
 /* ADS products */
-product ADS UBS10BT		0x0008	UBS-10BT Ethernet adapter
+product ADS UBS10BT		0x0008	UBS-10BT Ethernet
+product ADS UBS10BTX		0x0009	UBS-10BT Ethernet
+
+/* AEI products */
+product AEI USBTOLAN		0x1701	AEI USB to Lan adapter
 
 /* Agate Technologies products */
 product AGATE QDRIVE		0x0378	Q-Drive
@@ -550,8 +633,11 @@ product AGFA SNAPSCANE25	0x2095	SnapScan e25
 product AGFA SNAPSCANE26	0x2097	SnapScan e26
 product AGFA SNAPSCANE52	0x20fd	SnapScan e52
 
-/* Ain Communication Technology products */
-product AINCOMM AWU2000B	0x1001	AWU2000B Wireless adapter
+/* AIPTEK International products */
+product AIPTEK2 PENCAM_MEGA_1_3	0x504a	PenCam Mega 1.3
+
+/* Aincomm products */
+product AINCOMM AWU2000B	0x1001	AWU2000B
 
 /* AKS products */
 product AKS USBHASP		0x0001	USB-HASP 0.06
@@ -583,23 +669,41 @@ product APPLE OPTMOUSE		0x0302	Optical mouse
 product APPLE SPEAKERS		0x1101	Speakers
 
 /* Asahi Optical products */
-product ASAHIOPTICAL OPTIO230	0x0004	Digital camera
+product ASAHIOPTICAL OPTIO230	0x0004	PENTAX Optio230
 product ASAHIOPTICAL OPTIO330	0x0006	Digital camera
 
+/* Asante products */
+product ASANTE EA		0x1427	Ethernet Adapter
+
 /* ASIX Electronics products */
-product ASIX AX88172		0x1720  USB 2.0 10/100 ethernet controller
+product ASIX AX88172		0x1720	USB 2.0 10/100 ethernet controller
 
 /* ATen products */
 product ATEN UC1284		0x2001	Parallel printer adapter
 product ATEN UC10T		0x2002	10Mbps ethernet adapter
 product ATEN UC232A		0x2008	Serial adapter
+product ATEN DSB650C		0x4000	DSB-650C
+
+/* ATI products */
+product ATI2 205		0xa001	USB Cable 205
 
 /* Atmel Comp. products */
 product ATMEL UHB124		0x3301	UHB124 hub
 product ATMEL DWL120		0x7603	DWL-120 Wireless adapter
+product ATMEL DWL900AP		0x5601	DWL-900AP Wireless access point
 product ATMEL BW002		0x7605	BW002 Wireless adapter
-product ATMEL WL1130USB		0x7613	WL-1130 USB
-product ATMEL AT76C505A		0x7614	AT76c505a Wireless adapter
+product ATMEL WL1130		0x7613	WL-1130
+product ATMEL AT76C505A		0x7614	AT76C505A
+product ATMEL DWL_120		0x7603	DWL-120
+
+/* Audio-Technica products */
+product AUDIOTECHNICA ATCHA4USB	0x0009	ATC-HA4USB USB headphone
+
+/* Avance Logic products */
+product AVANCELOGIC USBAUDIO	0x0100	USB Audio Speaker
+
+/* Averatec products */
+product AVERATEC USBWLAN	0x4013	WLAN
 
 /* Avision products */
 product AVISION 1200U		0x0268	1200U scanner
@@ -610,11 +714,15 @@ product BBELECTRONICS USOTL4	0xAC01	uLinks Isolated RS-422/485 to USB adapter
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
 product BELKIN2 F5U002		0x0002	F5U002 Parallel printer adapter
-product BELKIN USB2LAN		0x0121	USB to LAN Converter
 product BELKIN F5U103		0x0103	F5U103 Serial adapter
 product BELKIN F5U109		0x0109	F5U109 Serial adapter
+product BELKIN F5U409		0x0409	F5U409 Serial
+product BELKIN SCSI		0x0115	SCSI Adaptor
+product BELKIN USB2LAN		0x0121	USB to LAN Converter
 product BELKIN F5U208		0x0208	F5U208 VideoBus II
+product BELKIN F5U237		0x0237	F5U237 USB 2.0 7-Port Hub
 product BELKIN F5U409		0x0409	F5U409 Serial adapter
+product BELKIN UPS		0x0980	UPS
 product BELKIN F5U120		0x1203	F5U120-PC Hub
 
 /* Billionton products */
@@ -624,7 +732,8 @@ product BILLIONTON USBEL100	0x0988	USB100EL
 product BILLIONTON USBE100	0x8511	USBE100
 
 /* Broadcom products */
-product BROADCOM BCM2033	0x2033	BCM2033 Bluetooth USB dongle
+product BROADCOM BCM2033	0x2000	BCM2033
+product BROADCOM BCM2033NF	0x2033	BCM2033 (no firmware)
 
 /* Brother Industries products */
 product BROTHER HL1050		0x0002	HL-1050 laser printer
@@ -638,8 +747,13 @@ product CANON N1220U		0x2207	CanoScan N1220U
 product CANON N676U		0x220d	CanoScan N676U
 product CANON N1240U		0x220e	CanoScan N1240U
 product CANON S10		0x3041	PowerShot S10
+product CANON S20		0x3043	PowerShot S20
 product CANON S100		0x3045	PowerShot S100
+product CANON S100_EU		0x3047	PowerShot S100
+product CANON G1		0x3048	PowerShot G1
+product CANON A20		0x304e	PowerShot A20
 product CANON S200		0x3065	PowerShot S200
+product CANON EOS300D		0x3084	EOS 300D / Digital Rebel
 
 /* CATC products */
 product CATC NETMATE		0x000a	Netmate ethernet adapter
@@ -648,8 +762,13 @@ product CATC CHIEF		0x000d	USB Chief Bus & Protocol Analyzer
 product CATC ANDROMEDA		0x1237	Andromeda hub
 
 /* CASIO products */
+product CASIO QV		0x1001	QV DigitalCamera
+product CASIO BE300		0x2002	BE-300 PDA
 product CASIO NAMELAND		0x4001	CASIO Nameland EZ-USB
 
+/* CCYU Technology products */
+product CCYU EASYDISK		0x2136	EasyDisk Portable Device
+
 /* Cherry products */
 product CHERRY MY3000KBD	0x0001	My3000 keyboard
 product CHERRY MY3000HUB	0x0003	My3000 hub
@@ -661,9 +780,28 @@ product CHIC CYPRESS		0x0003	Cypress USB Mouse
 
 /* Chicony products */
 product CHICONY KB8933		0x0001	KB-8933 keyboard
+product CHICONY2 TWINKLECAM	0x600d	TwinkleCam USB camera
+
+/* CH Products */
+product CHPRODUCTS PROTHROTTLE	0x00f1	Pro Throttle
+product CHPRODUCTS PROPEDALS	0x00f2	Pro Pedals
+product CHPRODUCTS FIGHTERSTICK	0x00f3	Fighterstick
+product CHPRODUCTS FLIGHTYOKE	0x00ff	Flight Sim Yoke
 
 /* Compaq products */
+product COMPAQ IPAQPOCKETPC	0x0003	iPAQ PocketPC
+product COMPAQ A1500		0x0012	A1500
+product COMPAQ W100		0x0033	W100
+product COMPAQ W200		0x0076	WLAN MultiPort W200
 product COMPAQ PJB100		0x504a	Personal Jukebox PJB100
+product COMPAQ IPAQLINUX	0x505a	iPAQ Linux
+product COMPAQ HNE200		0x8511	HNE-200 USB Ethernet adapter
+
+/* Composite Corp products looks the same as "TANGTOP" */
+product COMPOSITE USBPS2	0x0001	USB to PS2 Adaptor
+
+/* Concord Camera products */
+product CONCORDCAMERA EYE_Q_3X	0x0100	Eye Q 3x
 
 /* Connectix products */
 product CONNECTIX QUICKCAM	0x0001	QuickCam
@@ -671,11 +809,19 @@ product CONNECTIX QUICKCAM	0x0001	QuickCam
 /* Corega products */
 product COREGA ETHER_USB_T	0x0001	Ether USB-T
 product COREGA FETHER_USB_TX	0x0004	FEther USB-TX
+product COREGA WLAN_USB_USB_11	0x000c	WirelessLAN USB-11
 product COREGA FETHER_USB_TXS	0x000d	FEther USB-TXS
+product COREGA WLANUSB		0x0012	Wireless LAN USB Stick-11
+product COREGA FETHER_USB2_TX	0x0017	FEther USB2-TX
+product COREGA WLUSB_11_KEY	0x001a	ULUSB-11 Key
 product COREGA FETHER_USB_TXC	0x9601	FEther USB-TXC
 
 /* Creative products */
 product CREATIVE NOMAD_II	0x1002	Nomad II MP3 player
+product CREATIVE NOMAD_IIMG	0x4004	Nomad II MG
+product CREATIVE NOMAD		0x4106	Nomad
+
+product CREATIVE2 VOIP_BLASTER	0x0258	Voip Blaster
 
 /* Crystalfontz products */
 product FTDI CFA_631		0xfc0c	Crystalfontz CFA-631 USB LCD
@@ -684,7 +830,7 @@ product FTDI CFA_633		0xfc0b	Crystalfontz CFA-633 USB LCD
 product FTDI CFA_634		0xfc09	Crystalfontz CFA-634 USB LCD
 product FTDI SEMC_DSS20		0xfc82	SEMC DSS-20 SyncStation
 
-/* Cambridge Silicon Radio Ltd. products */
+/* Cambridge Silicon Radio products */
 product CSR BT_DONGLE		0x0001	Bluetooth USB dongle
 product CSR CSRDFU		0xffff	USB Bluetooth Device in DFU State
 
@@ -694,18 +840,23 @@ product CTX EX1300		0x9999	Ex1300 hub
 /* Cypress Semiconductor products */
 product CYPRESS MOUSE		0x0001	mouse
 product CYPRESS THERMO		0x0002	thermometer
+product CYPRESS KBDHUB		0x0101	Keyboard/Hub
 product CYPRESS FMRADIO		0x1002	FM Radio
 product CYPRESS SLIM_HUB	0x6560	Slim Hub
 
 /* Daisy Technology products */
-product DAISY DMC		0x6901	USB MultiMedia Reader
+product DAISY DMC		0x6901	PhotoClip USBMediaReader
 
 /* Dallas Semiconductor products */
 product DALLAS J6502		0x4201	J-6502 speakers
+product DALLAS USB_FOB_IBUTTON	0x2490	USB-FOB/iBUTTON
 
 /* Dell products */
 product DELL PORT		0x0058	Port Replicator
-product DELL BC02		0x8000	BC02 Bluetooth USB Adapter
+product DELL X3			0x4002	Dell Axim X3 PDA
+product DELL X30		0x4003	Dell Axim X30 PDA
+product DELL BC02		0x8000	Dell BC02 Bluetooth USB Adapter
+product DELL TM1180		0x8100	TrueMobile 1180 WLAN
 
 /* Delorme Paublishing products */
 product DELORME EARTHMATE	0x0100	Earthmate GPS
@@ -718,10 +869,14 @@ product DIGI ACCELEPORT2	0x0002	AccelePort USB 2
 product DIGI ACCELEPORT4	0x0004	AccelePort USB 4
 product DIGI ACCELEPORT8	0x0008	AccelePort USB 8
 
+/* Digital Stream Corp. products */
+product DIGITALSTREAM PS2	0x0001	PS/2 Active Adapter
+
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
 product DLINK DUBE100		0x1a00	10/100 ethernet adapter
 product DLINK DSB650TX4		0x200c	10/100 ethernet adapter
+product DLINK DWL122		0x3700	Wireless DWL122
 product DLINK DSB650C		0x4000	10Mbps ethernet adapter
 product DLINK DSB650TX1		0x4001	10/100 ethernet adapter
 product DLINK DSB650TX		0x4002	10/100 ethernet adapter
@@ -730,6 +885,17 @@ product DLINK DSB650TX3		0x400b	10/100 ethernet adapter
 product DLINK DSB650TX2		0x4102	10/100 ethernet adapter
 product DLINK DSB650		0xabc1	10/100 ethernet adapter
 
+/* eGalax Products */
+product EGALAX TPANEL		0x0001	Touch Panel
+product EGALAX TPANEL2		0x0002	Touch Panel
+product EGALAX2 TPANEL		0x0001	Touch Panel
+
+/* DMI products */
+product DMI SA2_0		0xb001	Storage Adapter
+
+/* Eicon Networks */
+product EICON DIVA852		0x4905	Diva 852 ISDN TA
+
 /* EIZO products */
 product EIZO HUB		0x0000	hub
 product EIZO MONITOR		0x0001	monitor
@@ -740,8 +906,8 @@ product ELECOM LDUSBTX0		0x200c	LD-USB/TX
 product ELECOM LDUSBTX1		0x4002	LD-USB/TX
 product ELECOM LDUSBLTX		0x4005	LD-USBL/TX
 product ELECOM LDUSBTX2		0x400b	LD-USB/TX
-product ELECOM UCSGT		0x5003	UC-SGT
-product ELECOM UCSGT0		0x5004	UC-SGT
+product ELECOM UCSGT		0x5003	UC-SGT serial adapter
+product ELECOM UCSGT0		0x5004	UC-SGT0 Serial
 product ELECOM LDUSBTX3		0xabc1	LD-USB/TX
 
 /* Elsa products */
@@ -758,10 +924,12 @@ product ENTREGA 1S25		0x0003	1S25 serial connector
 product ENTREGA 4S		0x0004	4S serial connector
 product ENTREGA E45		0x0005	E45 Ethernet adapter
 product ENTREGA CENTRONICS	0x0006	Centronics connector
+product ENTREGA XX1		0x0008	Ethernet Adapter
 product ENTREGA 1S9		0x0093	1S9 serial connector
 product ENTREGA EZUSB		0x8000	EZ-USB
 /*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
 product ENTREGA 2U4S		0x8004	2U4S serial connector/usb hub
+product ENTREGA XX2		0x8005	Ethernet Adapter
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
 /* Epson products */
@@ -807,8 +975,17 @@ product GRIFFIN IMATE		0x0405	iMate, ADB adapter
 product FREECOM DVD		0xfc01	Connector for DVD drive
 
 /* Future Technology Devices products */
-product FTDI SERIAL_8U100AX	0x8372	8U100AX Serial converter
 product FTDI SERIAL_8U232AM	0x6001	8U232AM Serial converter
+product FTDI PS2KBDMS		0x8371	PS/2 Keyboard/Mouse
+product FTDI SERIAL_8U100AX	0x8372	8U100AX Serial converter
+product FTDI LCD_MX200_USB	0xfa01	Matrix Orbital MX200 Series LCD
+product FTDI LCD_LK202_24_USB	0xfa03	Matrix Orbital LK202-24 LCD
+product FTDI LCD_LK204_24	0xfa04	Matrix Orbital LK204-24 LCD
+product FTDI LCD_CFA_632	0xfc08  Crystalfontz CFA-632 LCD
+product FTDI LCD_CFA_634	0xfc09  Crystalfontz CFA-634 LCD
+product FTDI LCD_CFA_633	0xfc0b  Crystalfontz CFA-633 LCD
+product FTDI CFA_631		0xfc0c	Crystalfontz CFA-631 LCD
+product FTDI SEMC_DSS20		0xfc82	SEMC DSS-20 SyncStation
 
 /* Fuji photo products */
 product FUJIPHOTO MASS0100	0x0100	Mass Storage
@@ -820,19 +997,36 @@ product FUJITSU AH_F401U	0x105b	AH-F401U Air H device
 product GENERALINSTMNTS SB5100	0x5100	SURFboard SB5100 Cable modem
 
 /* Genesys Logic products */
+product GENESYS GENELINK	0x05e3	GeneLink Host-Host Bridge
 product GENESYS GL650		0x0604	GL650 Hub
 product GENESYS GL641USB	0x0700	GL641USB CompactFlash Card Reader
-product GENESYS GL641USB2IDE_2	0x0701	GL641USB USB-IDE Bridge No 2
+product GENESYS GL641USB2IDE_2	0x0701	GL641USB USB-IDE Bridge
 product GENESYS GL641USB2IDE	0x0702	GL641USB USB-IDE Bridge
 
-/* HAL Corporation products */
-product HAL IMR001		0x0011	Crossam2+USB IR commander
+/* GoHubs products */
+product GOHUBS GOCOM232		0x1001	GoCOM232 Serial converter
+
+/* Gravis products */
+product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
+
+/* GREENHOUSE products */
+product GREENHOUSE KANA21	0x0001	CF-writer with Portable MP3 Player
+
+/* Griffin Technology */
+product GRIFFIN IMATE		0x0405	iMate, ADB adapter
+product GRIFFIN POWERMATE	0x0410	PowerMate Assignable Controller
+
+/* Guillemot Corporation */
+product GUILLEMOT DALEADER	0xa300	DA Leader
 
 /* Hagiwara products */
 product HAGIWARA FGSM		0x0002	FlashGate SmartMedia Card Reader
 product HAGIWARA FGCF		0x0003	FlashGate CompactFlash Card Reader
 product HAGIWARA FG		0x0005	FlashGate
 
+/* HAL Corporation products */
+product HAL IMR001		0x0011	Crossam2+USB IR commander
+
 /* Handspring, Inc. */
 product HANDSPRING VISOR	0x0100	Handspring Visor
 product HANDSPRING TREO		0x0200	Handspring Treo
@@ -845,6 +1039,7 @@ product HAUPPAUGE WINTV_USB_FM	0x4d12	WinTV USB FM
 product HAWKING UF100		0x400c	10/100 USB Ethernet
 
 /* Hitachi, Ltd. products */
+product HITACHI DZMV100A	0x0004	DVD-CAM DZ-MV100A Camcorder
 product HITACHI DVDCAM_USB	0x001e	DVDCAM USB HS Interface
 
 /* HP products */
@@ -867,79 +1062,142 @@ product HP MMKEYB		0x020c	Multimedia keyboard
 product HP 1220C		0x0212	DeskJet 1220C
 product HP 810C			0x0304	DeskJet 810C/812C
 product HP 4300C		0x0305	Scanjet 4300C
+product HP CD4E			0x0307	CD-Writer+ CD-4e
 product HP G85XI		0x0311	OfficeJet G85xi
 product HP 1200			0x0317	LaserJet 1200
 product HP 5200C		0x0401	Scanjet 5200C
 product HP 830C			0x0404	DeskJet 830C
 product HP 3400CSE		0x0405	ScanJet 3400cse
+product HP 885C			0x0504	DeskJet 885C
 product HP 6300C		0x0601	Scanjet 6300C
 product HP 840C			0x0604	DeskJet 840c
 product HP 2200C		0x0605	ScanJet 2200C
 product HP 5300C		0x0701	Scanjet 5300C
 product HP 4400C		0x0705	Scanjet 4400C
-product HP 2300D 		0x0b17	Laserjet 2300d
+product HP 816C			0x0804	DeskJet 816C
+product HP 2300D		0x0b17	Laserjet 2300d
 product HP 970CSE		0x1004	Deskjet 970Cse
 product HP 5400C		0x1005	Scanjet 5400C
+product HP 2215			0x1016  iPAQ 22xx/Jornada 548
+product HP 959C			0x1104	Deskjet 959C
+product HP 568J			0x1116  Jornada 568
 product HP 930C			0x1204	DeskJet 930c
 product HP P2000U		0x1801	Inkjet P-2000U
 product HP 640C			0x2004	DeskJet 640c
 product HP 4670V		0x3005	ScanJet 4670v
 product HP P1100		0x3102	Photosmart P1100
+product HP 6127			0x3504	Deskjet 6127
 product HP HN210E		0x811c	Ethernet HN210E
 
 /* HP products */
 product HP2 C500		0x6002	PhotoSmart C500
 
 /* IBM Corporation */
+product IBM OPTTRAVELMOUSE	0x3107	Optical
 product IBM USBCDROMDRIVE	0x4427	USB CD-ROM Drive
 
+/* Iiyama products */
+product IIYAMA HUB		0x0201	Hub
+
+/* Imation */
+product IMATION FLASHGO		0xb000	Flash Go!
+
 /* Inside Out Networks products */
-product INSIDEOUT EDGEPORT4	0x0001	EdgePort/4 serial ports
+product INSIDEOUT EDGEPORT4	0x0001	EdgePort/4 RS232
+product INSIDEOUT HUBPORT7	0x0002	Hubport/7
+product INSIDEOUT RAPIDPORT4	0x0003	Rapidport/4
+product INSIDEOUT EDGEPORT4T	0x0004	Edgeport/4 RS232 for Telxon
+product INSIDEOUT EDGEPORT2	0x0005	Edgeport/2 RS232
+product INSIDEOUT EDGEPORT4I	0x0006	Edgeport/4 RS422
+product INSIDEOUT EDGEPORT2I	0x0007	Edgeport/2 RS422/RS485
+product	INSIDEOUT HUBPORT4	0x0008	Hubport/4
+product INSIDEOUT EDGEPORT8HAND	0x0009	Hand-built Edgeport/8
+product	INSIDEOUT MULTIMODEM	0x000A	MultiTech version of RP/4
+product	INSIDEOUT EDGEPORTPPORT	0x000B	Edgeport/(4)21 Parallel port (USS720)
+product	INSIDEOUT EDGEPORT421	0x000C	Edgeport/421 Hub+RS232+Parallel
+product	INSIDEOUT EDGEPORT21	0x000D	Edgeport/21  RS232+Parallel
+product INSIDEOUT EDGEPORT8DC	0x000E	1/2 Edgeport/8 (2 EP/4s on 1 PCB)
+product INSIDEOUT EDGEPORT8	0x000F	Edgeport/8
+product INSIDEOUT EDGEPORT2DIN	0x0010	Edgeport/2 RS232 / Apple DIN connector
+product INSIDEOUT EDGEPORT4DIN	0x0011	Edgeport/4 RS232 / Apple DIN connector
+product INSIDEOUT EDGEPORT16DC	0x0012	1/2 Edgeport/16 (2 EP/8s on 1 PCB))
+product INSIDEOUT EDGEPORTCOMP	0x0013	Edgeport Compatible
+product INSIDEOUT EDGEPORT8I	0x0014	Edgeport/8 RS422
+product INSIDEOUT MT4X56USB	0x1403	OEM device
 
 /* In-System products */
 product INSYSTEM F5U002		0x0002	Parallel printer adapter
 product INSYSTEM ATAPI		0x0031	ATAPI adapter
+product INSYSTEM IDEUSB2	0x0060	USB2 Storage Adapter
 product INSYSTEM ISD110		0x0200	IDE adapter ISD110
 product INSYSTEM ISD105		0x0202	IDE adapter ISD105
+product INSYSTEM DRIVEV2	0x0301	Portable USB Harddrive V2
+product INSYSTEM DRIVEV2_5	0x0351	Portable USB Harddrive V2
 product INSYSTEM USBCABLE	0x081a	USB cable
+product INSYSTEM ADAPTERV2	0x5701	USB Storage Adapter V2
 
 /* Intel products */
 product INTEL EASYPC_CAMERA	0x0110	Easy PC Camera
+product INTEL I2011B		0x1111	Wireless 2011B
 product INTEL TESTBOARD		0x9890	82930 test board
 
 /* Intersil products */
-product INTERSIL PRISM_2X	0x3642	Prism2.x or Atmel WLAN
+product INTERSIL PRISM_2X	0x3642	Prism2.x WLAN
 
 /* Interpid Control Systems products */
-product INTREPIDCS VALUECAN	0x0601	ValueCAN CAN bus interface
-product INTREPIDCS NEOVI	0x0701	NeoVI Blue vehicle bus interface
+product INTREPIDCS VALUECAN	0x0601	ValueCAN
+product INTREPIDCS NEOVI	0x0701	NeoVI Blue
 
-/* I/O DATA products */
+/* I-O DATA products */
 product IODATA IU_CD2		0x0204	DVD Multi-plus unit iU-CD2
 product IODATA DVR_UEH8		0x0206	DVD Multi-plus unit DVR-UEH8
+product IODATA USBSSMRW		0x0314	USB-SSMRW SD-card adapter
+product IODATA USBSDRW		0x031e	USB-SDRW SD-card adapter
 product IODATA USBETT		0x0901	USB ETT
 product IODATA USBETTX		0x0904	USB ETTX
 product IODATA USBETTXS		0x0913	USB ETTX
+product IODATA USBWNB11		0x0922	USB Airport WN-B11
 product IODATA USBRSAQ		0x0a03	USB serial adapter USB-RSAQ1
+product IODATA2 USB2SC		0x0a09	USB2.0-SCSI Bridge USB2-SC
 
 /* Iomega products */
 product IOMEGA ZIP100		0x0001	Zip 100
 product IOMEGA ZIP250		0x0030	Zip 250
+product IOMEGA ZIP250_2		0x0032	Zip 250
+product IOMEGA CDRW		0x0055	CDRW 9602
+
+/* iRiver products */
+product IRIVER IFP_1XX		0x1101	iFP-1xx
+product IRIVER IFP_3XX		0x1103	iFP-3xx
+product IRIVER IFP_5XX		0x1105	iFP-5xx
+
+/* Jaton products */
+product JATON EDA		0x5704	Ethernet Device Adapter
+
+/* Jenoptik products */
+product JENOPTIK JD350		0x5300  JD 350 Camera/mp3 player
+
+/* JRC products */
+product JRC AH_J3001V_J3002V	0x0001	AirH\"PHONE AH-J3001V/J3002V
 
 /* JVC products */
 product JVC GR_DX95		0x000a	GR-DX95
 
+/* JVC products */
+product JVC MP_XP7250_WL	0x3009  MP-XP7250 Builtin WLAN
+
 /* JRC products */
 product JRC AH_J3001V_J3002V	0x0001	AirH\" PHONE AH-J3001V/J3002V
 
 /* Kawasaki products */
-product KLSI DUH3E10BT		0x0008	USB ethernet controller engine
-product KLSI DUH3E10BTN		0x0009	USB ethernet controller engine
+product KLSI DUH3E10BT		0x0008	10BT Ethernet adapter, in the DU-H3E
+product KLSI DUH3E10BTN		0x0009	10BT Ethernet adapter, in the DU-H3E
 
 /* Kawatsu products */
 product KAWATSU MH4000P		0x0003	MiniHub 4000P
+product KAWATSU KC180		0x0180	KC-180 IrDA
 
-/* Keisokugiken Corp. products */
+/* Keisokugiken products */
 product KEISOKUGIKEN USBDAQ	0x0068	HKS-0200 USBDAQ
 
 /* Kawasaki products */
@@ -948,17 +1206,40 @@ product KLSI DUH3E10BT		0x0008	10BT Ethernet adapter, in the DU-H3E
 /* Kensington products */
 product KENSINGTON ORBIT	0x1003	Orbit USB/PS2 trackball
 product KENSINGTON TURBOBALL	0x1005	TurboBall
+product KENSINGTON ORBIT_MAC	0x1009	Orbit USB trackball for Mac
+product KENSINGTON VIDEOCAM_VGA	0x5002	VideoCAM VGA
 
 /* Keyspan products */
-product KEYSPAN USA28		0x0101	USA-28 serial adapter
-product KEYSPAN USA28X		0x0102	USA-28X serial adapter
-product KEYSPAN USA19		0x0103	USA-19 serial adapter
-product KEYSPAN USA18X		0x0105	USA-18X serial adapter
-product KEYSPAN USA19W		0x0106	USA-19W serial adapter
-product KEYSPAN USA49W		0x0109	USA-49W serial adapter
-product KEYSPAN USA19QW		0x0118	USA-19QW serial adapter
+product KEYSPAN USA28_NF	0x0101	USA-28 serial adapter (no firmware)
+product KEYSPAN USA28X_NF	0x0102	USA-28X serial adapter (no firmware)
+product KEYSPAN USA19_NF	0x0103	USA-19 serial adapter (no firmware)
+product KEYSPAN USA18_NF	0x0104	USA-18 serial adapter (no firmware)
+product KEYSPAN USA18X_NF	0x0105	USA-18X serial adapter (no firmware)
+product KEYSPAN USA19W_NF	0x0106	USA-19W serial adapter (no firmware)
+product KEYSPAN USA19		0x0107	USA-19 serial adapter
+product KEYSPAN USA19W		0x0108	USA-19W serial adapter
+product KEYSPAN USA49W_NF	0x0109	USA-49W serial adapter (no firmware)
+product KEYSPAN USA49W		0x010a	USA-49W serial adapter
+product KEYSPAN USA19QI_NF	0x010b	USA-19QI serial adapter (no firmware)
+product KEYSPAN USA19QI		0x010c	USA-19QI serial adapter
+product KEYSPAN USA19Q_NF	0x010d	USA-19Q serial adapter (no firmware)
+product KEYSPAN USA19Q		0x010e	USA-19Q serial adapter
+product KEYSPAN USA28		0x010f	USA-28 serial adapter
+product KEYSPAN USA28XXB	0x0110	USA-28X/XB serial adapter
+product KEYSPAN USA18		0x0111	USA-18 serial adapter
+product KEYSPAN USA18X		0x0112	USA-18X serial adapter
+product KEYSPAN USA28XB_NF	0x0113	USA-28XB serial adapter (no firmware)
+product KEYSPAN USA28XA_NF	0x0114	USA-28XB serial adapter (no firmware)
+product KEYSPAN USA28XA		0x0115	USA-28XA serial adapter
+product KEYSPAN USA18XA_NF	0x0116	USA-18XA serial adapter (no firmware)
+product KEYSPAN USA18XA		0x0117	USA-18XA serial adapter
+product KEYSPAN USA19QW_NF	0x0118	USA-19WQ serial adapter (no firmware)
+product KEYSPAN USA19QW		0x0119	USA-19WQ serial adapter
+product KEYSPAN UIA10		0x0201	UIA-10 remote control
+product KEYSPAN UIA11		0x0202	UIA-11 remote control
 
 /* Kingston products */
+product KINGSTON XX1		0x0008	Ethernet Adapter
 product KINGSTON KNU101TX	0x000a	KNU101TX USB Ethernet
 
 /* Kodak products */
@@ -968,6 +1249,7 @@ product KODAK DC265		0x0111	Digital Science DC265
 product KODAK DC290		0x0112	Digital Science DC290
 product KODAK DC240		0x0120	Digital Science DC240
 product KODAK DC280		0x0130	Digital Science DC280
+product KODAK DX4900		0x0550	EasyShare DX4900
 
 /* Konica Corp. Products */
 product KONICA CAMERA		0x0720	Digital Color Camera
@@ -975,6 +1257,7 @@ product KONICA CAMERA		0x0720	Digital Color Camera
 /* KYE products */
 product KYE NICHE		0x0001	Niche mouse
 product KYE NETSCROLL		0x0003	Genius NetScroll mouse
+product KYE G07			0x1002	MaxFire G-07 gamepad
 product KYE FLIGHT2000		0x1004	Flight 2000 joystick
 product KYE VIVIDPRO		0x2001	ColorPage Vivid-Pro scanner
 
@@ -984,9 +1267,12 @@ product KYOCERA AHK3001V	0x0203	AH-K3001V
 /* LaCie products */
 product LACIE HD		0xa601	Hard Disk
 product LACIE CDRW		0xa602	CD R/W
+product LACIE PKTDRV            0x0211  PocketDrive
 
 /* Lexar products */
 product LEXAR JUMPSHOT		0x0001	jumpSHOT CompactFlash Reader
+product LEXAR 2662WAR		0xa002	2662W-AR
+product LEXAR MCR		0xb018	Multi-Card Reader
 
 /* Lexmark products */
 product LEXMARK S2450		0x0009	Optra S 2450
@@ -998,10 +1284,17 @@ product LINKSYS USB10T		0x2202	USB10T Ethernet
 product LINKSYS USB100TX	0x2203	USB100TX Ethernet
 product LINKSYS USB100H1	0x2204	USB100H1 Ethernet/HPNA
 product LINKSYS USB10TA		0x2206	USB10TA Ethernet
-product LINKSYS USB10TX2	0x400b	USB10TX
-product LINKSYS2 WUSB11		0x2219	WUSB11 Wireless adapter
+product LINKSYS	WUSB11		0x2211	WUSB11 Wireless USB Network Adapter
+product LINKSYS	WUSB11_25	0x2212	WUSB11 Wireless USB Network Adapter (version 2.5)
+product LINKSYS WUSB12_11	0x2213	WUSB12 802.11b v1.1
+product LINKSYS2 WUSB11		0x2219	WUSB11
 product LINKSYS2 USB200M	0x2226	USB 2.0 10/100 ethernet controller
-product LINKSYS3 WUSB11v28	0x2233	WUSB11 v2.8 wireless adapter
+product LINKSYS3 WUSB11v28	0x2233	WUSB11-V28
+product LINKSYS USB10TX2	0x400b	USB10TX
+
+/* Logitec products */
+product LOGITEC LDR_H443SU2	0x0033	DVD Multi-plus unit LDR-H443SU2
+product LOGITEC LDR_H443U2	0x00b3	DVD Multi-plus unit LDR-H443U2
 
 /* Logitech products */
 product LOGITECH M2452		0x0203	M2452 keyboard
@@ -1011,18 +1304,27 @@ product LOGITECH QUICKCAMWEB	0x0801	QuickCam Web
 product LOGITECH QUICKCAMPRO	0x0810	QuickCam Pro
 product LOGITECH QUICKCAMEXP	0x0840	QuickCam Express
 product LOGITECH QUICKCAM	0x0850	QuickCam
+product LOGITECH QUICKCAMEXP2	0x0870	QuickCam Express
+product LOGITECH QUICKCAMPRO3k	0x08b0	QuickCam Pro 3000
+product LOGITECH QUICKCAMPRONB	0x08b1	QuickCam for Notebook Pro
+product LOGITECH QUICKCAMPRO4K	0x08b2	QuickCam Pro 4000
 product LOGITECH N43		0xc000	N43
 product LOGITECH N48		0xc001	N48 mouse
 product LOGITECH MBA47		0xc002	M-BA47 mouse
 product LOGITECH WMMOUSE	0xc004	WingMan Gaming Mouse
 product LOGITECH BD58		0xc00c	BD58 mouse
+product LOGITECH USBPS2MOUSE	0xc00e	USB-PS/2 Optical Mouse
+product LOGITECH MUV55A		0xc016	M-UV55a
 product LOGITECH UN58A		0xc030	iFeel Mouse
-product LOGITECH BB13		0xc401	USB-PS/2 Trackball
 product LOGITECH WMPAD		0xc208	WingMan GamePad Extreme
 product LOGITECH WMRPAD		0xc20a	WingMan RumblePad
 product LOGITECH WMJOY		0xc281	WingMan Force joystick
+product LOGITECH WMFFGP		0xc293	WingMan Formula Force GP (GT-Force)
+product LOGITECH BB13		0xc401	USB-PS/2 Trackball
+product LOGITECH BB18		0xc404	TrackMan Wheel
 product LOGITECH RK53		0xc501	Cordless mouse
 product LOGITECH RB6		0xc503	Cordless keyboard
+product LOGITECH CDO		0xc504	Cordless Desktop Optical
 product LOGITECH MX700		0xc506	Cordless optical mouse
 product LOGITECH QUICKCAMPRO2	0xd001	QuickCam Pro
 
@@ -1046,19 +1348,27 @@ product FTDI MX4_5		0xfa02	Matrix Orbital MX4 or MX5
 product FTDI LK202		0xfa03	Matrix Orbital VK/LK202 Family
 product FTDI LK204		0xfa04	Matrix Orbital VK/LK204 Family
 
-/* MCT Corp. */
+/* MCT Corp. products */
 product MCT HUB0100		0x0100	Hub
 product MCT DU_H3SP_USB232	0x0200	D-Link DU-H3SP USB BAY Hub
 product MCT USB232		0x0210	USB-232 Interface
 product MCT SITECOM_USB232	0x0230	Sitecom USB-232 Products
+product MCT ML_4500		0x0302	ML-4500
+
+/* MediaGear products */
+product MEDIAGEAR READER9IN1	0x5003	USB2.0 9 in 1 Reader
 
 /* Melco, Inc products */
 product MELCO LUATX1		0x0001	LUA-TX Ethernet
 product MELCO LUATX5		0x0005	LUA-TX Ethernet
 product MELCO LUA2TX5		0x0009	LUA2-TX Ethernet
 product MELCO LUAKTX		0x0012	LUA-KTX Ethernet
+product MELCO S11		0x0016	WLI-USB-S11
+product MELCO MCRSM2		0x001b	MCR-SM2 SmartMedia Card Reader/Writer
 product MELCO DUBPXXG		0x001c	USB-IDE Bridge: DUB-PxxG
+product MELCO KS11G		0x0027	WLI-USB-KS11G USB-wlan
 product MELCO LUAU2KTX		0x003d	LUA-U2-KTX Ethernet
+product MELCO KB11		0x0044	WLI-USB-KB11 WLAN
 
 /* Metricom products */
 product METRICOM RICOCHET_GS	0x0001	Ricochet GS
@@ -1066,6 +1376,9 @@ product METRICOM RICOCHET_GS	0x0001	Ricochet GS
 /* Micro Star International products */
 product MSI BT_DONGLE		0x1967	Bluetooth USB dongle
 
+/* Micronet Communications products */
+product MICRONET SP128AR	0x0003	SP128AR EtherFast
+
 /* Microsoft products */
 product MICROSOFT SIDEPREC	0x0008	SideWinder Precision Pro
 product MICROSOFT INTELLIMOUSE	0x0009	IntelliMouse
@@ -1073,8 +1386,10 @@ product MICROSOFT NATURALKBD	0x000b	Natural Keyboard Elite
 product MICROSOFT DDS80		0x0014	Digital Sound System 80
 product MICROSOFT SIDEWINDER	0x001a	Sidewinder Precision Racing Wheel
 product MICROSOFT INETPRO	0x001c	Internet Keyboard Pro
+product MICROSOFT TBEXPLORER	0x0024  Trackball Explorer
 product MICROSOFT INTELLIEYE	0x0025	IntelliEye mouse
 product MICROSOFT INETPRO2	0x002b	Internet Keyboard Pro
+product MICROSOFT MN510		0x006e	MN510 Wireless
 product MICROSOFT MN110		0x007a	10/100 USB NIC
 
 /* Microtech products */
@@ -1089,6 +1404,7 @@ product MICROTEK X6U		0x0099	ScanMaker X6 - X6U
 product MICROTEK C6		0x009a	Phantom C6 scanner
 product MICROTEK 336CX2		0x00a0	Phantom 336CX - C3 scanner
 product MICROTEK V6USL		0x00a3	ScanMaker V6USL
+product MICROTEK 6000		0x30e5	ScanMaker 6000
 product MICROTEK V6USL2		0x80a3	ScanMaker V6USL
 product MICROTEK V6UL		0x80ac	ScanMaker V6UL
 
@@ -1098,19 +1414,36 @@ product MICROTUNE BT_DONGLE	0x1000	Bluetooth USB dongle
 /* Midiman products */
 product MIDIMAN MIDISPORT2X2	0x1001	Midisport 2x2
 
+/* Minds At Work LLC products */
+product MINDSATWORK DW		0x0001	Digital Wallet
+
 /* Minolta Co., Ltd. */
 product MINOLTA 2300		0x4001	Dimage 2300
 product MINOLTA S304		0x4007	Dimage S304
 product MINOLTA X		0x4009	Dimage X
+product MINOLTA DIMAGE7I	0x400b	Dimage 7i
 product MINOLTA 5400		0x400e	Dimage 5400
+product MINOLTA DIMAGEA1	0x401a	Dimage A1
+product MINOLTA XT		0x4015	Dimage Xt
 
 /* Mitsumi products */
 product MITSUMI CDRRW		0x0000	CD-R/RW Drive
+product MITSUMI MOUSE		0x6407	Mouse
+product MITSUMI SONY_MOUSE	0x6408	Quick Scroll Mouse
 product MITSUMI BT_DONGLE	0x641f	Bluetooth USB dongle
+product MITSUMI FDD		0x6901	FDD
+
+/* Mobility products */
+product MOBILITY EA		0x0204	Ethernet Adapter
 
 /* Motorola products */
 product MOTOROLA MC141555	0x1555	MC141555 hub controller
 product MOTOROLA SB4100		0x4100	SB4100 USB Cable Modem
+product MOTOROLA2 T720C		0x2822	T720c
+product MOTOROLA2 A920		0x4002	A920
+
+/* Micro Star International products */
+product MSI BT_DONGLE		0x1967	Bluetooth USB dongle
 
 /* MultiTech products */
 product MULTITECH ATLAS		0xf101	MT5634ZBA-USB modem
@@ -1126,34 +1459,60 @@ product MUSTEK BEARPAW1200F	0x0010	BearPaw 1200F scanner
 product MUSTEK BEARPAW1200TA	0x021e	BearPaw 1200TA scanner
 product MUSTEK 600USB		0x0873	600 USB scanner
 product MUSTEK MDC800		0xa800	MDC-800 digital camera
+product MUSTEK DV2000		0xc441	DV2000 digital camera
 
 /* M-Systems products */
 product MSYSTEMS DISKONKEY	0x0010	DiskOnKey
 product MSYSTEMS DISKONKEY2	0x0011	DiskOnKey
 
+/* National Instruments */
+product NI GPIB_USB_A		0xc920	GPIB-USB-A
+
 /* National Semiconductor */
 product NATIONAL BEARPAW1200	0x1000	BearPaw 1200
 product NATIONAL BEARPAW2400	0x1001	BearPaw 2400
 
 /* NEC products */
+product NEC HUB_20		0x0059	2.0 hub
 product NEC HUB			0x55aa	hub
 product NEC HUB_B		0x55ab	hub
+product NEC PICTY760		0xbef4	Picty760
+product NEC PICTY900		0xefbe	Picty900
+product NEC PICTY920		0xf0be	Picty920
+product NEC PICTY800		0xf1be	Picty800
+
+/* NEC2 products */
+product NEC2 HUB2_0		0x0058	USB2.0 Hub Controller
 
 /* NEODIO products */
+product NEODIO ND3050		0x3050	6-in-1 Flash Device Controller
 product NEODIO ND3260		0x3260	8-in-1 Multi-format Flash Controller
 product NEODIO ND5010		0x5010	Multi-format Flash Controller
 
 /* NetChip Technology Products */
 product NETCHIP TURBOCONNECT	0x1080	Turbo-Connect
+product NETCHIP CLIK40		0xa140	Clik! 40
 
 /* Netgear products */
 product NETGEAR EA101		0x1001	Ethernet adapter
-product NETGEAR FA120		0x1040	USB 2.0 Ethernet adapter
+product NETGEAR EA101X		0x1002	Ethernet adapter
+product NETGEAR FA101		0x1020	10/100 Ethernet
+product NETGEAR FA120		0x1040	USB 2.0 Fast Ethernet Adapter
+product NETGEAR MA111NA		0x4110	802.11b Adapter
+product NETGEAR XA601		0x8100	USB to PL Adapter
+
+product NETGEAR2 MA101		0x4100	MA101
+product NETGEAR2 MA101B		0x4102	MA101 Rev B
 
 /* Nikon products */
 product NIKON E990		0x0102	Digital Camera E990
+product NIKON E880		0x0103	Digital Camera E880
+product NIKON E885		0x0105	Digital Camera E885
 product NIKON LS40		0x4000	CoolScan LS40 ED
 
+/* NHJ product */
+product NHJ CAM2		0x9120	Camera
+
 /* Olympus products */
 product OLYMPUS C1		0x0102	C-1 Digital Camera
 product OLYMPUS C700		0x0105	C-700 Ultra Zoom
@@ -1163,7 +1522,22 @@ product OMNIVISION OV511	0x0511	OV511 Camera
 product OMNIVISION OV511PLUS	0xa511	OV511+ Camera
 
 /* OnSpec Electronic, Inc. */
+product ONSPEC MD2		0x0103	disk
+product ONSPEC MDCFEB		0xa000	MDCFE-B USB CF Reader
+product ONSPEC SIIGMS		0xa001	Memory Stick+CF Reader/Writer
+product ONSPEC DATAFAB3		0xa003	Datafab-based Reader
+product ONSPEC DATAFAB4		0xa004	Datafab-based Reader
+product ONSPEC PNYCFSM		0xa005	PNY/Datafab CF+SM Reader
+product ONSPEC STECHCFSM	0xa006	Simple Tech/Datafab CF+SM Reader
+product ONSPEC LC1		0xa109	CF + SM Combo (LC1)
 product ONSPEC UCF100		0xa400	FlashLink UCF-100 CompactFlash Reader
+product ONSPEC MD1II		0xb006	Datafab MD1-II PC-Card Reader
+
+product ONSPEC2 8IN2		0xb012	8In2
+
+/* Ours Technology Inc. */
+product OTI SOLID		0x6803	Solid state disk
+product OTI FLASHDISK		0x6828	Flash Disk 128M
 
 /* Palm Computing, Inc. product */
 product PALM SERIAL		0x0080	USB Serial Adaptor
@@ -1179,11 +1553,19 @@ product PALM ZIRE31		0x0061	Palm Zire 31
 product PALM ZIRE		0x0070	Palm Zire
 
 /* Panasonic products */
+product PANASONIC LS120		0x0901	LS-120 Camera
 product PANASONIC KXLRW32AN	0x0d09	CD-R Drive KXL-RW32AN
 product PANASONIC KXLCB20AN	0x0d0a	CD-R Drive KXL-CB20AN
 product PANASONIC KXLCB35AN	0x0d0e	DVD-ROM & CD-R/RW
 product PANASONIC SDCAAE	0x1b00	MultiMediaCard Adapter
 
+/* Pen Driver */
+product PEN USBDISKPRO		0x0120	USB Disk Pro
+product PEN USBREADER		0x0240	USB 6 in 1 Card Reader/Writer
+product PEN MOBILEDRIVE		0x0280	USB 3 in 1 Card Reader/Writer
+product PEN USBDISK		0x0d7d	USB Disk
+product PEN ATTACHE		0x1300	USB 2.0 Flash Drive
+
 /* Peracom products */
 product PERACOM SERIAL1		0x0001	Serial Converter
 product PERACOM ENET		0x0002	Ethernet adapter
@@ -1194,8 +1576,14 @@ product PERACOM ENET2		0x0005	Ethernet adapter
 product PHILIPS DSS350		0x0101	DSS 350 Digital Speaker System
 product PHILIPS DSS		0x0104	DSS XXX Digital Speaker System
 product PHILIPS HUB		0x0201	hub
+product PHILIPS PCA645VC	0x0302	PCA645VC PC Camera
 product PHILIPS PCA646VC	0x0303	PCA646VC PC Camera
+product PHILIPS PCVC675K	0x0307	PCVC675K Vesta PC Camera
 product PHILIPS PCVC680K	0x0308	PCVC680K Vesta Pro PC Camera
+product PHILIPS PCVC690K	0x030c	PCVC690K Vesta Pro Scan PC Camera
+product PHILIPS PCVC730K	0x0310	PCVC730K ToUCam Fun PC Camera
+product PHILIPS PCVC740K	0x0311	PCVC740K ToUCam Pro PC Camera
+product PHILIPS PCVC750K	0x0312	PCVC750K ToUCam Pro Scan PC Camera
 product PHILIPS DSS150		0x0471	DSS 150 Digital Speaker System
 product PHILIPS UM10016		0x1552	ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit
 product PHILIPS DIVAUSB		0x1801	DIVA USB mp3 player
@@ -1205,6 +1593,17 @@ product PHILIPSSEMI HUB1122	0x1122	hub
 
 /* P.I. Engineering products */
 product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
+product PIENGINEERING XKEYS58	0x0232	Xkeys Programmable Keyboard (58 Keys)
+product PIENGINEERING XKEYS	0x0233	Xkeys Programmable Keyboard
+
+/* Pilotech Systems Co., Ltd products */
+product PILOTECH CRW600		0x0001	CRW-600 6-in-1 Reader
+
+/* Planex Communications products */
+product PLANEX GW_US11H		0x14ea	GW-US11H WLAN
+
+/* Plantronics products */
+product PLANTRONICS HEADSET	0x0ca1	Platronics DSP-400 Headset
 
 /* Plextor Corp. */
 product PLEXTOR 40_12_40U	0x0011	PlexWriter 40/12/40U
@@ -1215,6 +1614,19 @@ product PLX TESTBOARD		0x9060	test board
 /* PNY products */
 product PNY ATTACHE		0x1300	USB 2.0 Flash Drive
 
+/* PointChips */
+product POINTCHIPS FLASH	0x8001	Flash
+
+/* PortGear products */
+product PORTGEAR EA8		0x0008	Ethernet Adapter
+product PORTGEAR EA9		0x0009	Ethernet Adapter
+
+/* Portsmith products */
+product PORTSMITH EEA		0x3003	Express Ethernet Adapter
+
+/* PQI products */
+product PQI TRAVELFLASH		0x0001	Travel Flash Drive
+
 /* Primax products */
 product PRIMAX G2X300		0x0300	G2-200 scanner
 product PRIMAX G2E300		0x0301	G2E-300 scanner
@@ -1240,30 +1652,56 @@ product PROLIFIC RSAQ2		0x04bb	PL2303 Serial adapter (IODATA USB-RSAQ2)
 product PROLIFIC PL2303		0x2303	PL2303 Serial adapter (ATEN/IOGEAR UC232A)
 product PROLIFIC PL2305		0x2305	Parallel printer adapter
 product PROLIFIC ATAPI4		0x2307	ATAPI-4 Bridge Controller
+product PROLIFIC PL2501		0x2501	PL2501 Host-Host interface
+product PROLIFIC PL2303X 	0xaaa0  PL2303 Serial adapter (Pharos GPS)
 
 /* Putercom products */
 product PUTERCOM UPA100		0x047e	USB-1284 BRIDGE
 
+/* Qtronix products */
+product QTRONIX 980N		0x2011	Scorpion-980N keyboard
+
 /* Qualcomm products */
+/* ??? XXX product QUALCOMM CDMA_MSM	0x6000	CDMA Technologies MSM phone */
 product QUALCOMM CDMA_MSM	0x3196	CDMA Technologies MSM modem
 product QUALCOMM2 CDMA_MSM	0x6000	CDMA Technologies MSM phone
 
-/* Qtronix products */
-product QTRONIX 980N		0x2011	Scorpion-980N keyboard
-
 /* Quickshot products */
 product QUICKSHOT STRIKEPAD	0x6238	USB StrikePad
 
 /* Rainbow Technologies products */
 product RAINBOW IKEY2000	0x1200	i-Key 2000
 
-/* ReakTek products */
+/* RATOC Systems products */
+product RATOC REXUSB60		0xb000	USB serial REX-USB60
+
+/* Realtek products */
 product REALTEK USBKR100	0x8150	USBKR100 USB Ethernet (GREEN HOUSE)
+/* XXX ??? product REALTEK RTL8150L	0x8150	Realtek RTL8150L USB-Ethernet Bridge */
 
 /* Roland products */
+product ROLAND UA100		0x0000	UA-100 USB Audio I/F
+product ROLAND UM4		0x0002	UM-4 MIDI I/F
+product ROLAND SC8850		0x0003	RolandED SC-8850 SOUND Canvas MIDI Synth.
+product ROLAND U8		0x0004	U-8 USB Audio I/F
+product ROLAND UM2		0x0005	UM-2 MIDI I/F
+product ROLAND SC8820		0x0007	SoundCanvas SC-8820 MIDI Synth.
+product ROLAND PC300		0x0008	PC-300 MIDI Keyboard
 product ROLAND UM1		0x0009	UM-1 MIDI I/F
+product ROLAND SK500		0x000b	SoundCanvas SK-500 MIDI Keyboard
+product ROLAND SCD70		0x000c	SC-D70 MIDI Synth.
+product ROLAND UA3		0x000f	EDIROL UA-3 USB audio I/F
+product ROLAND XV5050		0x0012	XV-5050 MIDI Synth. 
 product ROLAND UM880N		0x0014	EDIROL UM-880 MIDI I/F (native)
 product ROLAND UM880G		0x0015	EDIROL UM-880 MIDI I/F (generic)
+product ROLAND SD90		0x0016	EDIROL SD-90 STDIO Canvas MIDI Synth.
+product ROLAND UA1A		0x0018	UA-1A USB Audio I/F
+product ROLAND UM550		0x0023	UM-550 MIDI I/F
+product ROLAND SD20		0x0027	SD-20 MIDI Synth.
+product ROLAND SD80		0x0029	SD-80 MIDI Synth.
+product ROLAND UA700		0x002b	UA-700 USB Audio I/F
+product ROLAND UA3FXA		0x0050	EDIROL UA-3FX USB audio I/F (advanced)
+product ROLAND UA3FX		0x0051	EDIROL UA-3FX USB audio I/F
 
 /* Rockfire products */
 product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
@@ -1271,29 +1709,53 @@ product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
 /* RATOC Systems products */
 product RATOC REXUSB60		0xb000	USB serial adapter REX-USB60
 
+/* Saitek products */
+product SAITEK CYBORG_3D_GOLD	0x0006	Cyborg 3D Gold Joystick
+
 /* Samsung products */
 product SAMSUNG ML6060		0x3008	ML-6060 laser printer
 
 /* SanDisk products */
 product SANDISK SDDR05A		0x0001	ImageMate SDDR-05a
-product SANDISK SDDR05		0x0005	ImageMate SDDR-05
 product SANDISK SDDR31		0x0002	ImageMate SDDR-31
+product SANDISK SDDR05		0x0005	ImageMate SDDR-05
 product SANDISK SDDR12		0x0100	ImageMate SDDR-12
 product SANDISK SDDR09		0x0200	ImageMate SDDR-09
+product SANDISK SDDR86		0x0621  ImageMate SDDR-86
 product SANDISK SDDR75		0x0810	ImageMate SDDR-75
 product SANDISK SDCZ2_256	0x7104	Cruzer Mini 256MB
 
+/* Sanwa Supply products */
+product SANWASUPPLY JYDV9USB	0x9806	JY-DV9USB gamepad
+
 /* Sanyo Electric products */
 product SANYO SCP4900 		0x0701	Sanyo SCP-4900 USB Phone
 
 /* ScanLogic products */
-product SCANLOGIC SL11R		0x0002	SL11R IDE Adapter
+product SCANLOGIC SL11R		0x0002	SL11R-IDE
 product SCANLOGIC 336CX		0x0300	Phantom 336CX - C3 scanner
 
+/* Sealevel products */
+product SEALEVEL USBSERIAL	0x2101	USB-Serial converter
+
+/* SGI products */
+product SGI SN1_L1_SC		0x1234	SN1 L1 System Controller
+
+/* Shark products */
+product SHARK PA		0x0400	Pocket Adapter
+
+/* Sharp products */
+product SHARP SL5500		0x8004	SL5500
+product SHARP A300		0x8005	A300
+product SHARP SL5600		0x8006	SL5600
+product SHARP C700		0x8007	C700
+product SHARP C750		0x9031	C750
+
 /* Shuttle Technology products */
 product SHUTTLE EUSB		0x0001	E-USB Bridge
 product SHUTTLE EUSCSI		0x0002	eUSCSI Bridge
 product SHUTTLE SDDR09		0x0003	ImageMate SDDR09
+product SHUTTLE EUSBSMCF	0x0005	eUSB SmartMedia / CompactFlash Adapter
 product SHUTTLE ZIOMMC		0x0006	eUSB MultiMediaCard Adapter
 product SHUTTLE HIFD		0x0007	Sony Hifd
 product SHUTTLE EUSBATAPI	0x0009	eUSB ATA/ATAPI Adapter
@@ -1302,17 +1764,27 @@ product SHUTTLE EUSCSI_B	0x000b	eUSCSI Bridge
 product SHUTTLE EUSCSI_C	0x000c	eUSCSI Bridge
 product SHUTTLE CDRW		0x0101	CD-RW Device
 product SHUTTLE EUSBORCA	0x0325	eUSB ORCA Quad Reader
+product SHUTTLE SCM		0x1010	SCM Micro
 
 /* Siemens products */
 product SIEMENS SPEEDSTREAM	0x1001	SpeedStream USB
+product SIEMENS SPEEDSTREAM22	0x1022	SpeedStream USB 1022
 
 /* Sigmatel products */
+product SIGMATEL IRDA		0x4200	IrDA
 product SIGMATEL I_BEAD100	0x8008	i-Bead 100 MP3 Player
+product SIGMATEL DNSSF7X	0x8020	Datum Networks SSF-7X Multi Players
 
 /* SIIG products */
 product SIIG DIGIFILMREADER	0x0004	DigiFilm-Combo Reader
+product SIIG UISDMC2S		0x0200	MULTICARDREADER
+product SIIG MULTICARDREADER	0x0201	MULTICARDREADER
 product SIIG WINTERREADER	0x0330	WINTERREADER Reader
-product SIIG2 US2308		0x0421	USB to Serial
+
+product SIIG2 US2308		0x0421	Serial
+
+/* Silicom products */
+product SILICOM U2E		0x0001	U2E
 
 /* Silicon Portals Inc. */
 product SILICONPORTALS YAPPH_NF	0x0200	YAP Phone (no firmware)
@@ -1322,7 +1794,8 @@ product SILICONPORTALS YAPPHONE	0x0201	YAP Phone
 product SIRIUS ROADSTER		0x0001	NetComm Roadster II 56 USB
 
 /* Sitecom products */
-product SITECOM LN029		0x182d	USB 2.0 Ethernet Adapter
+product SITECOM LN029		0x182d	LN029
+product SITECOM CN104		0x2068	CN104 serial
 
 /* SmartBridges products */
 product SMARTBRIDGES SMARTLINK	0x0001	SmartLink USB ethernet adapter
@@ -1343,16 +1816,23 @@ product SOLIDYEAR KEYBOARD	0x2101	Solid Year USB keyboard
 
 /* SONY products */
 product SONY DSC		0x0010	DSC cameras
+product SONY NWMS7		0x0025	Memorystick NW-MS7
+product SONY DRIVEV2		0x002b	Harddrive V2
 product SONY MSACUS1		0x002d	Memorystick MSAC-US1
 product SONY HANDYCAM		0x002e	Handycam
 product SONY MSC		0x0032	MSC memory stick slot
 product SONY CLIE_35		0x0038	Sony Clie v3.5
+product SONY PS2KEYBOARD	0x005c	PlayStation2 keyboard
+product SONY PS2KEYBOARDHUB	0x005d	PlayStation2 keyboard hub
+product SONY PS2MOUSE		0x0061	PlayStation2 mouse
 product SONY CLIE_40		0x0066	Sony Clie v4.0
+product	SONY MSC_U03		0x0069	MSC memory stick slot MSC-U03
 product SONY CLIE_40_MS		0x006d	Sony Clie v4.0 Memory Stick slot
 product SONY CLIE_S360		0x0095	Sony Clie s360
 product SONY CLIE_41_MS		0x0099	Sony Clie v4.1 Memory Stick slot
 product SONY CLIE_41		0x009a	Sony Clie v4.1
 product SONY CLIE_NX60		0x00da	Sony Clie nx60
+product SONY CLIE_TJ25		0x0169	Sony Clie tj25
 
 /* Sony Ericsson products */
 product SONYERICSSON DCU10	0x0528	USB Cable
@@ -1367,6 +1847,9 @@ product STMICRO COMMUNICATOR	0x7554	USB Communicator
 /* STSN products */
 product STSN STSN0001		0x0001	Internet Access Device
 
+/* Sun Communications products */
+product	SUNCOMM MB_ADAPTOR	0x0003	Mobile Adaptor
+
 /* SUN Corporation products */
 product SUNTAC DS96L		0x0003	SUNTAC U-Cable type D2
 product SUNTAC PS64P1		0x0005	SUNTAC U-Cable type P1
@@ -1380,15 +1863,25 @@ product SUN2 KEYBOARD		0x0005	Type 6 USB keyboard
 /* XXX The above is a North American PC style keyboard possibly */
 product SUN2 MOUSE		0x0100	Type 6 USB mouse
 
+/* Susteen products */
+product SUSTEEN DCU10	0x0528	USB Cable
+  
+/* System TALKS, Inc. */
+product	SYSTEMTALKS SGCX2UL	0x1920	SGC-X2UL
+
 /* 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 RIO800USB	0x5002	Rio 800 USB
+product DIAMOND2 PSAPLAY120	0x5003	Nike psa[play 120
 
 /* System TALKS, Inc. */
 product SYSTEMTALKS SGCX2UL	0x1920	SGC-X2UL
 
+/* Tangtop products */
+product TANGTOP USBPS2		0x0001	USBPS2
+
 /* Taugagreining products */
 product TAUGA CAMERAMATE	0x0005	CameraMate (DPCM_USB)
 
@@ -1402,26 +1895,41 @@ product TDK BT_DONGLE		0x0309	Bluetooth USB dongle
 /* TEAC products */
 product TEAC FD05PUB		0x0000	FD-05PUB floppy
 
+/* Tekram Technology products */
+product TEKRAM 0193		0x1601	ALLNET 0193 WLAN
+product TEKRAM ZYAIR_B200	0x1602	ZyXEL ZyAIR B200 WLAN
+
 /* Telex Communications products */
 product TELEX MIC1		0x0001	Enhanced USB Microphone
 
 /* Texas Intel products */
 product TI UTUSB41		0x1446	UT-USB41 hub
 product TI TUSB2046		0x2046	TUSB2046 hub
+product TI NEXII		0x5409	Nex II Digital
 
 /* Thrustmaster products */
 product THRUST FUSION_PAD	0xa0a3	Fusion Digital Gamepad
 
+/* Todos Data System products */
+product	TODOS ARGOS_MINI	0x0002	Argos Mini Smartcard Reader
+
 /* Toshiba Corporation products */
 product TOSHIBA POCKETPC_E740	0x0706	PocketPC e740
 
 /* Trek Technology products */
 product TREK THUMBDRIVE		0x1111	ThumbDrive
-product TREK THUMBDRIVE_8MB	0x9988	ThumbDrive_8MB
+product TREK THUMBDRIVE_8MB	0x9988	ThumbDrive 8MB
+
+/* Tripp-Lite products */
+product TRIPPLITE U209		0x2008	U209 Serial adapter
 
 /* Trumpion products */
+product TRUMPION T33521		0x1003	USB/MP3 decoder
 product TRUMPION C3310		0x1100	Comotron C3310 MP3 player
 
+/* Tsunami products */
+product TSUNAMI SM2000		0x1111	SM-2000
+
 /* TwinMOS */
 product TWINMOS MDIV		0x1325	Memory Disk IV
 
@@ -1439,9 +1947,17 @@ product UMAX ASTRA3400		0x0060	Astra 3400 Scanner
 /* Universal Access products */
 product UNIACCESS PANACHE	0x0101	Panache Surf USB ISDN Adapter
 
+/* U.S. Robotics products */
+product USR USR1120		0x00eb	USR1120 WLAN
+
 /* VidzMedia products */
 product VIDZMEDIA MONSTERTV	0x4fb1	MonsterTV P2H
 
+/* ViewSonic products */
+product VIEWSONIC G773HUB	0x00fe	G773 Monitor Hub
+product VIEWSONIC P815HUB	0x00ff	P815 Monitor Hub
+product VIEWSONIC G773CTRL	0x4153	G773 Monitor Control
+
 /* Vision products */
 product VISION VC6452V002	0x0002	CPiA Camera
 
@@ -1453,6 +1969,9 @@ product VISIONEER 6100		0x0231	OneTouch 6100
 product VISIONEER 6200		0x0311	OneTouch 6200
 product VISIONEER 8100		0x0321	OneTouch 8100
 product VISIONEER 8600		0x0331	OneTouch 8600
+								       
+/* Vivitar products */
+product VIVITAR DSC350		0x0003	DSC350 Camera
 
 /* Vodafone products */
 product VODAFONE MC3G		0x5000	Mobile Connect 3G datacard
@@ -1469,6 +1988,7 @@ product WESTERN EXTHDD		0x0400	External HDD
 product WESTERN HUB		0x0500	USB HUB
 
 /* Xirlink products */
+product XIRLINK IMAGING		0x800d	IMAGING DEVICE
 product XIRLINK PCCAM		0x8080	IBM PC Camera
 
 /* Y-E Data products */
@@ -1476,15 +1996,33 @@ product YEDATA FLASHBUSTERU	0x0000	Flashbuster-U
 
 /* Yamaha products */
 product YAMAHA UX256		0x1000	UX256 MIDI I/F
+product YAMAHA MU1000		0x1001	MU1000 MIDI Synth.
+product YAMAHA MU2000		0x1002	MU2000 MIDI Synth.
+product YAMAHA MU500		0x1003	MU500 MIDI Synth.
+product YAMAHA UW500		0x1004	UW500 USB Audio I/F
+product YAMAHA MOTIF6		0x1005	MOTIF6 MIDI Synth. Workstation
+product YAMAHA MOTIF7		0x1006	MOTIF7 MIDI Synth. Workstation
+product YAMAHA MOTIF8		0x1007	MOTIF8 MIDI Synth. Workstation
 product YAMAHA UX96		0x1008	UX96 MIDI I/F
+product YAMAHA UX16		0x1009	UX16 MIDI I/F
+product YAMAHA S08		0x100e	S08 MIDI Keyboard
+product YAMAHA CLP150		0x100f	CLP-150 digital piano
+product YAMAHA CLP170		0x1010	CLP-170 digital piano
+product YAMAHA RPU200		0x3104	RP-U200
 product YAMAHA RTA54I		0x4000	NetVolante RTA54i Broadband&ISDN Router
-product YAMAHA RTA55I		0x4004	NetVolante RTA55i Broadband VoIP Router
 product YAMAHA RTW65B		0x4001	NetVolante RTW65b Broadband Wireless Router
 product YAMAHA RTW65I		0x4002	NetVolante RTW65i Broadband&ISDN Wireless Router
+product YAMAHA RTA55I		0x4004	NetVolante RTA55i Broadband VoIP Router
 
 /* Yano products */
 product YANO U640MO		0x0101	U640MO-03
 
+/* Zeevo, Inc. products */
+product ZEEVO BLUETOOTH		0x07d0	BT-500 Bluetooth USB Adapter
+
+/* Z-Com products */
+product ZCOM 725		0x0002	725/726 Prism2.5 WLAN
+
 /* Zoom Telephonics, Inc. products */
 product ZOOM 2986L		0x9700	2986L Fax modem