Synchronize usbdevs with NetBSD and regenerate.
authorMatthew Dillon <dillon@dragonflybsd.org>
Fri, 17 Dec 2004 20:50:46 +0000 (20:50 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Fri, 17 Dec 2004 20:50:46 +0000 (20:50 +0000)
Submitted-by: Barry Bouwsma
sys/bus/usb/usbdevs
sys/bus/usb/usbdevs.h
sys/bus/usb/usbdevs_data.h

index 1331684..aba711b 100644 (file)
@@ -1,7 +1,5 @@
-$FreeBSD$
-
 /*
- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -37,23 +35,20 @@ $FreeBSD$
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $
- * $DragonFly: src/sys/bus/usb/Attic/usbdevs,v 1.12 2004/12/10 20:37:55 dillon Exp $
+ * $DragonFly: src/sys/bus/usb/Attic/usbdevs,v 1.13 2004/12/17 20:50:46 dillon Exp $
+ * $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $
  */
 
 
 /*
  * List of known USB vendors
  *
- * Adding an ID and its string description for a device to the usbdevs
- * file, enables the USB stack to print a useful description of the
- * device that was connected.
- *
- * Please note that these IDs do not do anything. Adding an ID here
- * 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.
+ * 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.
  *
  * After adding a vendor ID VNDR and a product ID PRDCT you will have the
  * following extra defines:
@@ -64,6 +59,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
@@ -101,13 +97,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
@@ -144,31 +140,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
@@ -177,9 +174,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
@@ -210,6 +207,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
@@ -228,11 +226,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
@@ -249,11 +247,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
@@ -268,7 +266,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
@@ -310,8 +308,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
@@ -322,6 +323,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
@@ -335,21 +337,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
@@ -362,7 +369,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
@@ -376,9 +383,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
@@ -386,7 +393,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
@@ -401,20 +409,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
@@ -427,10 +440,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
@@ -438,33 +452,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
@@ -473,9 +506,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
@@ -486,8 +533,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
@@ -498,6 +545,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
@@ -508,12 +560,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 */
@@ -521,23 +576,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
@@ -554,8 +632,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
@@ -587,23 +668,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
@@ -614,11 +713,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 */
@@ -628,7 +731,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
@@ -642,8 +746,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
@@ -652,8 +761,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
@@ -665,9 +779,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
@@ -675,11 +808,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
@@ -688,7 +829,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
 
@@ -698,18 +839,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
@@ -722,10 +868,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
@@ -734,6 +884,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
@@ -744,8 +905,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 */
@@ -762,10 +923,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 */
@@ -811,8 +974,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
@@ -824,19 +996,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
@@ -849,6 +1038,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 */
@@ -871,79 +1061,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 */
@@ -952,17 +1205,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 USA18_NF       0x0104  USA-18 serial adapter (no firmware)
 product KEYSPAN USA18X         0x0105  USA-18X serial adapter
 product KEYSPAN USA19W         0x0106  USA-19W serial adapter
+product KEYSPAN USA19          0x0107  USA-19 serial adapter
+product KEYSPAN USA19W         0x0108  USA-19W serial adapter
 product KEYSPAN USA49W         0x0109  USA-49W serial adapter
+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                0x0118  USA-19QW serial adapter
+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 */
@@ -972,6 +1248,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
@@ -979,6 +1256,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
 
@@ -988,9 +1266,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
@@ -1002,10 +1283,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
@@ -1015,18 +1303,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
 
@@ -1050,19 +1347,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
@@ -1070,6 +1375,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
@@ -1077,8 +1385,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 */
@@ -1093,6 +1403,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
 
@@ -1102,19 +1413,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
@@ -1130,34 +1458,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
@@ -1167,7 +1521,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
@@ -1183,11 +1552,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
@@ -1198,8 +1575,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
@@ -1209,6 +1592,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
@@ -1219,6 +1613,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
@@ -1244,30 +1651,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
@@ -1275,29 +1708,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
@@ -1306,17 +1763,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)
@@ -1326,7 +1793,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
@@ -1347,16 +1815,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
@@ -1371,6 +1846,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
@@ -1384,15 +1862,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)
 
@@ -1406,26 +1894,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
 
@@ -1443,9 +1946,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
 
@@ -1457,6 +1968,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
@@ -1473,6 +1987,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 */
@@ -1480,15 +1995,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
 
index 89cf7ff..56ebdf1 100644 (file)
@@ -1,11 +1,11 @@
 /*
- *     $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.9 2004/09/27 05:30:16 asmodai Exp $
+ *     $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.10 2004/12/17 20:50:46 dillon Exp $
  *
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  */
 /*
- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
+ * $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $
+ * $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.10 2004/12/17 20:50:46 dillon Exp $
+ * $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $
  */
 
 
 /*
  * List of known USB vendors
  *
- * Adding an ID and its string description for a device to the usbdevs
- * file, enables the USB stack to print a useful description of the
- * device that was connected.
- *
- * Please note that these IDs do not do anything. Adding an ID here
- * 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.
+ * 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.
  *
  * After adding a vendor ID VNDR and a product ID PRDCT you will have the
  * following extra defines:
@@ -66,6 +65,7 @@
  * make the device recognised by the appropriate device driver.
  */
 
+#define        USB_VENDOR_EGALAX2      0x0123          /* eGalax, Inc. */
 #define        USB_VENDOR_LTS  0x0386          /* LTS */
 #define        USB_VENDOR_AOX  0x03e8          /* AOX */
 #define        USB_VENDOR_THESYS       0x03e9          /* Thesys Microelectronics */
 #define        USB_VENDOR_MELCO        0x0411          /* Melco */
 #define        USB_VENDOR_WINBOND      0x0416          /* Winbond Electronics */
 #define        USB_VENDOR_PHOENIX      0x041a          /* Phoenix Technologies Ltd. */
-#define        USB_VENDOR_CREATIVE     0x041e          /* Creative */
+#define        USB_VENDOR_CREATIVE     0x041e          /* Creative Labs */
 #define        USB_VENDOR_NOKIA        0x0421          /* Nokia Corporation */
 #define        USB_VENDOR_ADI  0x0422          /* ADI Systems */
 #define        USB_VENDOR_CATC 0x0423          /* Computer Access Technology */
 #define        USB_VENDOR_SMC2 0x0424          /* Standard Microsystems */
 #define        USB_VENDOR_MOTOROLA_HK  0x0425          /* Motorola Semiconductors HK, Ltd. */
-#define        USB_VENDOR_GRAVIS       0x0428          /* Advanced Gravis Computer Tech. */
+#define        USB_VENDOR_GRAVIS       0x0428          /* Advanced Gravis Computer */
 #define        USB_VENDOR_CIRRUSLOGIC  0x0429          /* Cirrus Logic */
 #define        USB_VENDOR_INNOVATIVE   0x042c          /* Innovative Semiconductors */
 #define        USB_VENDOR_MOLEX        0x042f          /* Molex */
 #define        USB_VENDOR_SEMTECH      0x047a          /* Semtech Corporation */
 #define        USB_VENDOR_KENSINGTON   0x047d          /* Kensington */
 #define        USB_VENDOR_LUCENT       0x047e          /* Lucent */
-#define        USB_VENDOR_KYOCERA      0x0482          /* Kyocera Corp. */
+#define        USB_VENDOR_PLANTRONICS  0x047f          /* Plantronics */
+#define        USB_VENDOR_KYOCERA      0x0482          /* Kyocera */
 #define        USB_VENDOR_STMICRO      0x0483          /* STMicroelectronics */
 #define        USB_VENDOR_FOXCONN      0x0489          /* Foxconn / Hon Hai */
 #define        USB_VENDOR_YAMAHA       0x0499          /* YAMAHA */
-#define        USB_VENDOR_COMPAQ       0x049f          /* Compaq Computers */
-#define        USB_VENDOR_HITACHI      0x04a4          /* Hitachi, Ltd. */
+#define        USB_VENDOR_COMPAQ       0x049f          /* Compaq */
+#define        USB_VENDOR_HITACHI      0x04a4          /* Hitachi */
 #define        USB_VENDOR_ACERP        0x04a5          /* Acer Peripherals */
 #define        USB_VENDOR_VISIONEER    0x04a7          /* Visioneer */
 #define        USB_VENDOR_CANON        0x04a9          /* Canon */
 #define        USB_VENDOR_NIKON        0x04b0          /* Nikon */
 #define        USB_VENDOR_PAN  0x04b1          /* Pan International */
-#define        USB_VENDOR_IBM  0x04b3          /* IBM Corporation */
+#define        USB_VENDOR_IBM  0x04b3          /* IBM */
 #define        USB_VENDOR_CYPRESS      0x04b4          /* Cypress Semiconductor */
 #define        USB_VENDOR_ROHM 0x04b5          /* ROHM LSI Systems USA */
 #define        USB_VENDOR_COMPAL       0x04b7          /* Compal Electronics */
 #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_IODATA       0x04bb          /* I-O Data */
 #define        USB_VENDOR_TDK  0x04bf          /* TDK */
 #define        USB_VENDOR_3COMUSR      0x04c1          /* U.S. Robotics */
 #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 */
-#define        USB_VENDOR_TOSHIBAAM    0x04c6          /* Toshiba America Electronic Components */
+#define        USB_VENDOR_TOSHIBAAM    0x04c6          /* Toshiba America */
 #define        USB_VENDOR_MICROMACRO   0x04c7          /* Micro Macro Technologies */
 #define        USB_VENDOR_KONICA       0x04c8          /* Konica */
 #define        USB_VENDOR_LITEON       0x04ca          /* Lite-On Technology */
 #define        USB_VENDOR_TATUNG       0x04cd          /* Tatung Co. Of America */
 #define        USB_VENDOR_SCANLOGIC    0x04ce          /* ScanLogic */
 #define        USB_VENDOR_MYSON        0x04cf          /* Myson Technology */
-#define        USB_VENDOR_DIGI2        0x04d0          /* Digi International */
+#define        USB_VENDOR_DIGI2        0x04d0          /* Digi */
 #define        USB_VENDOR_ITTCANON     0x04d1          /* ITT Canon */
-#define        USB_VENDOR_ALTEC        0x04d2          /* Altec Lansing Technologies */
+#define        USB_VENDOR_ALTEC        0x04d2          /* Altec Lansing */
 #define        USB_VENDOR_LSI  0x04d4          /* LSI Logic */
 #define        USB_VENDOR_MENTORGRAPHICS       0x04d6          /* Mentor Graphics */
 #define        USB_VENDOR_HOLTEK       0x04d9          /* Holtek Semiconductor */
 #define        USB_VENDOR_KAWATSU      0x050f          /* Kawatsu Semiconductor */
 #define        USB_VENDOR_FCI  0x0514          /* FCI Electronics */
 #define        USB_VENDOR_LONGWELL     0x0516          /* Longwell Electronics */
+#define        USB_VENDOR_COMPOSITE    0x0518          /* Composite */
 #define        USB_VENDOR_STAR 0x0519          /* Star Micronics */
 #define        USB_VENDOR_APC  0x051d          /* American Power Conversion */
 #define        USB_VENDOR_SCIATLANTA   0x051e          /* Scientific Atlanta */
 #define        USB_VENDOR_SYNOPSYS     0x053f          /* Synopsys */
 #define        USB_VENDOR_UNIACCESS    0x0540          /* Universal Access */
 #define        USB_VENDOR_VIEWSONIC    0x0543          /* ViewSonic */
-#define        USB_VENDOR_XIRLINK      0x0545          /* Xirlink / Veo */
+#define        USB_VENDOR_XIRLINK      0x0545          /* Xirlink */
 #define        USB_VENDOR_ANCHOR       0x0547          /* Anchor Chips */
 #define        USB_VENDOR_SONY 0x054c          /* Sony */
 #define        USB_VENDOR_FUJIXEROX    0x0550          /* Fuji Xerox */
-#define        USB_VENDOR_VISION       0x0553          /* VLSI Vision / STMicroelectronics Imaging */
+#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_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_AVM  0x057c          /* AVM */
 #define        USB_VENDOR_QUICKSHOT    0x057f          /* Quickshot */
 #define        USB_VENDOR_ROLAND       0x0582          /* Roland */
 #define        USB_VENDOR_ROCKFIRE     0x0583          /* Rockfire */
-#define        USB_VENDOR_RATOC        0x0584          /* RATOC Systems, Inc. */
+#define        USB_VENDOR_RATOC        0x0584          /* RATOC Systems */
 #define        USB_VENDOR_ZYXEL        0x0586          /* ZyXEL Communication */
 #define        USB_VENDOR_INFINEON     0x058b          /* Infineon Technologies */
 #define        USB_VENDOR_MICREL       0x058d          /* Micrel Semiconductor */
 #define        USB_VENDOR_ARC  0x05a3          /* ARC International */
 #define        USB_VENDOR_ORTEK        0x05a4          /* Ortek Technology */
 #define        USB_VENDOR_BOSE 0x05a7          /* Bose */
-#define        USB_VENDOR_OMNIVISION   0x05a9          /* OmniVision Technologies */
+#define        USB_VENDOR_OMNIVISION   0x05a9          /* OmniVision */
 #define        USB_VENDOR_INSYSTEM     0x05ab          /* In-System Design */
 #define        USB_VENDOR_APPLE        0x05ac          /* Apple Computer */
 #define        USB_VENDOR_YCCABLE      0x05ad          /* Y.C. Cable U.S.A */
 #define        USB_VENDOR_ACTLABS      0x061c          /* Act Labs */
 #define        USB_VENDOR_ALARIS       0x0620          /* Alaris */
 #define        USB_VENDOR_APEX 0x0624          /* Apex */
+#define        USB_VENDOR_VIVITAR      0x0636          /* Vivitar */
 #define        USB_VENDOR_AVISION      0x0638          /* Avision */
 #define        USB_VENDOR_TEAC 0x0644          /* TEAC */
+#define        USB_VENDOR_SGI  0x065e          /* Silicon Graphics */
+#define        USB_VENDOR_SANWASUPPLY  0x0663          /* Sanwa Supply */
 #define        USB_VENDOR_LINKSYS      0x066b          /* Linksys */
 #define        USB_VENDOR_ACERSA       0x066e          /* Acer Semiconductor America */
 #define        USB_VENDOR_SIGMATEL     0x066f          /* Sigmatel */
 #define        USB_VENDOR_ADVANCELOGIC 0x0680          /* Avance Logic */
 #define        USB_VENDOR_HAGIWARA     0x0693          /* Hagiwara Sys-Com */
 #define        USB_VENDOR_MINOLTA      0x0686          /* Minolta */
+#define        USB_VENDOR_CHPRODUCTS   0x068e          /* CH Products */
 #define        USB_VENDOR_CTX  0x0698          /* Chuntex */
 #define        USB_VENDOR_ASKEY        0x069a          /* Askey Computer */
 #define        USB_VENDOR_SAITEK       0x06a3          /* Saitek */
 #define        USB_VENDOR_ADS  0x06e1          /* ADS Technologies */
 #define        USB_VENDOR_ALCATELM     0x06e4          /* Alcatel Microelectronics */
 #define        USB_VENDOR_SIRIUS       0x06ea          /* Sirius Technologies */
+#define        USB_VENDOR_GUILLEMOT    0x06f8          /* Guillemot */
 #define        USB_VENDOR_BOSTON       0x06fd          /* Boston Acoustics */
 #define        USB_VENDOR_SMC  0x0707          /* Standard Microsystems */
 #define        USB_VENDOR_PUTERCOM     0x0708          /* Putercom */
 #define        USB_VENDOR_MCT  0x0711          /* MCT */
+#define        USB_VENDOR_IMATION      0x0718          /* Imation */
 #define        USB_VENDOR_SONYERICSSON 0x0731          /* Sony Ericsson */
+#define        USB_VENDOR_EICON        0x0734          /* Eicon Networks */
 #define        USB_VENDOR_DIGITALSTREAM        0x074e          /* Digital Stream */
 #define        USB_VENDOR_AUREAL       0x0755          /* Aureal Semiconductor */
 #define        USB_VENDOR_MIDIMAN      0x0763          /* Midiman */
 #define        USB_VENDOR_LINKSYS2     0x077b          /* Linksys */
 #define        USB_VENDOR_GRIFFIN      0x077d          /* Griffin Technology */
-#define        USB_VENDOR_SANDISK      0x0781          /* SanDisk Corp */
+#define        USB_VENDOR_SANDISK      0x0781          /* SanDisk */
+#define        USB_VENDOR_JENOPTIK     0x0784          /* Jenoptik */
 #define        USB_VENDOR_LOGITEC      0x0789          /* Logitec Corp */
 #define        USB_VENDOR_BRIMAX       0x078e          /* Brimax */
 #define        USB_VENDOR_AXIS 0x0792          /* Axis Communications */
 #define        USB_VENDOR_ABL  0x0794          /* ABL Electronics */
+#define        USB_VENDOR_SUNCOMM      0x079c          /* Sun Communications, Inc. */
 #define        USB_VENDOR_ALFADATA     0x079d          /* Alfadata Computer */
 #define        USB_VENDOR_NATIONALTECH 0x07a2          /* National Technical Systems */
 #define        USB_VENDOR_ONNTO        0x07a3          /* Onnto */
 #define        USB_VENDOR_OLYMPUS      0x07b4          /* Olympus */
 #define        USB_VENDOR_ABOCOM       0x07b8          /* AboCom Systems */
 #define        USB_VENDOR_KEISOKUGIKEN 0x07c1          /* Keisokugiken */
-#define        USB_VENDOR_ONSPEC       0x07c4          /* OnSpec Electronic */
+#define        USB_VENDOR_ONSPEC       0x07c4          /* OnSpec */
 #define        USB_VENDOR_APG  0x07c5          /* APG Cash Drawer */
 #define        USB_VENDOR_BUG  0x07c8          /* B.U.G. */
 #define        USB_VENDOR_ALLIEDTELESYN        0x07c9          /* Allied Telesyn International */
 #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_SOURCENEXT   0x0833          /* SOURCENEXT */
+#define        USB_VENDOR_ACTIONSTAR   0x0835          /* Action Star Enterprise */
 #define        USB_VENDOR_SAMSUNG_TECHWIN      0x0839          /* Samsung Techwin */
 #define        USB_VENDOR_ACCTON       0x083a          /* Accton Technology */
 #define        USB_VENDOR_DIAMOND      0x0841          /* Diamond */
 #define        USB_VENDOR_NETGEAR      0x0846          /* BayNETGEAR */
 #define        USB_VENDOR_ACTIVEWIRE   0x0854          /* ActiveWire */
+#define        USB_VENDOR_BBELECTRONICS        0x0856          /* B&B Electronics */
 #define        USB_VENDOR_PORTGEAR     0x085a          /* PortGear */
-#define        USB_VENDOR_SYSTEMTALKS  0x086e          /* System TALKS, Inc. */
+#define        USB_VENDOR_NETGEAR2     0x0864          /* Netgear */
+#define        USB_VENDOR_SYSTEMTALKS  0x086e          /* System Talks */
 #define        USB_VENDOR_METRICOM     0x0870          /* Metricom */
 #define        USB_VENDOR_ADESSOKBTEK  0x087c          /* ADESSO/Kbtek America */
 #define        USB_VENDOR_JATON        0x087d          /* Jaton */
 #define        USB_VENDOR_EXTENDED     0x08e9          /* Extended Systems */
 #define        USB_VENDOR_MSYSTEMS     0x08ec          /* M-Systems */
 #define        USB_VENDOR_AUTHENTEC    0x08ff          /* AuthenTec */
+#define        USB_VENDOR_AUDIOTECHNICA        0x0909          /* Audio-Technica */
+#define        USB_VENDOR_TRUMPION     0x090a          /* Trumpion Microelectronics */
 #define        USB_VENDOR_ALATION      0x0910          /* Alation Systems */
+#define        USB_VENDOR_CONCORDCAMERA        0x0919          /* Concord Camera */
 #define        USB_VENDOR_GOHUBS       0x0921          /* GoHubs */
 #define        USB_VENDOR_BIOMETRIC    0x0929          /* American Biometric Company */
-#define        USB_VENDOR_TOSHIBA      0x0930          /* Toshiba Corporation */
-#define        USB_VENDOR_PLEXTOR      0x093b          /* Plextor Corp. */
-#define        USB_VENDOR_INTREPIDCS   0x093c          /* Intrepid Control Systems */
+#define        USB_VENDOR_TOSHIBA      0x0930          /* Toshiba */
+#define        USB_VENDOR_PLEXTOR      0x093b          /* Plextor */
+#define        USB_VENDOR_INTREPIDCS   0x093c          /* Intrepid */
 #define        USB_VENDOR_YANO 0x094f          /* Yano */
 #define        USB_VENDOR_KINGSTON     0x0951          /* Kingston Technology */
 #define        USB_VENDOR_BLUEWATER    0x0956          /* BlueWater Systems */
 #define        USB_VENDOR_AGILENT      0x0957          /* Agilent Technologies */
 #define        USB_VENDOR_PORTSMITH    0x095a          /* Portsmith */
+#define        USB_VENDOR_ACERW        0x0967          /* Acer */
 #define        USB_VENDOR_ADIRONDACK   0x0976          /* Adirondack Wire & Cable */
 #define        USB_VENDOR_BECKHOFF     0x0978          /* Beckhoff */
+#define        USB_VENDOR_MINDSATWORK  0x097a          /* Minds At Work */
+#define        USB_VENDOR_POINTCHIPS   0x09a6          /* PointChips */
 #define        USB_VENDOR_INTERSIL     0x09aa          /* Intersil */
 #define        USB_VENDOR_ALTIUS       0x09b3          /* Altius Solutions */
 #define        USB_VENDOR_ARRIS        0x09c1          /* Arris Interactive */
 #define        USB_VENDOR_ARESCOM      0x09f5          /* ARESCOM */
 #define        USB_VENDOR_BAY  0x09f9          /* Bay Associates */
 #define        USB_VENDOR_ALTERA       0x09fb          /* Altera */
-#define        USB_VENDOR_CSR  0x0a12          /* Cambridge Silicon Radio Ltd. */
+#define        USB_VENDOR_CSR  0x0a12          /* Cambridge Silicon Radio */
 #define        USB_VENDOR_TREK 0x0a16          /* Trek Technology */
 #define        USB_VENDOR_ASAHIOPTICAL 0x0a17          /* Asahi Optical */
 #define        USB_VENDOR_BOCASYSTEMS  0x0a43          /* Boca Systems */
+#define        USB_VENDOR_MEDIAGEAR    0x0a48          /* MediaGear */
 #define        USB_VENDOR_BROADCOM     0x0a5c          /* Broadcom */
 #define        USB_VENDOR_GREENHOUSE   0x0a6b          /* GREENHOUSE */
 #define        USB_VENDOR_GEOCAST      0x0a79          /* Geocast Network Systems */
 #define        USB_VENDOR_NEODIO       0x0aec          /* Neodio */
+#define        USB_VENDOR_VODAFONE     0x0af0          /* Vodafone */
 #define        USB_VENDOR_TODOS        0x0b0c          /* Todos Data System */
 #define        USB_VENDOR_SIIG2        0x0b39          /* SIIG */
+#define        USB_VENDOR_TEKRAM       0x0b3b          /* Tekram Technology */
 #define        USB_VENDOR_HAL  0x0b41          /* HAL Corporation */
-#define        USB_VENDOR_EMS  0x0b43          /* EMS Production Ltd. */
+#define        USB_VENDOR_EMS  0x0b43          /* EMS Production */
 #define        USB_VENDOR_NEC2 0x0b62          /* NEC */
 #define        USB_VENDOR_ATI2 0x0b6f          /* ATI */
+#define        USB_VENDOR_ZEEVO        0x0b7a          /* Zeevo, Inc. */
+#define        USB_VENDOR_KURUSUGAWA   0x0b7e          /* Kurusugawa Electronics, Inc. */
 #define        USB_VENDOR_ASIX 0x0b95          /* ASIX Electronics */
-#define        USB_VENDOR_REALTEK      0x0bda          /* RealTek */
+#define        USB_VENDOR_USR  0x0baf          /* U.S. Robotics */
+#define        USB_VENDOR_REALTEK      0x0bda          /* Realtek */
+#define        USB_VENDOR_ADDONICS2    0x0bf6          /* Addonics Technology */
 #define        USB_VENDOR_AGATE        0x0c08          /* Agate Technologies */
 #define        USB_VENDOR_DMI  0x0c0b          /* DMI */
-#define        USB_VENDOR_LUWEN        0x0c76          /* Luwen */
+#define        USB_VENDOR_CHICONY2     0x0c45          /* Chicony Electronics */
+#define        USB_VENDOR_SEALEVEL     0x0c52          /* Sealevel System */
+#define        USB_VENDOR_LUWEN        0x0c76          /* EasyDisk */
+#define        USB_VENDOR_ZCOM 0x0cde          /* Z-Com */
+#define        USB_VENDOR_TANGTOP      0x0d3d          /* Tangtop */
 #define        USB_VENDOR_SMC3 0x0d5c          /* Standard Microsystems */
 #define        USB_VENDOR_PNY  0x0d7d          /* PNY */
-#define        USB_VENDOR_MSI  0x0db0          /* Micro Star International */
-#define        USB_VENDOR_HAWKING      0x0e66          /* Hawking Technologies */
+#define        USB_VENDOR_ACDC 0x0d7e          /* American Computer & Digital Components */
+#define        USB_VENDOR_ABC  0x0d8c          /* ABC */
+#define        USB_VENDOR_MSI  0x0db0          /* Micro Star */
+#define        USB_VENDOR_HAWKING      0x0e66          /* Hawking */
+#define        USB_VENDOR_OTI  0x0ea0          /* Ours Technology */
+#define        USB_VENDOR_PILOTECH     0x0eaf          /* Pilotech */
+#define        USB_VENDOR_EGALAX       0x0eef          /* eGalax */
 #define        USB_VENDOR_MICROTUNE    0x0f4d          /* Microtune, Inc. */
 #define        USB_VENDOR_QUALCOMM2    0x1004          /* Qualcomm */
 #define        USB_VENDOR_WESTERN      0x1058          /* Western Digital */
 #define        USB_VENDOR_MOTOROLA     0x1063          /* Motorola */
+#define        USB_VENDOR_CCYU 0x1065          /* CCYU Technology */
 #define        USB_VENDOR_PLX  0x10b5          /* PLX */
 #define        USB_VENDOR_ASANTE       0x10bd          /* Asante */
 #define        USB_VENDOR_JRC  0x1145          /* Japan Radio Company */
 #define        USB_VENDOR_DELORME      0x1163          /* DeLorme Publishing */
-#define        USB_VENDOR_ACERCM       0x1189          /* Acer Communications & Multimedia Inc. */
+#define        USB_VENDOR_SERVERWORKS  0x1166          /* ServerWorks */
+#define        USB_VENDOR_ACERCM       0x1189          /* Acer Communications & Multimedia */
+#define        USB_VENDOR_TSUNAMI      0x1241          /* Tsunami */
+#define        USB_VENDOR_TWINMOS      0x126f          /* TwinMOS */
+#define        USB_VENDOR_CREATIVE2    0x1292          /* Creative Labs */
 #define        USB_VENDOR_BELKIN2      0x1293          /* Belkin Components */
+#define        USB_VENDOR_AINCOMM      0x12fd          /* Aincomm */
 #define        USB_VENDOR_MOBILITY     0x1342          /* Mobility */
 #define        USB_VENDOR_SHARK        0x13d2          /* Shark */
+#define        USB_VENDOR_SILICOM      0x1485          /* Silicom */
 #define        USB_VENDOR_SILICONPORTALS       0x1527          /* Silicon Portals */
 #define        USB_VENDOR_SOHOWARE     0x15e8          /* SOHOware */
 #define        USB_VENDOR_UMAX 0x1606          /* UMAX Data Systems */
 #define        USB_VENDOR_ACTIONTEC    0x1668          /* Actiontec Electronics */
 #define        USB_VENDOR_LINKSYS3     0x1915          /* Linksys */
 #define        USB_VENDOR_DLINK        0x2001          /* D-Link */
+#define        USB_VENDOR_ERICSSON     0x2282          /* Ericsson */
+#define        USB_VENDOR_MOTOROLA2    0x22b8          /* Motorola */
+#define        USB_VENDOR_TRIPPLITE    0x2478          /* Tripp-Lite */
+#define        USB_VENDOR_HIROSE       0x2631          /* Hirose Electric */
+#define        USB_VENDOR_NHJ  0x2770          /* NHJ */
+#define        USB_VENDOR_PLANEX       0x2c02          /* Planex Communications */
 #define        USB_VENDOR_VIDZMEDIA    0x3275          /* VidzMedia Pte Ltd */
+#define        USB_VENDOR_AEI  0x3334          /* AEI */
+#define        USB_VENDOR_PQI  0x3538          /* PQI */
 #define        USB_VENDOR_DAISY        0x3579          /* Daisy Technology */
+#define        USB_VENDOR_NI   0x3923          /* National Instruments */
+#define        USB_VENDOR_MICRONET     0x3980          /* Micronet Communications */
+#define        USB_VENDOR_IODATA2      0x40bb          /* I-O Data */
+#define        USB_VENDOR_IRIVER       0x4102          /* iRiver */
 #define        USB_VENDOR_DELL 0x413c          /* Dell */
+#define        USB_VENDOR_AVERATEC     0x50c2          /* Averatec */
+#define        USB_VENDOR_ONSPEC2      0x55aa          /* OnSpec Electronic Inc. */
 #define        USB_VENDOR_SITECOM      0x6189          /* Sitecom */
 #define        USB_VENDOR_INTEL        0x8086          /* Intel */
 #define        USB_VENDOR_HP2  0xf003          /* Hewlett Packard */
 
 /* 3Com products */
 #define        USB_PRODUCT_3COM_HOMECONN       0x009d          /* HomeConnect USB Camera */
-#define        USB_PRODUCT_3COM_3CREB96        0x00a0          /* Bluetooth USB dongle */
-#define        USB_PRODUCT_3COM_3C19250        0x03E8          /* 3C19250 Ethernet adapter */
+#define        USB_PRODUCT_3COM_3CREB96        0x00a0          /* Bluetooth USB Adapter */
+#define        USB_PRODUCT_3COM_3C19250        0x03e8          /* 3C19250 Ethernet adapter */
+#define        USB_PRODUCT_3COM_3CRSHEW696     0x0a01          /* 3CRSHEW696 Wireless adapter */
 #define        USB_PRODUCT_3COM_USR56K 0x3021          /* U.S.Robotics 56000 Voice Faxmodem Pro */
 #define        USB_PRODUCT_3COM_3C460  0x11f8          /* HomeConnect 3C460 */
 #define        USB_PRODUCT_3COM_3C460B 0x4601          /* HomeConnect 3C460B */
 #define        USB_PRODUCT_3COMUSR_HOMECONN    0x009d          /* 3Com HomeConnect camera */
 #define        USB_PRODUCT_3COMUSR_USR56K      0x3021          /* U.S.Robotics 56000 Voice Faxmodem Pro */
 
+/* ACDC products */
+#define        USB_PRODUCT_ACDC_HUB    0x2315          /* USB Pen Drive HUB */
+#define        USB_PRODUCT_ACDC_PEN    0x2317          /* USB Pen Drive with Secure Write */
+#define        USB_PRODUCT_ACDC_SECWRITE       0x2316          /* USB Pen Drive Secure Write */
+
 /* AboCom products */
 #define        USB_PRODUCT_ABOCOM_XX1  0x110c          /* XX1 */
 #define        USB_PRODUCT_ABOCOM_XX2  0x200c          /* XX2 */
 #define        USB_PRODUCT_ABOCOM_XX5  0x4007          /* XX5 */
 #define        USB_PRODUCT_ABOCOM_XX6  0x400b          /* XX6 */
 #define        USB_PRODUCT_ABOCOM_XX7  0x400c          /* XX7 */
+#define        USB_PRODUCT_ABOCOM_LCS8138TX    0x401a          /* LCS-8138TX */
 #define        USB_PRODUCT_ABOCOM_XX8  0x4102          /* XX8 */
 #define        USB_PRODUCT_ABOCOM_XX9  0x4104          /* XX9 */
+#define        USB_PRODUCT_ABOCOM_UFE2000      0x420a          /* UFE2000 USB2.0 Fast Ethernet Adapter */
 #define        USB_PRODUCT_ABOCOM_XX10 0xabc1          /* XX10 */
 
 /* Accton products */
 #define        USB_PRODUCT_ACCTON_USB320_EC    0x1046          /* USB320-EC Ethernet Adapter */
+#define        USB_PRODUCT_ACCTON_111  0x3503          /* T-Sinus 111 WLAN */
 #define        USB_PRODUCT_ACCTON_SS1001       0x5046          /* SpeedStream Ethernet Adapter */
 
 /* Acer Peripherals, Inc. products */
 #define        USB_PRODUCT_ACERP_ACERSCAN_320U 0x2022          /* Acerscan 320U */
 #define        USB_PRODUCT_ACERP_ACERSCAN_640U 0x2040          /* Acerscan 640U */
 #define        USB_PRODUCT_ACERP_ACERSCAN_620U 0x2060          /* Acerscan 620U */
-#define        USB_PRODUCT_ACERP_AWL300        0x9000          /* AWL300 Wireless adapter */
-#define        USB_PRODUCT_ACERP_AWL400        0x9001          /* AWL400 Wireless adapter */
+#define        USB_PRODUCT_ACERP_ATAPI 0x6003          /* ATA/ATAPI adapter */
+#define        USB_PRODUCT_ACERP_AWL300        0x9000          /* AWL300 */
+#define        USB_PRODUCT_ACERP_AWL400        0x9001          /* AWL400 */
+
+/* Acer Products */
+#define        USB_PRODUCT_ACERW_WARPLINK      0x0204          /* Warplink */
+
+/* Actiontec products */
+#define        USB_PRODUCT_ACTIONTEC_PRISM_25  0x0408          /* Prism2.5 WLAN */
+#define        USB_PRODUCT_ACTIONTEC_PRISM_25A 0x0421          /* Prism2.5 WLAN A */
+#define        USB_PRODUCT_ACTIONTEC_FREELAN   0x6106          /* ROPEX FreeLan 802.11b */
+#define        USB_PRODUCT_ACTIONTEC_UAT1      0x7605          /* UAT1 Wireless Ethernet adapter */
+
+/* ACTiSYS products */
+#define        USB_PRODUCT_ACTISYS_IR2000U     0x0011          /* ACT-IR2000U FIR */
 
 /* ActiveWire, Inc. products */
 #define        USB_PRODUCT_ACTIVEWIRE_IOBOARD  0x0100          /* I/O Board */
 #define        USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1      0x0101          /* I/O Board, rev. 1 firmware */
 
+/* Adaptec products */
+#define        USB_PRODUCT_ADAPTEC_AWN8020     0x0020          /* AWN-8020 WLAN */
+
+/* Addonics products */
+#define        USB_PRODUCT_ADDONICS2_205       0xa001          /* Cable 205 */
+
 /* Actiontec, Inc. products */
 #define        USB_PRODUCT_ACTIONTEC_UAT1      0x7605          /* UAT1 Wireless Ethernet adapter */
 
 /* ADMtek products */
-#define        USB_PRODUCT_ADMTEK_PEGASUS      0x0986          /* AN986 USB Ethernet adapter */
-#define        USB_PRODUCT_ADMTEK_PEGASUSII    0x8511          /* AN8511 USB Ethernet adapter */
-#define        USB_PRODUCT_ADMTEK_PEGASUSII_2  0x8513          /* AN8513 USB Ethernet adapter */
+#define        USB_PRODUCT_ADMTEK_PEGASUS      0x0986          /* AN986 USB Ethernet */
+#define        USB_PRODUCT_ADMTEK_PEGASUSII    0x8511          /* AN8511 USB Ethernet */
+#define        USB_PRODUCT_ADMTEK_PEGASUSII_2  0x8513          /* AN8513 Ethernet */
 
 /* ADS products */
-#define        USB_PRODUCT_ADS_UBS10BT 0x0008          /* UBS-10BT Ethernet adapter */
+#define        USB_PRODUCT_ADS_UBS10BT 0x0008          /* UBS-10BT Ethernet */
+#define        USB_PRODUCT_ADS_UBS10BTX        0x0009          /* UBS-10BT Ethernet */
+
+/* AEI products */
+#define        USB_PRODUCT_AEI_USBTOLAN        0x1701          /* AEI USB to Lan adapter */
 
 /* Agate Technologies products */
 #define        USB_PRODUCT_AGATE_QDRIVE        0x0378          /* Q-Drive */
 #define        USB_PRODUCT_AGFA_SNAPSCANE26    0x2097          /* SnapScan e26 */
 #define        USB_PRODUCT_AGFA_SNAPSCANE52    0x20fd          /* SnapScan e52 */
 
+/* AIPTEK International products */
+#define        USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3     0x504a          /* PenCam Mega 1.3 */
+
+/* Aincomm products */
+#define        USB_PRODUCT_AINCOMM_AWU2000B    0x1001          /* AWU2000B */
+
 /* AKS products */
 #define        USB_PRODUCT_AKS_USBHASP 0x0001          /* USB-HASP 0.06 */
 
 #define        USB_PRODUCT_APPLE_SPEAKERS      0x1101          /* Speakers */
 
 /* Asahi Optical products */
-#define        USB_PRODUCT_ASAHIOPTICAL_OPTIO230       0x0004          /* Digital camera */
+#define        USB_PRODUCT_ASAHIOPTICAL_OPTIO230       0x0004          /* PENTAX Optio230 */
 #define        USB_PRODUCT_ASAHIOPTICAL_OPTIO330       0x0006          /* Digital camera */
 
+/* Asante products */
+#define        USB_PRODUCT_ASANTE_EA   0x1427          /* Ethernet Adapter */
+
 /* ASIX Electronics products */
 #define        USB_PRODUCT_ASIX_AX88172        0x1720          /* USB 2.0 10/100 ethernet controller */
 
 #define        USB_PRODUCT_ATEN_UC1284 0x2001          /* Parallel printer adapter */
 #define        USB_PRODUCT_ATEN_UC10T  0x2002          /* 10Mbps ethernet adapter */
 #define        USB_PRODUCT_ATEN_UC232A 0x2008          /* Serial adapter */
+#define        USB_PRODUCT_ATEN_DSB650C        0x4000          /* DSB-650C */
+
+/* ATI products */
+#define        USB_PRODUCT_ATI2_205    0xa001          /* USB Cable 205 */
 
 /* Atmel Comp. products */
 #define        USB_PRODUCT_ATMEL_UHB124        0x3301          /* UHB124 hub */
 #define        USB_PRODUCT_ATMEL_DWL120        0x7603          /* DWL-120 Wireless adapter */
+#define        USB_PRODUCT_ATMEL_DWL900AP      0x5601          /* DWL-900AP Wireless access point */
 #define        USB_PRODUCT_ATMEL_BW002 0x7605          /* BW002 Wireless adapter */
-#define        USB_PRODUCT_ATMEL_AT76C505A     0x7614          /* AT76c505a Wireless adapter */
+#define        USB_PRODUCT_ATMEL_WL1130        0x7613          /* WL-1130 */
+#define        USB_PRODUCT_ATMEL_AT76C505A     0x7614          /* AT76C505A */
+#define        USB_PRODUCT_ATMEL_DWL_120       0x7603          /* DWL-120 */
+
+/* Audio-Technica products */
+#define        USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB     0x0009          /* ATC-HA4USB USB headphone */
+
+/* Avance Logic products */
+#define        USB_PRODUCT_AVANCELOGIC_USBAUDIO        0x0100          /* USB Audio Speaker */
+
+/* Averatec products */
+#define        USB_PRODUCT_AVERATEC_USBWLAN    0x4013          /* WLAN */
 
 /* Avision products */
 #define        USB_PRODUCT_AVISION_1200U       0x0268          /* 1200U scanner */
 
+/* B&B Electronics products */
+#define        USB_PRODUCT_BBELECTRONICS_USOTL4        0xAC01          /* uLinks Isolated RS-422/485 to USB adapter */
+
 /* Belkin products */
 /*product BELKIN F5U111                0x????  F5U111 Ethernet adapter*/
 #define        USB_PRODUCT_BELKIN2_F5U002      0x0002          /* F5U002 Parallel printer adapter */
-#define        USB_PRODUCT_BELKIN_USB2LAN      0x0121          /* USB to LAN Converter */
 #define        USB_PRODUCT_BELKIN_F5U103       0x0103          /* F5U103 Serial adapter */
 #define        USB_PRODUCT_BELKIN_F5U109       0x0109          /* F5U109 Serial adapter */
+#define        USB_PRODUCT_BELKIN_F5U409       0x0409          /* F5U409 Serial */
+#define        USB_PRODUCT_BELKIN_SCSI 0x0115          /* SCSI Adaptor */
+#define        USB_PRODUCT_BELKIN_USB2LAN      0x0121          /* USB to LAN Converter */
 #define        USB_PRODUCT_BELKIN_F5U208       0x0208          /* F5U208 VideoBus II */
+#define        USB_PRODUCT_BELKIN_F5U237       0x0237          /* F5U237 USB 2.0 7-Port Hub */
 #define        USB_PRODUCT_BELKIN_F5U409       0x0409          /* F5U409 Serial adapter */
+#define        USB_PRODUCT_BELKIN_UPS  0x0980          /* UPS */
 #define        USB_PRODUCT_BELKIN_F5U120       0x1203          /* F5U120-PC Hub */
 
 /* Billionton products */
 #define        USB_PRODUCT_BILLIONTON_USBE100  0x8511          /* USBE100 */
 
 /* Broadcom products */
-#define        USB_PRODUCT_BROADCOM_BCM2033    0x2033          /* BCM2033 Bluetooth USB dongle */
+#define        USB_PRODUCT_BROADCOM_BCM2033    0x2000          /* BCM2033 */
+#define        USB_PRODUCT_BROADCOM_BCM2033NF  0x2033          /* BCM2033 (no firmware) */
 
 /* Brother Industries products */
 #define        USB_PRODUCT_BROTHER_HL1050      0x0002          /* HL-1050 laser printer */
 #define        USB_PRODUCT_CANON_N676U 0x220d          /* CanoScan N676U */
 #define        USB_PRODUCT_CANON_N1240U        0x220e          /* CanoScan N1240U */
 #define        USB_PRODUCT_CANON_S10   0x3041          /* PowerShot S10 */
+#define        USB_PRODUCT_CANON_S20   0x3043          /* PowerShot S20 */
 #define        USB_PRODUCT_CANON_S100  0x3045          /* PowerShot S100 */
+#define        USB_PRODUCT_CANON_S100_EU       0x3047          /* PowerShot S100 */
+#define        USB_PRODUCT_CANON_G1    0x3048          /* PowerShot G1 */
+#define        USB_PRODUCT_CANON_A20   0x304e          /* PowerShot A20 */
 #define        USB_PRODUCT_CANON_S200  0x3065          /* PowerShot S200 */
+#define        USB_PRODUCT_CANON_EOS300D       0x3084          /* EOS 300D / Digital Rebel */
 
 /* CATC products */
 #define        USB_PRODUCT_CATC_NETMATE        0x000a          /* Netmate ethernet adapter */
 #define        USB_PRODUCT_CATC_ANDROMEDA      0x1237          /* Andromeda hub */
 
 /* CASIO products */
+#define        USB_PRODUCT_CASIO_QV    0x1001          /* QV DigitalCamera */
+#define        USB_PRODUCT_CASIO_BE300 0x2002          /* BE-300 PDA */
 #define        USB_PRODUCT_CASIO_NAMELAND      0x4001          /* CASIO Nameland EZ-USB */
 
+/* CCYU Technology products */
+#define        USB_PRODUCT_CCYU_EASYDISK       0x2136          /* EasyDisk Portable Device */
+
 /* Cherry products */
 #define        USB_PRODUCT_CHERRY_MY3000KBD    0x0001          /* My3000 keyboard */
 #define        USB_PRODUCT_CHERRY_MY3000HUB    0x0003          /* My3000 hub */
 
 /* Chicony products */
 #define        USB_PRODUCT_CHICONY_KB8933      0x0001          /* KB-8933 keyboard */
+#define        USB_PRODUCT_CHICONY2_TWINKLECAM 0x600d          /* TwinkleCam USB camera */
+
+/* CH Products */
+#define        USB_PRODUCT_CHPRODUCTS_PROTHROTTLE      0x00f1          /* Pro Throttle */
+#define        USB_PRODUCT_CHPRODUCTS_PROPEDALS        0x00f2          /* Pro Pedals */
+#define        USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK     0x00f3          /* Fighterstick */
+#define        USB_PRODUCT_CHPRODUCTS_FLIGHTYOKE       0x00ff          /* Flight Sim Yoke */
 
 /* Compaq products */
+#define        USB_PRODUCT_COMPAQ_IPAQPOCKETPC 0x0003          /* iPAQ PocketPC */
+#define        USB_PRODUCT_COMPAQ_A1500        0x0012          /* A1500 */
+#define        USB_PRODUCT_COMPAQ_W100 0x0033          /* W100 */
+#define        USB_PRODUCT_COMPAQ_W200 0x0076          /* WLAN MultiPort W200 */
 #define        USB_PRODUCT_COMPAQ_PJB100       0x504a          /* Personal Jukebox PJB100 */
+#define        USB_PRODUCT_COMPAQ_IPAQLINUX    0x505a          /* iPAQ Linux */
+#define        USB_PRODUCT_COMPAQ_HNE200       0x8511          /* HNE-200 USB Ethernet adapter */
+
+/* Composite Corp products looks the same as "TANGTOP" */
+#define        USB_PRODUCT_COMPOSITE_USBPS2    0x0001          /* USB to PS2 Adaptor */
+
+/* Concord Camera products */
+#define        USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X      0x0100          /* Eye Q 3x */
 
 /* Connectix products */
 #define        USB_PRODUCT_CONNECTIX_QUICKCAM  0x0001          /* QuickCam */
 /* Corega products */
 #define        USB_PRODUCT_COREGA_ETHER_USB_T  0x0001          /* Ether USB-T */
 #define        USB_PRODUCT_COREGA_FETHER_USB_TX        0x0004          /* FEther USB-TX */
+#define        USB_PRODUCT_COREGA_WLAN_USB_USB_11      0x000c          /* WirelessLAN USB-11 */
 #define        USB_PRODUCT_COREGA_FETHER_USB_TXS       0x000d          /* FEther USB-TXS */
+#define        USB_PRODUCT_COREGA_WLANUSB      0x0012          /* Wireless LAN USB Stick-11 */
+#define        USB_PRODUCT_COREGA_FETHER_USB2_TX       0x0017          /* FEther USB2-TX */
+#define        USB_PRODUCT_COREGA_WLUSB_11_KEY 0x001a          /* ULUSB-11 Key */
 #define        USB_PRODUCT_COREGA_FETHER_USB_TXC       0x9601          /* FEther USB-TXC */
 
 /* Creative products */
 #define        USB_PRODUCT_CREATIVE_NOMAD_II   0x1002          /* Nomad II MP3 player */
+#define        USB_PRODUCT_CREATIVE_NOMAD_IIMG 0x4004          /* Nomad II MG */
+#define        USB_PRODUCT_CREATIVE_NOMAD      0x4106          /* Nomad */
+
+#define        USB_PRODUCT_CREATIVE2_VOIP_BLASTER      0x0258          /* Voip Blaster */
 
 /* Crystalfontz products */
 #define        USB_PRODUCT_FTDI_CFA_631        0xfc0c          /* Crystalfontz CFA-631 USB LCD */
 #define        USB_PRODUCT_FTDI_CFA_634        0xfc09          /* Crystalfontz CFA-634 USB LCD */
 #define        USB_PRODUCT_FTDI_SEMC_DSS20     0xfc82          /* SEMC DSS-20 SyncStation */
 
-/* Cambridge Silicon Radio Ltd. products */
+/* Cambridge Silicon Radio products */
 #define        USB_PRODUCT_CSR_BT_DONGLE       0x0001          /* Bluetooth USB dongle */
 #define        USB_PRODUCT_CSR_CSRDFU  0xffff          /* USB Bluetooth Device in DFU State */
 
 /* Cypress Semiconductor products */
 #define        USB_PRODUCT_CYPRESS_MOUSE       0x0001          /* mouse */
 #define        USB_PRODUCT_CYPRESS_THERMO      0x0002          /* thermometer */
+#define        USB_PRODUCT_CYPRESS_KBDHUB      0x0101          /* Keyboard/Hub */
 #define        USB_PRODUCT_CYPRESS_FMRADIO     0x1002          /* FM Radio */
 #define        USB_PRODUCT_CYPRESS_SLIM_HUB    0x6560          /* Slim Hub */
 
 /* Daisy Technology products */
-#define        USB_PRODUCT_DAISY_DMC   0x6901          /* USB MultiMedia Reader */
+#define        USB_PRODUCT_DAISY_DMC   0x6901          /* PhotoClip USBMediaReader */
 
 /* Dallas Semiconductor products */
 #define        USB_PRODUCT_DALLAS_J6502        0x4201          /* J-6502 speakers */
+#define        USB_PRODUCT_DALLAS_USB_FOB_IBUTTON      0x2490          /* USB-FOB/iBUTTON */
 
 /* Dell products */
 #define        USB_PRODUCT_DELL_PORT   0x0058          /* Port Replicator */
-#define        USB_PRODUCT_DELL_BC02   0x8000          /* BC02 Bluetooth USB Adapter */
+#define        USB_PRODUCT_DELL_X3     0x4002          /* Dell Axim X3 PDA */
+#define        USB_PRODUCT_DELL_X30    0x4003          /* Dell Axim X30 PDA */
+#define        USB_PRODUCT_DELL_BC02   0x8000          /* Dell BC02 Bluetooth USB Adapter */
+#define        USB_PRODUCT_DELL_TM1180 0x8100          /* TrueMobile 1180 WLAN */
 
 /* Delorme Paublishing products */
 #define        USB_PRODUCT_DELORME_EARTHMATE   0x0100          /* Earthmate GPS */
 #define        USB_PRODUCT_DIGI_ACCELEPORT4    0x0004          /* AccelePort USB 4 */
 #define        USB_PRODUCT_DIGI_ACCELEPORT8    0x0008          /* AccelePort USB 8 */
 
+/* Digital Stream Corp. products */
+#define        USB_PRODUCT_DIGITALSTREAM_PS2   0x0001          /* PS/2 Active Adapter */
+
 /* D-Link products */
 /*product DLINK DSBS25         0x0100  DSB-S25 serial adapter*/
 #define        USB_PRODUCT_DLINK_DUBE100       0x1a00          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX4     0x200c          /* 10/100 ethernet adapter */
+#define        USB_PRODUCT_DLINK_DWL122        0x3700          /* Wireless DWL122 */
 #define        USB_PRODUCT_DLINK_DSB650C       0x4000          /* 10Mbps ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX1     0x4001          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX      0x4002          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX2     0x4102          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650        0xabc1          /* 10/100 ethernet adapter */
 
+/* eGalax Products */
+#define        USB_PRODUCT_EGALAX_TPANEL       0x0001          /* Touch Panel */
+#define        USB_PRODUCT_EGALAX_TPANEL2      0x0002          /* Touch Panel */
+#define        USB_PRODUCT_EGALAX2_TPANEL      0x0001          /* Touch Panel */
+
+/* DMI products */
+#define        USB_PRODUCT_DMI_SA2_0   0xb001          /* Storage Adapter */
+
+/* Eicon Networks */
+#define        USB_PRODUCT_EICON_DIVA852       0x4905          /* Diva 852 ISDN TA */
+
 /* EIZO products */
 #define        USB_PRODUCT_EIZO_HUB    0x0000          /* hub */
 #define        USB_PRODUCT_EIZO_MONITOR        0x0001          /* monitor */
 #define        USB_PRODUCT_ELECOM_LDUSBTX1     0x4002          /* LD-USB/TX */
 #define        USB_PRODUCT_ELECOM_LDUSBLTX     0x4005          /* LD-USBL/TX */
 #define        USB_PRODUCT_ELECOM_LDUSBTX2     0x400b          /* LD-USB/TX */
-#define        USB_PRODUCT_ELECOM_UCSGT        0x5003          /* UC-SGT */
-#define        USB_PRODUCT_ELECOM_UCSGT0       0x5004          /* UC-SGT */
+#define        USB_PRODUCT_ELECOM_UCSGT        0x5003          /* UC-SGT serial adapter */
+#define        USB_PRODUCT_ELECOM_UCSGT0       0x5004          /* UC-SGT0 Serial */
 #define        USB_PRODUCT_ELECOM_LDUSBTX3     0xabc1          /* LD-USB/TX */
 
 /* Elsa products */
 #define        USB_PRODUCT_ENTREGA_4S  0x0004          /* 4S serial connector */
 #define        USB_PRODUCT_ENTREGA_E45 0x0005          /* E45 Ethernet adapter */
 #define        USB_PRODUCT_ENTREGA_CENTRONICS  0x0006          /* Centronics connector */
+#define        USB_PRODUCT_ENTREGA_XX1 0x0008          /* Ethernet Adapter */
 #define        USB_PRODUCT_ENTREGA_1S9 0x0093          /* 1S9 serial connector */
 #define        USB_PRODUCT_ENTREGA_EZUSB       0x8000          /* EZ-USB */
 /*product ENTREGA SERIAL       0x8001  DB25 Serial connector*/
 #define        USB_PRODUCT_ENTREGA_2U4S        0x8004          /* 2U4S serial connector/usb hub */
+#define        USB_PRODUCT_ENTREGA_XX2 0x8005          /* Ethernet Adapter */
 /*product ENTREGA SERIAL_DB9   0x8093  DB9 Serial connector*/
 
 /* Epson products */
 #define        USB_PRODUCT_FREECOM_DVD 0xfc01          /* Connector for DVD drive */
 
 /* Future Technology Devices products */
-#define        USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372          /* 8U100AX Serial converter */
 #define        USB_PRODUCT_FTDI_SERIAL_8U232AM 0x6001          /* 8U232AM Serial converter */
+#define        USB_PRODUCT_FTDI_PS2KBDMS       0x8371          /* PS/2 Keyboard/Mouse */
+#define        USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372          /* 8U100AX Serial converter */
+#define        USB_PRODUCT_FTDI_LCD_MX200_USB  0xfa01          /* Matrix Orbital MX200 Series LCD */
+#define        USB_PRODUCT_FTDI_LCD_LK202_24_USB       0xfa03          /* Matrix Orbital LK202-24 LCD */
+#define        USB_PRODUCT_FTDI_LCD_LK204_24   0xfa04          /* Matrix Orbital LK204-24 LCD */
+#define        USB_PRODUCT_FTDI_LCD_CFA_632    0xfc08          /* Crystalfontz CFA-632 LCD */
+#define        USB_PRODUCT_FTDI_LCD_CFA_634    0xfc09          /* Crystalfontz CFA-634 LCD */
+#define        USB_PRODUCT_FTDI_LCD_CFA_633    0xfc0b          /* Crystalfontz CFA-633 LCD */
+#define        USB_PRODUCT_FTDI_CFA_631        0xfc0c          /* Crystalfontz CFA-631 LCD */
+#define        USB_PRODUCT_FTDI_SEMC_DSS20     0xfc82          /* SEMC DSS-20 SyncStation */
 
 /* Fuji photo products */
 #define        USB_PRODUCT_FUJIPHOTO_MASS0100  0x0100          /* Mass Storage */
 #define        USB_PRODUCT_GENERALINSTMNTS_SB5100      0x5100          /* SURFboard SB5100 Cable modem */
 
 /* Genesys Logic products */
+#define        USB_PRODUCT_GENESYS_GENELINK    0x05e3          /* GeneLink Host-Host Bridge */
 #define        USB_PRODUCT_GENESYS_GL650       0x0604          /* GL650 Hub */
 #define        USB_PRODUCT_GENESYS_GL641USB    0x0700          /* GL641USB CompactFlash Card Reader */
-#define        USB_PRODUCT_GENESYS_GL641USB2IDE_2      0x0701          /* GL641USB USB-IDE Bridge No 2 */
+#define        USB_PRODUCT_GENESYS_GL641USB2IDE_2      0x0701          /* GL641USB USB-IDE Bridge */
 #define        USB_PRODUCT_GENESYS_GL641USB2IDE        0x0702          /* GL641USB USB-IDE Bridge */
 
-/* HAL Corporation products */
-#define        USB_PRODUCT_HAL_IMR001  0x0011          /* Crossam2+USB IR commander */
+/* GoHubs products */
+#define        USB_PRODUCT_GOHUBS_GOCOM232     0x1001          /* GoCOM232 Serial converter */
+
+/* Gravis products */
+#define        USB_PRODUCT_GRAVIS_GAMEPADPRO   0x4001          /* GamePad Pro */
+
+/* GREENHOUSE products */
+#define        USB_PRODUCT_GREENHOUSE_KANA21   0x0001          /* CF-writer with Portable MP3 Player */
+
+/* Griffin Technology */
+#define        USB_PRODUCT_GRIFFIN_IMATE       0x0405          /* iMate, ADB adapter */
+#define        USB_PRODUCT_GRIFFIN_POWERMATE   0x0410          /* PowerMate Assignable Controller */
+
+/* Guillemot Corporation */
+#define        USB_PRODUCT_GUILLEMOT_DALEADER  0xa300          /* DA Leader */
 
 /* Hagiwara products */
 #define        USB_PRODUCT_HAGIWARA_FGSM       0x0002          /* FlashGate SmartMedia Card Reader */
 #define        USB_PRODUCT_HAGIWARA_FGCF       0x0003          /* FlashGate CompactFlash Card Reader */
 #define        USB_PRODUCT_HAGIWARA_FG 0x0005          /* FlashGate */
 
+/* HAL Corporation products */
+#define        USB_PRODUCT_HAL_IMR001  0x0011          /* Crossam2+USB IR commander */
+
 /* Handspring, Inc. */
 #define        USB_PRODUCT_HANDSPRING_VISOR    0x0100          /* Handspring Visor */
 #define        USB_PRODUCT_HANDSPRING_TREO     0x0200          /* Handspring Treo */
 #define        USB_PRODUCT_HAWKING_UF100       0x400c          /* 10/100 USB Ethernet */
 
 /* Hitachi, Ltd. products */
+#define        USB_PRODUCT_HITACHI_DZMV100A    0x0004          /* DVD-CAM DZ-MV100A Camcorder */
 #define        USB_PRODUCT_HITACHI_DVDCAM_USB  0x001e          /* DVDCAM USB HS Interface */
 
 /* HP products */
 #define        USB_PRODUCT_HP_1220C    0x0212          /* DeskJet 1220C */
 #define        USB_PRODUCT_HP_810C     0x0304          /* DeskJet 810C/812C */
 #define        USB_PRODUCT_HP_4300C    0x0305          /* Scanjet 4300C */
+#define        USB_PRODUCT_HP_CD4E     0x0307          /* CD-Writer+ CD-4e */
 #define        USB_PRODUCT_HP_G85XI    0x0311          /* OfficeJet G85xi */
 #define        USB_PRODUCT_HP_1200     0x0317          /* LaserJet 1200 */
 #define        USB_PRODUCT_HP_5200C    0x0401          /* Scanjet 5200C */
 #define        USB_PRODUCT_HP_830C     0x0404          /* DeskJet 830C */
 #define        USB_PRODUCT_HP_3400CSE  0x0405          /* ScanJet 3400cse */
+#define        USB_PRODUCT_HP_885C     0x0504          /* DeskJet 885C */
 #define        USB_PRODUCT_HP_6300C    0x0601          /* Scanjet 6300C */
 #define        USB_PRODUCT_HP_840C     0x0604          /* DeskJet 840c */
 #define        USB_PRODUCT_HP_2200C    0x0605          /* ScanJet 2200C */
 #define        USB_PRODUCT_HP_5300C    0x0701          /* Scanjet 5300C */
 #define        USB_PRODUCT_HP_4400C    0x0705          /* Scanjet 4400C */
+#define        USB_PRODUCT_HP_816C     0x0804          /* DeskJet 816C */
+#define        USB_PRODUCT_HP_2300D    0x0b17          /* Laserjet 2300d */
 #define        USB_PRODUCT_HP_970CSE   0x1004          /* Deskjet 970Cse */
 #define        USB_PRODUCT_HP_5400C    0x1005          /* Scanjet 5400C */
+#define        USB_PRODUCT_HP_2215     0x1016          /* iPAQ 22xx/Jornada 548 */
+#define        USB_PRODUCT_HP_959C     0x1104          /* Deskjet 959C */
+#define        USB_PRODUCT_HP_568J     0x1116          /* Jornada 568 */
 #define        USB_PRODUCT_HP_930C     0x1204          /* DeskJet 930c */
 #define        USB_PRODUCT_HP_P2000U   0x1801          /* Inkjet P-2000U */
 #define        USB_PRODUCT_HP_640C     0x2004          /* DeskJet 640c */
+#define        USB_PRODUCT_HP_4670V    0x3005          /* ScanJet 4670v */
 #define        USB_PRODUCT_HP_P1100    0x3102          /* Photosmart P1100 */
+#define        USB_PRODUCT_HP_6127     0x3504          /* Deskjet 6127 */
 #define        USB_PRODUCT_HP_HN210E   0x811c          /* Ethernet HN210E */
 
 /* HP products */
 #define        USB_PRODUCT_HP2_C500    0x6002          /* PhotoSmart C500 */
 
 /* IBM Corporation */
+#define        USB_PRODUCT_IBM_OPTTRAVELMOUSE  0x3107          /* Optical */
 #define        USB_PRODUCT_IBM_USBCDROMDRIVE   0x4427          /* USB CD-ROM Drive */
 
+/* Iiyama products */
+#define        USB_PRODUCT_IIYAMA_HUB  0x0201          /* Hub */
+
+/* Imation */
+#define        USB_PRODUCT_IMATION_FLASHGO     0xb000          /* Flash Go! */
+
 /* Inside Out Networks products */
-#define        USB_PRODUCT_INSIDEOUT_EDGEPORT4 0x0001          /* EdgePort/4 serial ports */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT4 0x0001          /* EdgePort/4 RS232 */
+#define        USB_PRODUCT_INSIDEOUT_HUBPORT7  0x0002          /* Hubport/7 */
+#define        USB_PRODUCT_INSIDEOUT_RAPIDPORT4        0x0003          /* Rapidport/4 */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT4T        0x0004          /* Edgeport/4 RS232 for Telxon */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT2 0x0005          /* Edgeport/2 RS232 */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT4I        0x0006          /* Edgeport/4 RS422 */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT2I        0x0007          /* Edgeport/2 RS422/RS485 */
+#define        USB_PRODUCT_INSIDEOUT_HUBPORT4  0x0008          /* Hubport/4 */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT8HAND     0x0009          /* Hand-built Edgeport/8 */
+#define        USB_PRODUCT_INSIDEOUT_MULTIMODEM        0x000A          /* MultiTech version of RP/4 */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT     0x000B          /* Edgeport/(4)21 Parallel port (USS720) */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT421       0x000C          /* Edgeport/421 Hub+RS232+Parallel */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT21        0x000D          /* Edgeport/21 RS232+Parallel */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT8DC       0x000E          /* 1/2 Edgeport/8 (2 EP/4s on 1 PCB) */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT8 0x000F          /* Edgeport/8 */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT2DIN      0x0010          /* Edgeport/2 RS232 / Apple DIN connector */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT4DIN      0x0011          /* Edgeport/4 RS232 / Apple DIN connector */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT16DC      0x0012          /* 1/2 Edgeport/16 (2 EP/8s on 1 PCB)) */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORTCOMP      0x0013          /* Edgeport Compatible */
+#define        USB_PRODUCT_INSIDEOUT_EDGEPORT8I        0x0014          /* Edgeport/8 RS422 */
+#define        USB_PRODUCT_INSIDEOUT_MT4X56USB 0x1403          /* OEM device */
 
 /* In-System products */
 #define        USB_PRODUCT_INSYSTEM_F5U002     0x0002          /* Parallel printer adapter */
 #define        USB_PRODUCT_INSYSTEM_ATAPI      0x0031          /* ATAPI adapter */
+#define        USB_PRODUCT_INSYSTEM_IDEUSB2    0x0060          /* USB2 Storage Adapter */
 #define        USB_PRODUCT_INSYSTEM_ISD110     0x0200          /* IDE adapter ISD110 */
 #define        USB_PRODUCT_INSYSTEM_ISD105     0x0202          /* IDE adapter ISD105 */
+#define        USB_PRODUCT_INSYSTEM_DRIVEV2    0x0301          /* Portable USB Harddrive V2 */
+#define        USB_PRODUCT_INSYSTEM_DRIVEV2_5  0x0351          /* Portable USB Harddrive V2 */
 #define        USB_PRODUCT_INSYSTEM_USBCABLE   0x081a          /* USB cable */
+#define        USB_PRODUCT_INSYSTEM_ADAPTERV2  0x5701          /* USB Storage Adapter V2 */
 
 /* Intel products */
 #define        USB_PRODUCT_INTEL_EASYPC_CAMERA 0x0110          /* Easy PC Camera */
+#define        USB_PRODUCT_INTEL_I2011B        0x1111          /* Wireless 2011B */
 #define        USB_PRODUCT_INTEL_TESTBOARD     0x9890          /* 82930 test board */
 
-/* Interpid Control Systems products */
-#define        USB_PRODUCT_INTREPIDCS_VALUECAN 0x0601          /* ValueCAN CAN bus interface */
-#define        USB_PRODUCT_INTREPIDCS_NEOVI    0x0701          /* NeoVI Blue vehicle bus interface */
-
 /* Intersil products */
-#define        USB_PRODUCT_INTERSIL_PRISM_2X   0x3642          /* Prism2.x or Atmel WLAN */
+#define        USB_PRODUCT_INTERSIL_PRISM_2X   0x3642          /* Prism2.x WLAN */
+
+/* Interpid Control Systems products */
+#define        USB_PRODUCT_INTREPIDCS_VALUECAN 0x0601          /* ValueCAN */
+#define        USB_PRODUCT_INTREPIDCS_NEOVI    0x0701          /* NeoVI Blue */
 
-/* I/O DATA products */
+/* I-O DATA products */
 #define        USB_PRODUCT_IODATA_IU_CD2       0x0204          /* DVD Multi-plus unit iU-CD2 */
 #define        USB_PRODUCT_IODATA_DVR_UEH8     0x0206          /* DVD Multi-plus unit DVR-UEH8 */
+#define        USB_PRODUCT_IODATA_USBSSMRW     0x0314          /* USB-SSMRW SD-card adapter */
+#define        USB_PRODUCT_IODATA_USBSDRW      0x031e          /* USB-SDRW SD-card adapter */
 #define        USB_PRODUCT_IODATA_USBETT       0x0901          /* USB ETT */
 #define        USB_PRODUCT_IODATA_USBETTX      0x0904          /* USB ETTX */
 #define        USB_PRODUCT_IODATA_USBETTXS     0x0913          /* USB ETTX */
+#define        USB_PRODUCT_IODATA_USBWNB11     0x0922          /* USB Airport WN-B11 */
 #define        USB_PRODUCT_IODATA_USBRSAQ      0x0a03          /* USB serial adapter USB-RSAQ1 */
+#define        USB_PRODUCT_IODATA2_USB2SC      0x0a09          /* USB2.0-SCSI Bridge USB2-SC */
 
 /* Iomega products */
 #define        USB_PRODUCT_IOMEGA_ZIP100       0x0001          /* Zip 100 */
 #define        USB_PRODUCT_IOMEGA_ZIP250       0x0030          /* Zip 250 */
+#define        USB_PRODUCT_IOMEGA_ZIP250_2     0x0032          /* Zip 250 */
+#define        USB_PRODUCT_IOMEGA_CDRW 0x0055          /* CDRW 9602 */
+
+/* iRiver products */
+#define        USB_PRODUCT_IRIVER_IFP_1XX      0x1101          /* iFP-1xx */
+#define        USB_PRODUCT_IRIVER_IFP_3XX      0x1103          /* iFP-3xx */
+#define        USB_PRODUCT_IRIVER_IFP_5XX      0x1105          /* iFP-5xx */
+
+/* Jaton products */
+#define        USB_PRODUCT_JATON_EDA   0x5704          /* Ethernet Device Adapter */
+
+/* Jenoptik products */
+#define        USB_PRODUCT_JENOPTIK_JD350      0x5300          /* JD 350 Camera/mp3 player */
+
+/* JRC products */
+#define        USB_PRODUCT_JRC_AH_J3001V_J3002V        0x0001          /* AirH\"PHONE AH-J3001V/J3002V */
 
 /* JVC products */
 #define        USB_PRODUCT_JVC_GR_DX95 0x000a          /* GR-DX95 */
 
+/* JVC products */
+#define        USB_PRODUCT_JVC_MP_XP7250_WL    0x3009          /* MP-XP7250 Builtin WLAN */
+
 /* JRC products */
 #define        USB_PRODUCT_JRC_AH_J3001V_J3002V        0x0001          /* AirH\" PHONE AH-J3001V/J3002V */
 
 /* Kawasaki products */
-#define        USB_PRODUCT_KLSI_DUH3E10BT      0x0008          /* USB ethernet controller engine */
-#define        USB_PRODUCT_KLSI_DUH3E10BTN     0x0009          /* USB ethernet controller engine */
+#define        USB_PRODUCT_KLSI_DUH3E10BT      0x0008          /* 10BT Ethernet adapter, in the DU-H3E */
+#define        USB_PRODUCT_KLSI_DUH3E10BTN     0x0009          /* 10BT Ethernet adapter, in the DU-H3E */
 
 /* Kawatsu products */
 #define        USB_PRODUCT_KAWATSU_MH4000P     0x0003          /* MiniHub 4000P */
+#define        USB_PRODUCT_KAWATSU_KC180       0x0180          /* KC-180 IrDA */
 
-/* Keisokugiken Corp. products */
+/* Keisokugiken products */
 #define        USB_PRODUCT_KEISOKUGIKEN_USBDAQ 0x0068          /* HKS-0200 USBDAQ */
 
 /* Kawasaki products */
 /* Kensington products */
 #define        USB_PRODUCT_KENSINGTON_ORBIT    0x1003          /* Orbit USB/PS2 trackball */
 #define        USB_PRODUCT_KENSINGTON_TURBOBALL        0x1005          /* TurboBall */
+#define        USB_PRODUCT_KENSINGTON_ORBIT_MAC        0x1009          /* Orbit USB trackball for Mac */
+#define        USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA     0x5002          /* VideoCAM VGA */
 
 /* Keyspan products */
 #define        USB_PRODUCT_KEYSPAN_USA28       0x0101          /* USA-28 serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA28X      0x0102          /* USA-28X serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA19       0x0103          /* USA-19 serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA18_NF    0x0104          /* USA-18 serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA18X      0x0105          /* USA-18X serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA19W      0x0106          /* USA-19W serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA19       0x0107          /* USA-19 serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA19W      0x0108          /* USA-19W serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA49W      0x0109          /* USA-49W serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA49W      0x010a          /* USA-49W serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA19QI_NF  0x010b          /* USA-19QI serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA19QI     0x010c          /* USA-19QI serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA19Q_NF   0x010d          /* USA-19Q serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA19Q      0x010e          /* USA-19Q serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA28       0x010f          /* USA-28 serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA28XXB    0x0110          /* USA-28X/XB serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA18       0x0111          /* USA-18 serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA18X      0x0112          /* USA-18X serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA28XB_NF  0x0113          /* USA-28XB serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA28XA_NF  0x0114          /* USA-28XB serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA28XA     0x0115          /* USA-28XA serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA18XA_NF  0x0116          /* USA-18XA serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA18XA     0x0117          /* USA-18XA serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA19QW     0x0118          /* USA-19QW serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA19QW     0x0119          /* USA-19WQ serial adapter */
+#define        USB_PRODUCT_KEYSPAN_UIA10       0x0201          /* UIA-10 remote control */
+#define        USB_PRODUCT_KEYSPAN_UIA11       0x0202          /* UIA-11 remote control */
 
 /* Kingston products */
+#define        USB_PRODUCT_KINGSTON_XX1        0x0008          /* Ethernet Adapter */
 #define        USB_PRODUCT_KINGSTON_KNU101TX   0x000a          /* KNU101TX USB Ethernet */
 
 /* Kodak products */
 #define        USB_PRODUCT_KODAK_DC290 0x0112          /* Digital Science DC290 */
 #define        USB_PRODUCT_KODAK_DC240 0x0120          /* Digital Science DC240 */
 #define        USB_PRODUCT_KODAK_DC280 0x0130          /* Digital Science DC280 */
+#define        USB_PRODUCT_KODAK_DX4900        0x0550          /* EasyShare DX4900 */
 
 /* Konica Corp. Products */
 #define        USB_PRODUCT_KONICA_CAMERA       0x0720          /* Digital Color Camera */
 /* KYE products */
 #define        USB_PRODUCT_KYE_NICHE   0x0001          /* Niche mouse */
 #define        USB_PRODUCT_KYE_NETSCROLL       0x0003          /* Genius NetScroll mouse */
+#define        USB_PRODUCT_KYE_G07     0x1002          /* MaxFire G-07 gamepad */
 #define        USB_PRODUCT_KYE_FLIGHT2000      0x1004          /* Flight 2000 joystick */
 #define        USB_PRODUCT_KYE_VIVIDPRO        0x2001          /* ColorPage Vivid-Pro scanner */
 
 /* LaCie products */
 #define        USB_PRODUCT_LACIE_HD    0xa601          /* Hard Disk */
 #define        USB_PRODUCT_LACIE_CDRW  0xa602          /* CD R/W */
+#define        USB_PRODUCT_LACIE_PKTDRV        0x0211          /* PocketDrive */
 
 /* Lexar products */
 #define        USB_PRODUCT_LEXAR_JUMPSHOT      0x0001          /* jumpSHOT CompactFlash Reader */
+#define        USB_PRODUCT_LEXAR_2662WAR       0xa002          /* 2662W-AR */
+#define        USB_PRODUCT_LEXAR_MCR   0xb018          /* Multi-Card Reader */
 
 /* Lexmark products */
 #define        USB_PRODUCT_LEXMARK_S2450       0x0009          /* Optra S 2450 */
 #define        USB_PRODUCT_LINKSYS_USB100TX    0x2203          /* USB100TX Ethernet */
 #define        USB_PRODUCT_LINKSYS_USB100H1    0x2204          /* USB100H1 Ethernet/HPNA */
 #define        USB_PRODUCT_LINKSYS_USB10TA     0x2206          /* USB10TA Ethernet */
-#define        USB_PRODUCT_LINKSYS_USB10TX2    0x400b          /* USB10TX */
-#define        USB_PRODUCT_LINKSYS2_WUSB11     0x2219          /* WUSB11 Wireless adapter */
+#define        USB_PRODUCT_LINKSYS_WUSB11      0x2211          /* WUSB11 Wireless USB Network Adapter */
+#define        USB_PRODUCT_LINKSYS_WUSB11_25   0x2212          /* WUSB11 Wireless USB Network Adapter (version 2.5) */
+#define        USB_PRODUCT_LINKSYS_WUSB12_11   0x2213          /* WUSB12 802.11b v1.1 */
+#define        USB_PRODUCT_LINKSYS2_WUSB11     0x2219          /* WUSB11 */
 #define        USB_PRODUCT_LINKSYS2_USB200M    0x2226          /* USB 2.0 10/100 ethernet controller */
-#define        USB_PRODUCT_LINKSYS3_WUSB11v28  0x2233          /* WUSB11 v2.8 wireless adapter */
+#define        USB_PRODUCT_LINKSYS3_WUSB11v28  0x2233          /* WUSB11-V28 */
+#define        USB_PRODUCT_LINKSYS_USB10TX2    0x400b          /* USB10TX */
+
+/* Logitec products */
+#define        USB_PRODUCT_LOGITEC_LDR_H443SU2 0x0033          /* DVD Multi-plus unit LDR-H443SU2 */
+#define        USB_PRODUCT_LOGITEC_LDR_H443U2  0x00b3          /* DVD Multi-plus unit LDR-H443U2 */
 
 /* Logitech products */
 #define        USB_PRODUCT_LOGITECH_M2452      0x0203          /* M2452 keyboard */
 #define        USB_PRODUCT_LOGITECH_QUICKCAMPRO        0x0810          /* QuickCam Pro */
 #define        USB_PRODUCT_LOGITECH_QUICKCAMEXP        0x0840          /* QuickCam Express */
 #define        USB_PRODUCT_LOGITECH_QUICKCAM   0x0850          /* QuickCam */
+#define        USB_PRODUCT_LOGITECH_QUICKCAMEXP2       0x0870          /* QuickCam Express */
+#define        USB_PRODUCT_LOGITECH_QUICKCAMPRO3k      0x08b0          /* QuickCam Pro 3000 */
+#define        USB_PRODUCT_LOGITECH_QUICKCAMPRONB      0x08b1          /* QuickCam for Notebook Pro */
+#define        USB_PRODUCT_LOGITECH_QUICKCAMPRO4K      0x08b2          /* QuickCam Pro 4000 */
 #define        USB_PRODUCT_LOGITECH_N43        0xc000          /* N43 */
 #define        USB_PRODUCT_LOGITECH_N48        0xc001          /* N48 mouse */
 #define        USB_PRODUCT_LOGITECH_MBA47      0xc002          /* M-BA47 mouse */
 #define        USB_PRODUCT_LOGITECH_WMMOUSE    0xc004          /* WingMan Gaming Mouse */
 #define        USB_PRODUCT_LOGITECH_BD58       0xc00c          /* BD58 mouse */
+#define        USB_PRODUCT_LOGITECH_USBPS2MOUSE        0xc00e          /* USB-PS/2 Optical Mouse */
+#define        USB_PRODUCT_LOGITECH_MUV55A     0xc016          /* M-UV55a */
 #define        USB_PRODUCT_LOGITECH_UN58A      0xc030          /* iFeel Mouse */
-#define        USB_PRODUCT_LOGITECH_BB13       0xc401          /* USB-PS/2 Trackball */
 #define        USB_PRODUCT_LOGITECH_WMPAD      0xc208          /* WingMan GamePad Extreme */
 #define        USB_PRODUCT_LOGITECH_WMRPAD     0xc20a          /* WingMan RumblePad */
 #define        USB_PRODUCT_LOGITECH_WMJOY      0xc281          /* WingMan Force joystick */
+#define        USB_PRODUCT_LOGITECH_WMFFGP     0xc293          /* WingMan Formula Force GP (GT-Force) */
+#define        USB_PRODUCT_LOGITECH_BB13       0xc401          /* USB-PS/2 Trackball */
+#define        USB_PRODUCT_LOGITECH_BB18       0xc404          /* TrackMan Wheel */
 #define        USB_PRODUCT_LOGITECH_RK53       0xc501          /* Cordless mouse */
 #define        USB_PRODUCT_LOGITECH_RB6        0xc503          /* Cordless keyboard */
+#define        USB_PRODUCT_LOGITECH_CDO        0xc504          /* Cordless Desktop Optical */
 #define        USB_PRODUCT_LOGITECH_MX700      0xc506          /* Cordless optical mouse */
 #define        USB_PRODUCT_LOGITECH_QUICKCAMPRO2       0xd001          /* QuickCam Pro */
 
 #define        USB_PRODUCT_FTDI_LK202  0xfa03          /* Matrix Orbital VK/LK202 Family */
 #define        USB_PRODUCT_FTDI_LK204  0xfa04          /* Matrix Orbital VK/LK204 Family */
 
-/* MCT Corp. */
+/* MCT Corp. products */
 #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_ML_4500 0x0302          /* ML-4500 */
+
+/* MediaGear products */
+#define        USB_PRODUCT_MEDIAGEAR_READER9IN1        0x5003          /* USB2.0 9 in 1 Reader */
 
 /* Melco, Inc products */
 #define        USB_PRODUCT_MELCO_LUATX1        0x0001          /* LUA-TX Ethernet */
 #define        USB_PRODUCT_MELCO_LUATX5        0x0005          /* LUA-TX Ethernet */
 #define        USB_PRODUCT_MELCO_LUA2TX5       0x0009          /* LUA2-TX Ethernet */
 #define        USB_PRODUCT_MELCO_LUAKTX        0x0012          /* LUA-KTX Ethernet */
+#define        USB_PRODUCT_MELCO_S11   0x0016          /* WLI-USB-S11 */
+#define        USB_PRODUCT_MELCO_MCRSM2        0x001b          /* MCR-SM2 SmartMedia Card Reader/Writer */
 #define        USB_PRODUCT_MELCO_DUBPXXG       0x001c          /* USB-IDE Bridge: DUB-PxxG */
+#define        USB_PRODUCT_MELCO_KS11G 0x0027          /* WLI-USB-KS11G USB-wlan */
 #define        USB_PRODUCT_MELCO_LUAU2KTX      0x003d          /* LUA-U2-KTX Ethernet */
+#define        USB_PRODUCT_MELCO_KB11  0x0044          /* WLI-USB-KB11 WLAN */
 
 /* Metricom products */
 #define        USB_PRODUCT_METRICOM_RICOCHET_GS        0x0001          /* Ricochet GS */
 /* Micro Star International products */
 #define        USB_PRODUCT_MSI_BT_DONGLE       0x1967          /* Bluetooth USB dongle */
 
+/* Micronet Communications products */
+#define        USB_PRODUCT_MICRONET_SP128AR    0x0003          /* SP128AR EtherFast */
+
 /* Microsoft products */
 #define        USB_PRODUCT_MICROSOFT_SIDEPREC  0x0008          /* SideWinder Precision Pro */
 #define        USB_PRODUCT_MICROSOFT_INTELLIMOUSE      0x0009          /* IntelliMouse */
 #define        USB_PRODUCT_MICROSOFT_DDS80     0x0014          /* Digital Sound System 80 */
 #define        USB_PRODUCT_MICROSOFT_SIDEWINDER        0x001a          /* Sidewinder Precision Racing Wheel */
 #define        USB_PRODUCT_MICROSOFT_INETPRO   0x001c          /* Internet Keyboard Pro */
+#define        USB_PRODUCT_MICROSOFT_TBEXPLORER        0x0024          /* Trackball Explorer */
 #define        USB_PRODUCT_MICROSOFT_INTELLIEYE        0x0025          /* IntelliEye mouse */
 #define        USB_PRODUCT_MICROSOFT_INETPRO2  0x002b          /* Internet Keyboard Pro */
+#define        USB_PRODUCT_MICROSOFT_MN510     0x006e          /* MN510 Wireless */
 #define        USB_PRODUCT_MICROSOFT_MN110     0x007a          /* 10/100 USB NIC */
 
 /* Microtech products */
 #define        USB_PRODUCT_MICROTEK_C6 0x009a          /* Phantom C6 scanner */
 #define        USB_PRODUCT_MICROTEK_336CX2     0x00a0          /* Phantom 336CX - C3 scanner */
 #define        USB_PRODUCT_MICROTEK_V6USL      0x00a3          /* ScanMaker V6USL */
+#define        USB_PRODUCT_MICROTEK_6000       0x30e5          /* ScanMaker 6000 */
 #define        USB_PRODUCT_MICROTEK_V6USL2     0x80a3          /* ScanMaker V6USL */
 #define        USB_PRODUCT_MICROTEK_V6UL       0x80ac          /* ScanMaker V6UL */
 
 /* Midiman products */
 #define        USB_PRODUCT_MIDIMAN_MIDISPORT2X2        0x1001          /* Midisport 2x2 */
 
+/* Minds At Work LLC products */
+#define        USB_PRODUCT_MINDSATWORK_DW      0x0001          /* Digital Wallet */
+
 /* Minolta Co., Ltd. */
 #define        USB_PRODUCT_MINOLTA_2300        0x4001          /* Dimage 2300 */
 #define        USB_PRODUCT_MINOLTA_S304        0x4007          /* Dimage S304 */
 #define        USB_PRODUCT_MINOLTA_X   0x4009          /* Dimage X */
+#define        USB_PRODUCT_MINOLTA_DIMAGE7I    0x400b          /* Dimage 7i */
 #define        USB_PRODUCT_MINOLTA_5400        0x400e          /* Dimage 5400 */
+#define        USB_PRODUCT_MINOLTA_DIMAGEA1    0x401a          /* Dimage A1 */
+#define        USB_PRODUCT_MINOLTA_XT  0x4015          /* Dimage Xt */
 
 /* Mitsumi products */
 #define        USB_PRODUCT_MITSUMI_CDRRW       0x0000          /* CD-R/RW Drive */
+#define        USB_PRODUCT_MITSUMI_MOUSE       0x6407          /* Mouse */
+#define        USB_PRODUCT_MITSUMI_SONY_MOUSE  0x6408          /* Quick Scroll Mouse */
 #define        USB_PRODUCT_MITSUMI_BT_DONGLE   0x641f          /* Bluetooth USB dongle */
+#define        USB_PRODUCT_MITSUMI_FDD 0x6901          /* FDD */
+
+/* Mobility products */
+#define        USB_PRODUCT_MOBILITY_EA 0x0204          /* Ethernet Adapter */
 
 /* Motorola products */
 #define        USB_PRODUCT_MOTOROLA_MC141555   0x1555          /* MC141555 hub controller */
 #define        USB_PRODUCT_MOTOROLA_SB4100     0x4100          /* SB4100 USB Cable Modem */
+#define        USB_PRODUCT_MOTOROLA2_T720C     0x2822          /* T720c */
+#define        USB_PRODUCT_MOTOROLA2_A920      0x4002          /* A920 */
+
+/* Micro Star International products */
+#define        USB_PRODUCT_MSI_BT_DONGLE       0x1967          /* Bluetooth USB dongle */
 
 /* MultiTech products */
 #define        USB_PRODUCT_MULTITECH_ATLAS     0xf101          /* MT5634ZBA-USB modem */
 #define        USB_PRODUCT_MUSTEK_BEARPAW1200TA        0x021e          /* BearPaw 1200TA scanner */
 #define        USB_PRODUCT_MUSTEK_600USB       0x0873          /* 600 USB scanner */
 #define        USB_PRODUCT_MUSTEK_MDC800       0xa800          /* MDC-800 digital camera */
+#define        USB_PRODUCT_MUSTEK_DV2000       0xc441          /* DV2000 digital camera */
 
 /* M-Systems products */
 #define        USB_PRODUCT_MSYSTEMS_DISKONKEY  0x0010          /* DiskOnKey */
 #define        USB_PRODUCT_MSYSTEMS_DISKONKEY2 0x0011          /* DiskOnKey */
 
+/* National Instruments */
+#define        USB_PRODUCT_NI_GPIB_USB_A       0xc920          /* GPIB-USB-A */
+
 /* National Semiconductor */
 #define        USB_PRODUCT_NATIONAL_BEARPAW1200        0x1000          /* BearPaw 1200 */
 #define        USB_PRODUCT_NATIONAL_BEARPAW2400        0x1001          /* BearPaw 2400 */
 
 /* NEC products */
+#define        USB_PRODUCT_NEC_HUB_20  0x0059          /* 2.0 hub */
 #define        USB_PRODUCT_NEC_HUB     0x55aa          /* hub */
 #define        USB_PRODUCT_NEC_HUB_B   0x55ab          /* hub */
+#define        USB_PRODUCT_NEC_PICTY760        0xbef4          /* Picty760 */
+#define        USB_PRODUCT_NEC_PICTY900        0xefbe          /* Picty900 */
+#define        USB_PRODUCT_NEC_PICTY920        0xf0be          /* Picty920 */
+#define        USB_PRODUCT_NEC_PICTY800        0xf1be          /* Picty800 */
+
+/* NEC2 products */
+#define        USB_PRODUCT_NEC2_HUB2_0 0x0058          /* USB2.0 Hub Controller */
 
 /* NEODIO products */
+#define        USB_PRODUCT_NEODIO_ND3050       0x3050          /* 6-in-1 Flash Device Controller */
 #define        USB_PRODUCT_NEODIO_ND3260       0x3260          /* 8-in-1 Multi-format Flash Controller */
 #define        USB_PRODUCT_NEODIO_ND5010       0x5010          /* Multi-format Flash Controller */
 
 /* NetChip Technology Products */
 #define        USB_PRODUCT_NETCHIP_TURBOCONNECT        0x1080          /* Turbo-Connect */
+#define        USB_PRODUCT_NETCHIP_CLIK40      0xa140          /* Clik! 40 */
 
 /* Netgear products */
 #define        USB_PRODUCT_NETGEAR_EA101       0x1001          /* Ethernet adapter */
-#define        USB_PRODUCT_NETGEAR_FA120       0x1040          /* USB 2.0 Ethernet adapter */
+#define        USB_PRODUCT_NETGEAR_EA101X      0x1002          /* Ethernet adapter */
+#define        USB_PRODUCT_NETGEAR_FA101       0x1020          /* 10/100 Ethernet */
+#define        USB_PRODUCT_NETGEAR_FA120       0x1040          /* USB 2.0 Fast Ethernet Adapter */
+#define        USB_PRODUCT_NETGEAR_MA111NA     0x4110          /* 802.11b Adapter */
+#define        USB_PRODUCT_NETGEAR_XA601       0x8100          /* USB to PL Adapter */
+
+#define        USB_PRODUCT_NETGEAR2_MA101      0x4100          /* MA101 */
+#define        USB_PRODUCT_NETGEAR2_MA101B     0x4102          /* MA101 Rev B */
 
 /* Nikon products */
 #define        USB_PRODUCT_NIKON_E990  0x0102          /* Digital Camera E990 */
+#define        USB_PRODUCT_NIKON_E880  0x0103          /* Digital Camera E880 */
+#define        USB_PRODUCT_NIKON_E885  0x0105          /* Digital Camera E885 */
 #define        USB_PRODUCT_NIKON_LS40  0x4000          /* CoolScan LS40 ED */
 
+/* NHJ product */
+#define        USB_PRODUCT_NHJ_CAM2    0x9120          /* Camera */
+
 /* Olympus products */
 #define        USB_PRODUCT_OLYMPUS_C1  0x0102          /* C-1 Digital Camera */
 #define        USB_PRODUCT_OLYMPUS_C700        0x0105          /* C-700 Ultra Zoom */
 #define        USB_PRODUCT_OMNIVISION_OV511PLUS        0xa511          /* OV511+ Camera */
 
 /* OnSpec Electronic, Inc. */
+#define        USB_PRODUCT_ONSPEC_MD2  0x0103          /* disk */
+#define        USB_PRODUCT_ONSPEC_MDCFEB       0xa000          /* MDCFE-B USB CF Reader */
+#define        USB_PRODUCT_ONSPEC_SIIGMS       0xa001          /* Memory Stick+CF Reader/Writer */
+#define        USB_PRODUCT_ONSPEC_DATAFAB3     0xa003          /* Datafab-based Reader */
+#define        USB_PRODUCT_ONSPEC_DATAFAB4     0xa004          /* Datafab-based Reader */
+#define        USB_PRODUCT_ONSPEC_PNYCFSM      0xa005          /* PNY/Datafab CF+SM Reader */
+#define        USB_PRODUCT_ONSPEC_STECHCFSM    0xa006          /* Simple Tech/Datafab CF+SM Reader */
+#define        USB_PRODUCT_ONSPEC_LC1  0xa109          /* CF + SM Combo (LC1) */
 #define        USB_PRODUCT_ONSPEC_UCF100       0xa400          /* FlashLink UCF-100 CompactFlash Reader */
+#define        USB_PRODUCT_ONSPEC_MD1II        0xb006          /* Datafab MD1-II PC-Card Reader */
+
+#define        USB_PRODUCT_ONSPEC2_8IN2        0xb012          /* 8In2 */
+
+/* Ours Technology Inc. */
+#define        USB_PRODUCT_OTI_SOLID   0x6803          /* Solid state disk */
+#define        USB_PRODUCT_OTI_FLASHDISK       0x6828          /* Flash Disk 128M */
 
 /* Palm Computing, Inc. product */
 #define        USB_PRODUCT_PALM_SERIAL 0x0080          /* USB Serial Adaptor */
 #define        USB_PRODUCT_PALM_ZIRE   0x0070          /* Palm Zire */
 
 /* Panasonic products */
+#define        USB_PRODUCT_PANASONIC_LS120     0x0901          /* LS-120 Camera */
 #define        USB_PRODUCT_PANASONIC_KXLRW32AN 0x0d09          /* CD-R Drive KXL-RW32AN */
 #define        USB_PRODUCT_PANASONIC_KXLCB20AN 0x0d0a          /* CD-R Drive KXL-CB20AN */
 #define        USB_PRODUCT_PANASONIC_KXLCB35AN 0x0d0e          /* DVD-ROM & CD-R/RW */
 #define        USB_PRODUCT_PANASONIC_SDCAAE    0x1b00          /* MultiMediaCard Adapter */
 
+/* Pen Driver */
+#define        USB_PRODUCT_PEN_USBDISKPRO      0x0120          /* USB Disk Pro */
+#define        USB_PRODUCT_PEN_USBREADER       0x0240          /* USB 6 in 1 Card Reader/Writer */
+#define        USB_PRODUCT_PEN_MOBILEDRIVE     0x0280          /* USB 3 in 1 Card Reader/Writer */
+#define        USB_PRODUCT_PEN_USBDISK 0x0d7d          /* USB Disk */
+#define        USB_PRODUCT_PEN_ATTACHE 0x1300          /* USB 2.0 Flash Drive */
+
 /* Peracom products */
 #define        USB_PRODUCT_PERACOM_SERIAL1     0x0001          /* Serial Converter */
 #define        USB_PRODUCT_PERACOM_ENET        0x0002          /* Ethernet adapter */
 #define        USB_PRODUCT_PHILIPS_DSS350      0x0101          /* DSS 350 Digital Speaker System */
 #define        USB_PRODUCT_PHILIPS_DSS 0x0104          /* DSS XXX Digital Speaker System */
 #define        USB_PRODUCT_PHILIPS_HUB 0x0201          /* hub */
+#define        USB_PRODUCT_PHILIPS_PCA645VC    0x0302          /* PCA645VC PC Camera */
 #define        USB_PRODUCT_PHILIPS_PCA646VC    0x0303          /* PCA646VC PC Camera */
+#define        USB_PRODUCT_PHILIPS_PCVC675K    0x0307          /* PCVC675K Vesta PC Camera */
 #define        USB_PRODUCT_PHILIPS_PCVC680K    0x0308          /* PCVC680K Vesta Pro PC Camera */
+#define        USB_PRODUCT_PHILIPS_PCVC690K    0x030c          /* PCVC690K Vesta Pro Scan PC Camera */
+#define        USB_PRODUCT_PHILIPS_PCVC730K    0x0310          /* PCVC730K ToUCam Fun PC Camera */
+#define        USB_PRODUCT_PHILIPS_PCVC740K    0x0311          /* PCVC740K ToUCam Pro PC Camera */
+#define        USB_PRODUCT_PHILIPS_PCVC750K    0x0312          /* PCVC750K ToUCam Pro Scan PC Camera */
 #define        USB_PRODUCT_PHILIPS_DSS150      0x0471          /* DSS 150 Digital Speaker System */
 #define        USB_PRODUCT_PHILIPS_UM10016     0x1552          /* ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit */
 #define        USB_PRODUCT_PHILIPS_DIVAUSB     0x1801          /* DIVA USB mp3 player */
 
 /* P.I. Engineering products */
 #define        USB_PRODUCT_PIENGINEERING_PS2USB        0x020b          /* PS2 to Mac USB Adapter */
+#define        USB_PRODUCT_PIENGINEERING_XKEYS58       0x0232          /* Xkeys Programmable Keyboard (58 Keys) */
+#define        USB_PRODUCT_PIENGINEERING_XKEYS 0x0233          /* Xkeys Programmable Keyboard */
+
+/* Pilotech Systems Co., Ltd products */
+#define        USB_PRODUCT_PILOTECH_CRW600     0x0001          /* CRW-600 6-in-1 Reader */
+
+/* Planex Communications products */
+#define        USB_PRODUCT_PLANEX_GW_US11H     0x14ea          /* GW-US11H WLAN */
+
+/* Plantronics products */
+#define        USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1          /* Platronics DSP-400 Headset */
 
 /* Plextor Corp. */
 #define        USB_PRODUCT_PLEXTOR_40_12_40U   0x0011          /* PlexWriter 40/12/40U */
 /* PNY products */
 #define        USB_PRODUCT_PNY_ATTACHE 0x1300          /* USB 2.0 Flash Drive */
 
+/* PointChips */
+#define        USB_PRODUCT_POINTCHIPS_FLASH    0x8001          /* Flash */
+
+/* PortGear products */
+#define        USB_PRODUCT_PORTGEAR_EA8        0x0008          /* Ethernet Adapter */
+#define        USB_PRODUCT_PORTGEAR_EA9        0x0009          /* Ethernet Adapter */
+
+/* Portsmith products */
+#define        USB_PRODUCT_PORTSMITH_EEA       0x3003          /* Express Ethernet Adapter */
+
+/* PQI products */
+#define        USB_PRODUCT_PQI_TRAVELFLASH     0x0001          /* Travel Flash Drive */
+
 /* Primax products */
 #define        USB_PRODUCT_PRIMAX_G2X300       0x0300          /* G2-200 scanner */
 #define        USB_PRODUCT_PRIMAX_G2E300       0x0301          /* G2E-300 scanner */
 #define        USB_PRODUCT_PROLIFIC_PL2303     0x2303          /* PL2303 Serial adapter (ATEN/IOGEAR UC232A) */
 #define        USB_PRODUCT_PROLIFIC_PL2305     0x2305          /* Parallel printer adapter */
 #define        USB_PRODUCT_PROLIFIC_ATAPI4     0x2307          /* ATAPI-4 Bridge Controller */
+#define        USB_PRODUCT_PROLIFIC_PL2501     0x2501          /* PL2501 Host-Host interface */
+#define        USB_PRODUCT_PROLIFIC_PL2303X    0xaaa0          /* PL2303 Serial adapter (Pharos GPS) */
 
 /* Putercom products */
 #define        USB_PRODUCT_PUTERCOM_UPA100     0x047e          /* USB-1284 BRIDGE */
 
+/* Qtronix products */
+#define        USB_PRODUCT_QTRONIX_980N        0x2011          /* Scorpion-980N keyboard */
+
 /* Qualcomm products */
+/* ??? XXX product QUALCOMM CDMA_MSM   0x6000  CDMA Technologies MSM phone */
 #define        USB_PRODUCT_QUALCOMM_CDMA_MSM   0x3196          /* CDMA Technologies MSM modem */
 #define        USB_PRODUCT_QUALCOMM2_CDMA_MSM  0x6000          /* CDMA Technologies MSM phone */
 
-/* Qtronix products */
-#define        USB_PRODUCT_QTRONIX_980N        0x2011          /* Scorpion-980N keyboard */
-
 /* Quickshot products */
 #define        USB_PRODUCT_QUICKSHOT_STRIKEPAD 0x6238          /* USB StrikePad */
 
 /* Rainbow Technologies products */
 #define        USB_PRODUCT_RAINBOW_IKEY2000    0x1200          /* i-Key 2000 */
 
-/* ReakTek products */
+/* RATOC Systems products */
+#define        USB_PRODUCT_RATOC_REXUSB60      0xb000          /* USB serial REX-USB60 */
+
+/* Realtek products */
 #define        USB_PRODUCT_REALTEK_USBKR100    0x8150          /* USBKR100 USB Ethernet (GREEN HOUSE) */
+/* XXX ??? product REALTEK RTL8150L    0x8150  Realtek RTL8150L USB-Ethernet Bridge */
 
 /* Roland products */
+#define        USB_PRODUCT_ROLAND_UA100        0x0000          /* UA-100 USB Audio I/F */
+#define        USB_PRODUCT_ROLAND_UM4  0x0002          /* UM-4 MIDI I/F */
+#define        USB_PRODUCT_ROLAND_SC8850       0x0003          /* RolandED SC-8850 SOUND Canvas MIDI Synth. */
+#define        USB_PRODUCT_ROLAND_U8   0x0004          /* U-8 USB Audio I/F */
+#define        USB_PRODUCT_ROLAND_UM2  0x0005          /* UM-2 MIDI I/F */
+#define        USB_PRODUCT_ROLAND_SC8820       0x0007          /* SoundCanvas SC-8820 MIDI Synth. */
+#define        USB_PRODUCT_ROLAND_PC300        0x0008          /* PC-300 MIDI Keyboard */
 #define        USB_PRODUCT_ROLAND_UM1  0x0009          /* UM-1 MIDI I/F */
+#define        USB_PRODUCT_ROLAND_SK500        0x000b          /* SoundCanvas SK-500 MIDI Keyboard */
+#define        USB_PRODUCT_ROLAND_SCD70        0x000c          /* SC-D70 MIDI Synth. */
+#define        USB_PRODUCT_ROLAND_UA3  0x000f          /* EDIROL UA-3 USB audio I/F */
+#define        USB_PRODUCT_ROLAND_XV5050       0x0012          /* XV-5050 MIDI Synth. */
 #define        USB_PRODUCT_ROLAND_UM880N       0x0014          /* EDIROL UM-880 MIDI I/F (native) */
 #define        USB_PRODUCT_ROLAND_UM880G       0x0015          /* EDIROL UM-880 MIDI I/F (generic) */
+#define        USB_PRODUCT_ROLAND_SD90 0x0016          /* EDIROL SD-90 STDIO Canvas MIDI Synth. */
+#define        USB_PRODUCT_ROLAND_UA1A 0x0018          /* UA-1A USB Audio I/F */
+#define        USB_PRODUCT_ROLAND_UM550        0x0023          /* UM-550 MIDI I/F */
+#define        USB_PRODUCT_ROLAND_SD20 0x0027          /* SD-20 MIDI Synth. */
+#define        USB_PRODUCT_ROLAND_SD80 0x0029          /* SD-80 MIDI Synth. */
+#define        USB_PRODUCT_ROLAND_UA700        0x002b          /* UA-700 USB Audio I/F */
+#define        USB_PRODUCT_ROLAND_UA3FXA       0x0050          /* EDIROL UA-3FX USB audio I/F (advanced) */
+#define        USB_PRODUCT_ROLAND_UA3FX        0x0051          /* EDIROL UA-3FX USB audio I/F */
 
 /* Rockfire products */
 #define        USB_PRODUCT_ROCKFIRE_GAMEPAD    0x2033          /* gamepad 203USB */
 /* RATOC Systems products */
 #define        USB_PRODUCT_RATOC_REXUSB60      0xb000          /* USB serial adapter REX-USB60 */
 
+/* Saitek products */
+#define        USB_PRODUCT_SAITEK_CYBORG_3D_GOLD       0x0006          /* Cyborg 3D Gold Joystick */
+
 /* Samsung products */
 #define        USB_PRODUCT_SAMSUNG_ML6060      0x3008          /* ML-6060 laser printer */
 
 /* SanDisk products */
 #define        USB_PRODUCT_SANDISK_SDDR05A     0x0001          /* ImageMate SDDR-05a */
-#define        USB_PRODUCT_SANDISK_SDDR05      0x0005          /* ImageMate SDDR-05 */
 #define        USB_PRODUCT_SANDISK_SDDR31      0x0002          /* ImageMate SDDR-31 */
+#define        USB_PRODUCT_SANDISK_SDDR05      0x0005          /* ImageMate SDDR-05 */
 #define        USB_PRODUCT_SANDISK_SDDR12      0x0100          /* ImageMate SDDR-12 */
 #define        USB_PRODUCT_SANDISK_SDDR09      0x0200          /* ImageMate SDDR-09 */
+#define        USB_PRODUCT_SANDISK_SDDR86      0x0621          /* ImageMate SDDR-86 */
 #define        USB_PRODUCT_SANDISK_SDDR75      0x0810          /* ImageMate SDDR-75 */
 #define        USB_PRODUCT_SANDISK_SDCZ2_256   0x7104          /* Cruzer Mini 256MB */
 
+/* Sanwa Supply products */
+#define        USB_PRODUCT_SANWASUPPLY_JYDV9USB        0x9806          /* JY-DV9USB gamepad */
+
 /* Sanyo Electric products */
 #define        USB_PRODUCT_SANYO_SCP4900       0x0701          /* Sanyo SCP-4900 USB Phone */
 
 /* ScanLogic products */
-#define        USB_PRODUCT_SCANLOGIC_SL11R     0x0002          /* SL11R IDE Adapter */
+#define        USB_PRODUCT_SCANLOGIC_SL11R     0x0002          /* SL11R-IDE */
 #define        USB_PRODUCT_SCANLOGIC_336CX     0x0300          /* Phantom 336CX - C3 scanner */
 
+/* Sealevel products */
+#define        USB_PRODUCT_SEALEVEL_USBSERIAL  0x2101          /* USB-Serial converter */
+
+/* SGI products */
+#define        USB_PRODUCT_SGI_SN1_L1_SC       0x1234          /* SN1 L1 System Controller */
+
+/* Shark products */
+#define        USB_PRODUCT_SHARK_PA    0x0400          /* Pocket Adapter */
+
+/* Sharp products */
+#define        USB_PRODUCT_SHARP_SL5500        0x8004          /* SL5500 */
+#define        USB_PRODUCT_SHARP_A300  0x8005          /* A300 */
+#define        USB_PRODUCT_SHARP_SL5600        0x8006          /* SL5600 */
+#define        USB_PRODUCT_SHARP_C700  0x8007          /* C700 */
+#define        USB_PRODUCT_SHARP_C750  0x9031          /* C750 */
+
 /* Shuttle Technology products */
 #define        USB_PRODUCT_SHUTTLE_EUSB        0x0001          /* E-USB Bridge */
 #define        USB_PRODUCT_SHUTTLE_EUSCSI      0x0002          /* eUSCSI Bridge */
 #define        USB_PRODUCT_SHUTTLE_SDDR09      0x0003          /* ImageMate SDDR09 */
+#define        USB_PRODUCT_SHUTTLE_EUSBSMCF    0x0005          /* eUSB SmartMedia / CompactFlash Adapter */
 #define        USB_PRODUCT_SHUTTLE_ZIOMMC      0x0006          /* eUSB MultiMediaCard Adapter */
 #define        USB_PRODUCT_SHUTTLE_HIFD        0x0007          /* Sony Hifd */
 #define        USB_PRODUCT_SHUTTLE_EUSBATAPI   0x0009          /* eUSB ATA/ATAPI Adapter */
 #define        USB_PRODUCT_SHUTTLE_EUSCSI_C    0x000c          /* eUSCSI Bridge */
 #define        USB_PRODUCT_SHUTTLE_CDRW        0x0101          /* CD-RW Device */
 #define        USB_PRODUCT_SHUTTLE_EUSBORCA    0x0325          /* eUSB ORCA Quad Reader */
+#define        USB_PRODUCT_SHUTTLE_SCM 0x1010          /* SCM Micro */
 
 /* Siemens products */
 #define        USB_PRODUCT_SIEMENS_SPEEDSTREAM 0x1001          /* SpeedStream USB */
+#define        USB_PRODUCT_SIEMENS_SPEEDSTREAM22       0x1022          /* SpeedStream USB 1022 */
 
 /* Sigmatel products */
+#define        USB_PRODUCT_SIGMATEL_IRDA       0x4200          /* IrDA */
 #define        USB_PRODUCT_SIGMATEL_I_BEAD100  0x8008          /* i-Bead 100 MP3 Player */
+#define        USB_PRODUCT_SIGMATEL_DNSSF7X    0x8020          /* Datum Networks SSF-7X Multi Players */
 
 /* SIIG products */
 #define        USB_PRODUCT_SIIG_DIGIFILMREADER 0x0004          /* DigiFilm-Combo Reader */
+#define        USB_PRODUCT_SIIG_UISDMC2S       0x0200          /* MULTICARDREADER */
+#define        USB_PRODUCT_SIIG_MULTICARDREADER        0x0201          /* MULTICARDREADER */
 #define        USB_PRODUCT_SIIG_WINTERREADER   0x0330          /* WINTERREADER Reader */
-#define        USB_PRODUCT_SIIG2_US2308        0x0421          /* USB to Serial */
+
+#define        USB_PRODUCT_SIIG2_US2308        0x0421          /* Serial */
+
+/* Silicom products */
+#define        USB_PRODUCT_SILICOM_U2E 0x0001          /* U2E */
 
 /* Silicon Portals Inc. */
 #define        USB_PRODUCT_SILICONPORTALS_YAPPH_NF     0x0200          /* YAP Phone (no firmware) */
 #define        USB_PRODUCT_SIRIUS_ROADSTER     0x0001          /* NetComm Roadster II 56 USB */
 
 /* Sitecom products */
-#define        USB_PRODUCT_SITECOM_LN029       0x182d          /* USB 2.0 Ethernet Adapter */
+#define        USB_PRODUCT_SITECOM_LN029       0x182d          /* LN029 */
+#define        USB_PRODUCT_SITECOM_CN104       0x2068          /* CN104 serial */
 
 /* SmartBridges products */
 #define        USB_PRODUCT_SMARTBRIDGES_SMARTLINK      0x0001          /* SmartLink USB ethernet adapter */
 
 /* SONY products */
 #define        USB_PRODUCT_SONY_DSC    0x0010          /* DSC cameras */
+#define        USB_PRODUCT_SONY_NWMS7  0x0025          /* Memorystick NW-MS7 */
+#define        USB_PRODUCT_SONY_DRIVEV2        0x002b          /* Harddrive V2 */
 #define        USB_PRODUCT_SONY_MSACUS1        0x002d          /* Memorystick MSAC-US1 */
 #define        USB_PRODUCT_SONY_HANDYCAM       0x002e          /* Handycam */
 #define        USB_PRODUCT_SONY_MSC    0x0032          /* MSC memory stick slot */
 #define        USB_PRODUCT_SONY_CLIE_35        0x0038          /* Sony Clie v3.5 */
+#define        USB_PRODUCT_SONY_PS2KEYBOARD    0x005c          /* PlayStation2 keyboard */
+#define        USB_PRODUCT_SONY_PS2KEYBOARDHUB 0x005d          /* PlayStation2 keyboard hub */
+#define        USB_PRODUCT_SONY_PS2MOUSE       0x0061          /* PlayStation2 mouse */
 #define        USB_PRODUCT_SONY_CLIE_40        0x0066          /* Sony Clie v4.0 */
+#define        USB_PRODUCT_SONY_MSC_U03        0x0069          /* MSC memory stick slot MSC-U03 */
 #define        USB_PRODUCT_SONY_CLIE_40_MS     0x006d          /* Sony Clie v4.0 Memory Stick slot */
 #define        USB_PRODUCT_SONY_CLIE_S360      0x0095          /* Sony Clie s360 */
 #define        USB_PRODUCT_SONY_CLIE_41_MS     0x0099          /* Sony Clie v4.1 Memory Stick slot */
 #define        USB_PRODUCT_SONY_CLIE_41        0x009a          /* Sony Clie v4.1 */
 #define        USB_PRODUCT_SONY_CLIE_NX60      0x00da          /* Sony Clie nx60 */
+#define        USB_PRODUCT_SONY_CLIE_TJ25      0x0169          /* Sony Clie tj25 */
 
 /* Sony Ericsson products */
 #define        USB_PRODUCT_SONYERICSSON_DCU10  0x0528          /* USB Cable */
 /* STSN products */
 #define        USB_PRODUCT_STSN_STSN0001       0x0001          /* Internet Access Device */
 
+/* Sun Communications products */
+#define        USB_PRODUCT_SUNCOMM_MB_ADAPTOR  0x0003          /* Mobile Adaptor */
+
 /* SUN Corporation products */
 #define        USB_PRODUCT_SUNTAC_DS96L        0x0003          /* SUNTAC U-Cable type D2 */
-#define        USB_PRODUCT_SUNTAC_IS96U        0x000a          /* SUNTAC Ir-Trinity */
-#define        USB_PRODUCT_SUNTAC_AS64LX       0x000b          /* SUNTAC U-Cable type A3 */
-#define        USB_PRODUCT_SUNTAC_IS96U        0x000a          /* SUNTAC Ir-Trinity */
 #define        USB_PRODUCT_SUNTAC_PS64P1       0x0005          /* SUNTAC U-Cable type P1 */
 #define        USB_PRODUCT_SUNTAC_VS10U        0x0009          /* SUNTAC Slipper U */
+#define        USB_PRODUCT_SUNTAC_IS96U        0x000a          /* SUNTAC Ir-Trinity */
+#define        USB_PRODUCT_SUNTAC_AS64LX       0x000b          /* SUNTAC U-Cable type A3 */
 #define        USB_PRODUCT_SUNTAC_AS144L4      0x0011          /* SUNTAC U-Cable type A4 */
 
 /* Sun Microsystems products */
 /* XXX The above is a North American PC style keyboard possibly */
 #define        USB_PRODUCT_SUN2_MOUSE  0x0100          /* Type 6 USB mouse */
 
+/* Susteen products */
+#define        USB_PRODUCT_SUSTEEN_DCU10       0x0528          /* USB Cable */
+  
+/* System TALKS, Inc. */
+#define        USB_PRODUCT_SYSTEMTALKS_SGCX2UL 0x1920          /* SGC-X2UL */
+
 /* Supra products */
 #define        USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K    0x07da          /* Supra Express 56K modem */
 #define        USB_PRODUCT_DIAMOND2_SUPRA2890  0x0b4a          /* SupraMax 2890 56K Modem */
 #define        USB_PRODUCT_DIAMOND2_RIO600USB  0x5001          /* Rio 600 USB */
 #define        USB_PRODUCT_DIAMOND2_RIO800USB  0x5002          /* Rio 800 USB */
+#define        USB_PRODUCT_DIAMOND2_PSAPLAY120 0x5003          /* Nike psa[play 120 */
 
 /* System TALKS, Inc. */
 #define        USB_PRODUCT_SYSTEMTALKS_SGCX2UL 0x1920          /* SGC-X2UL */
 
+/* Tangtop products */
+#define        USB_PRODUCT_TANGTOP_USBPS2      0x0001          /* USBPS2 */
+
 /* Taugagreining products */
 #define        USB_PRODUCT_TAUGA_CAMERAMATE    0x0005          /* CameraMate (DPCM_USB) */
 
 /* TEAC products */
 #define        USB_PRODUCT_TEAC_FD05PUB        0x0000          /* FD-05PUB floppy */
 
+/* Tekram Technology products */
+#define        USB_PRODUCT_TEKRAM_0193 0x1601          /* ALLNET 0193 WLAN */
+#define        USB_PRODUCT_TEKRAM_ZYAIR_B200   0x1602          /* ZyXEL ZyAIR B200 WLAN */
+
 /* Telex Communications products */
 #define        USB_PRODUCT_TELEX_MIC1  0x0001          /* Enhanced USB Microphone */
 
 /* Texas Intel products */
 #define        USB_PRODUCT_TI_UTUSB41  0x1446          /* UT-USB41 hub */
 #define        USB_PRODUCT_TI_TUSB2046 0x2046          /* TUSB2046 hub */
+#define        USB_PRODUCT_TI_NEXII    0x5409          /* Nex II Digital */
 
 /* Thrustmaster products */
 #define        USB_PRODUCT_THRUST_FUSION_PAD   0xa0a3          /* Fusion Digital Gamepad */
 
+/* Todos Data System products */
+#define        USB_PRODUCT_TODOS_ARGOS_MINI    0x0002          /* Argos Mini Smartcard Reader */
+
 /* Toshiba Corporation products */
 #define        USB_PRODUCT_TOSHIBA_POCKETPC_E740       0x0706          /* PocketPC e740 */
 
 /* Trek Technology products */
 #define        USB_PRODUCT_TREK_THUMBDRIVE     0x1111          /* ThumbDrive */
-#define        USB_PRODUCT_TREK_THUMBDRIVE_8MB 0x9988          /* ThumbDrive_8MB */
+#define        USB_PRODUCT_TREK_THUMBDRIVE_8MB 0x9988          /* ThumbDrive 8MB */
+
+/* Tripp-Lite products */
+#define        USB_PRODUCT_TRIPPLITE_U209      0x2008          /* U209 Serial adapter */
+
+/* Trumpion products */
+#define        USB_PRODUCT_TRUMPION_T33521     0x1003          /* USB/MP3 decoder */
+#define        USB_PRODUCT_TRUMPION_C3310      0x1100          /* Comotron C3310 MP3 player */
+
+/* Tsunami products */
+#define        USB_PRODUCT_TSUNAMI_SM2000      0x1111          /* SM-2000 */
+
+/* TwinMOS */
+#define        USB_PRODUCT_TWINMOS_MDIV        0x1325          /* Memory Disk IV */
 
 /* Ultima products */
 #define        USB_PRODUCT_ULTIMA_1200UBPLUS   0x4002          /* 1200 UB Plus scanner */
 /* Universal Access products */
 #define        USB_PRODUCT_UNIACCESS_PANACHE   0x0101          /* Panache Surf USB ISDN Adapter */
 
+/* U.S. Robotics products */
+#define        USB_PRODUCT_USR_USR1120 0x00eb          /* USR1120 WLAN */
+
 /* VidzMedia products */
 #define        USB_PRODUCT_VIDZMEDIA_MONSTERTV 0x4fb1          /* MonsterTV P2H */
 
+/* ViewSonic products */
+#define        USB_PRODUCT_VIEWSONIC_G773HUB   0x00fe          /* G773 Monitor Hub */
+#define        USB_PRODUCT_VIEWSONIC_P815HUB   0x00ff          /* P815 Monitor Hub */
+#define        USB_PRODUCT_VIEWSONIC_G773CTRL  0x4153          /* G773 Monitor Control */
+
 /* Vision products */
 #define        USB_PRODUCT_VISION_VC6452V002   0x0002          /* CPiA Camera */
 
 #define        USB_PRODUCT_VISIONEER_6200      0x0311          /* OneTouch 6200 */
 #define        USB_PRODUCT_VISIONEER_8100      0x0321          /* OneTouch 8100 */
 #define        USB_PRODUCT_VISIONEER_8600      0x0331          /* OneTouch 8600 */
+                                                                      
+/* Vivitar products */
+#define        USB_PRODUCT_VIVITAR_DSC350      0x0003          /* DSC350 Camera */
+
+/* Vodafone products */
+#define        USB_PRODUCT_VODAFONE_MC3G       0x5000          /* Mobile Connect 3G datacard */
 
 /* Wacom products */
 #define        USB_PRODUCT_WACOM_CT0405U       0x0000          /* CT-0405-U Tablet */
 #define        USB_PRODUCT_WESTERN_HUB 0x0500          /* USB HUB */
 
 /* Xirlink products */
+#define        USB_PRODUCT_XIRLINK_IMAGING     0x800d          /* IMAGING DEVICE */
 #define        USB_PRODUCT_XIRLINK_PCCAM       0x8080          /* IBM PC Camera */
 
 /* Y-E Data products */
 
 /* Yamaha products */
 #define        USB_PRODUCT_YAMAHA_UX256        0x1000          /* UX256 MIDI I/F */
+#define        USB_PRODUCT_YAMAHA_MU1000       0x1001          /* MU1000 MIDI Synth. */
+#define        USB_PRODUCT_YAMAHA_MU2000       0x1002          /* MU2000 MIDI Synth. */
+#define        USB_PRODUCT_YAMAHA_MU500        0x1003          /* MU500 MIDI Synth. */
+#define        USB_PRODUCT_YAMAHA_UW500        0x1004          /* UW500 USB Audio I/F */
+#define        USB_PRODUCT_YAMAHA_MOTIF6       0x1005          /* MOTIF6 MIDI Synth. Workstation */
+#define        USB_PRODUCT_YAMAHA_MOTIF7       0x1006          /* MOTIF7 MIDI Synth. Workstation */
+#define        USB_PRODUCT_YAMAHA_MOTIF8       0x1007          /* MOTIF8 MIDI Synth. Workstation */
 #define        USB_PRODUCT_YAMAHA_UX96 0x1008          /* UX96 MIDI I/F */
+#define        USB_PRODUCT_YAMAHA_UX16 0x1009          /* UX16 MIDI I/F */
+#define        USB_PRODUCT_YAMAHA_S08  0x100e          /* S08 MIDI Keyboard */
+#define        USB_PRODUCT_YAMAHA_CLP150       0x100f          /* CLP-150 digital piano */
+#define        USB_PRODUCT_YAMAHA_CLP170       0x1010          /* CLP-170 digital piano */
+#define        USB_PRODUCT_YAMAHA_RPU200       0x3104          /* RP-U200 */
 #define        USB_PRODUCT_YAMAHA_RTA54I       0x4000          /* NetVolante RTA54i Broadband&ISDN Router */
-#define        USB_PRODUCT_YAMAHA_RTA55I       0x4004          /* NetVolante RTA55i Broadband VoIP Router */
 #define        USB_PRODUCT_YAMAHA_RTW65B       0x4001          /* NetVolante RTW65b Broadband Wireless Router */
 #define        USB_PRODUCT_YAMAHA_RTW65I       0x4002          /* NetVolante RTW65i Broadband&ISDN Wireless Router */
+#define        USB_PRODUCT_YAMAHA_RTA55I       0x4004          /* NetVolante RTA55i Broadband VoIP Router */
 
 /* Yano products */
 #define        USB_PRODUCT_YANO_U640MO 0x0101          /* U640MO-03 */
 
+/* Zeevo, Inc. products */
+#define        USB_PRODUCT_ZEEVO_BLUETOOTH     0x07d0          /* BT-500 Bluetooth USB Adapter */
+
+/* Z-Com products */
+#define        USB_PRODUCT_ZCOM_725    0x0002          /* 725/726 Prism2.5 WLAN */
+
 /* Zoom Telephonics, Inc. products */
 #define        USB_PRODUCT_ZOOM_2986L  0x9700          /* 2986L Fax modem */
 
index 356ce43..62991e2 100644 (file)
@@ -1,11 +1,11 @@
 /*
- *     $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.9 2004/09/27 05:30:16 asmodai Exp $
+ *     $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.10 2004/12/17 20:50:46 dillon Exp $
  *
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  */
 /*
- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -40,6 +40,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
+ * $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $
+ * $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.10 2004/12/17 20:50:46 dillon Exp $
+ * $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $
  */
 
 
@@ -54,7 +57,7 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_3COM, USB_PRODUCT_3COM_3CREB96,
            0,
            "3Com",
-           "Bluetooth USB dongle",
+           "Bluetooth USB Adapter",
        },
        {
            USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
@@ -62,6 +65,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "3Com",
            "3C19250 Ethernet adapter",
        },
+       {
+           USB_VENDOR_3COM, USB_PRODUCT_3COM_3CRSHEW696,
+           0,
+           "3Com",
+           "3CRSHEW696 Wireless adapter",
+       },
        {
            USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
            0,
@@ -104,6 +113,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "U.S. Robotics",
            "U.S.Robotics 56000 Voice Faxmodem Pro",
        },
+       {
+           USB_VENDOR_ACDC, USB_PRODUCT_ACDC_HUB,
+           0,
+           "American Computer & Digital Components",
+           "USB Pen Drive HUB",
+       },
+       {
+           USB_VENDOR_ACDC, USB_PRODUCT_ACDC_PEN,
+           0,
+           "American Computer & Digital Components",
+           "USB Pen Drive with Secure Write",
+       },
+       {
+           USB_VENDOR_ACDC, USB_PRODUCT_ACDC_SECWRITE,
+           0,
+           "American Computer & Digital Components",
+           "USB Pen Drive Secure Write",
+       },
        {
            USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1,
            0,
@@ -158,6 +185,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "AboCom Systems",
            "XX7",
        },
+       {
+           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_LCS8138TX,
+           0,
+           "AboCom Systems",
+           "LCS-8138TX",
+       },
        {
            USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8,
            0,
@@ -170,6 +203,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "AboCom Systems",
            "XX9",
        },
+       {
+           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE2000,
+           0,
+           "AboCom Systems",
+           "UFE2000 USB2.0 Fast Ethernet Adapter",
+       },
        {
            USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10,
            0,
@@ -182,6 +221,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Accton Technology",
            "USB320-EC Ethernet Adapter",
        },
+       {
+           USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_111,
+           0,
+           "Accton Technology",
+           "T-Sinus 111 WLAN",
+       },
        {
            USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001,
            0,
@@ -212,17 +257,59 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Acer Peripherals",
            "Acerscan 620U",
        },
+       {
+           USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ATAPI,
+           0,
+           "Acer Peripherals",
+           "ATA/ATAPI adapter",
+       },
        {
            USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL300,
            0,
            "Acer Peripherals",
-           "AWL300 Wireless adapter",
+           "AWL300",
        },
        {
            USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL400,
            0,
            "Acer Peripherals",
-           "AWL400 Wireless adapter",
+           "AWL400",
+       },
+       {
+           USB_VENDOR_ACERW, USB_PRODUCT_ACERW_WARPLINK,
+           0,
+           "Acer",
+           "Warplink",
+       },
+       {
+           USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25,
+           0,
+           "Actiontec Electronics",
+           "Prism2.5 WLAN",
+       },
+       {
+           USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25A,
+           0,
+           "Actiontec Electronics",
+           "Prism2.5 WLAN A",
+       },
+       {
+           USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_FREELAN,
+           0,
+           "Actiontec Electronics",
+           "ROPEX FreeLan 802.11b",
+       },
+       {
+           USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_UAT1,
+           0,
+           "Actiontec Electronics",
+           "UAT1 Wireless Ethernet adapter",
+       },
+       {
+           USB_VENDOR_ACTISYS, USB_PRODUCT_ACTISYS_IR2000U,
+           0,
+           "ACTiSYS",
+           "ACT-IR2000U FIR",
        },
        {
            USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
@@ -236,6 +323,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ActiveWire",
            "I/O Board, rev. 1 firmware",
        },
+       {
+           USB_VENDOR_ADAPTEC, USB_PRODUCT_ADAPTEC_AWN8020,
+           0,
+           "Adaptec",
+           "AWN-8020 WLAN",
+       },
+       {
+           USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_205,
+           0,
+           "Addonics Technology",
+           "Cable 205",
+       },
        {
            USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_UAT1,
            0,
@@ -246,25 +345,37 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
            0,
            "ADMtek",
-           "AN986 USB Ethernet adapter",
+           "AN986 USB Ethernet",
        },
        {
            USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII,
            0,
            "ADMtek",
-           "AN8511 USB Ethernet adapter",
+           "AN8511 USB Ethernet",
        },
        {
            USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2,
            0,
            "ADMtek",
-           "AN8513 USB Ethernet adapter",
+           "AN8513 Ethernet",
        },
        {
            USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
            0,
            "ADS Technologies",
-           "UBS-10BT Ethernet adapter",
+           "UBS-10BT Ethernet",
+       },
+       {
+           USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BTX,
+           0,
+           "ADS Technologies",
+           "UBS-10BT Ethernet",
+       },
+       {
+           USB_VENDOR_AEI, USB_PRODUCT_AEI_USBTOLAN,
+           0,
+           "AEI",
+           "AEI USB to Lan adapter",
        },
        {
            USB_VENDOR_AGATE, USB_PRODUCT_AGATE_QDRIVE,
@@ -332,6 +443,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "AGFA-Gevaert",
            "SnapScan e52",
        },
+       {
+           USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3,
+           0,
+           "",
+           "PenCam Mega 1.3",
+       },
+       {
+           USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B,
+           0,
+           "Aincomm",
+           "AWU2000B",
+       },
        {
            USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
            0,
@@ -371,13 +494,13 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
            0,
-           "Altec Lansing Technologies",
+           "Altec Lansing",
            "ADA70 Speakers",
        },
        {
            USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
            0,
-           "Altec Lansing Technologies",
+           "Altec Lansing",
            "ASC495 Speakers",
        },
        {
@@ -420,7 +543,7 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230,
            0,
            "Asahi Optical",
-           "Digital camera",
+           "PENTAX Optio230",
        },
        {
            USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO330,
@@ -428,6 +551,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Asahi Optical",
            "Digital camera",
        },
+       {
+           USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA,
+           0,
+           "Asante",
+           "Ethernet Adapter",
+       },
        {
            USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172,
            0,
@@ -452,6 +581,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ATEN International",
            "Serial adapter",
        },
+       {
+           USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C,
+           0,
+           "ATEN International",
+           "DSB-650C",
+       },
+       {
+           USB_VENDOR_ATI2, USB_PRODUCT_ATI2_205,
+           0,
+           "ATI",
+           "USB Cable 205",
+       },
        {
            USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124,
            0,
@@ -464,17 +605,53 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Atmel",
            "DWL-120 Wireless adapter",
        },
+       {
+           USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL900AP,
+           0,
+           "Atmel",
+           "DWL-900AP Wireless access point",
+       },
        {
            USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_BW002,
            0,
            "Atmel",
            "BW002 Wireless adapter",
        },
+       {
+           USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WL1130,
+           0,
+           "Atmel",
+           "WL-1130",
+       },
        {
            USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A,
            0,
            "Atmel",
-           "AT76c505a Wireless adapter",
+           "AT76C505A",
+       },
+       {
+           USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL_120,
+           0,
+           "Atmel",
+           "DWL-120",
+       },
+       {
+           USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB,
+           0,
+           "Audio-Technica",
+           "ATC-HA4USB USB headphone",
+       },
+       {
+           USB_VENDOR_AVANCELOGIC, USB_PRODUCT_AVANCELOGIC_USBAUDIO,
+           0,
+           "",
+           "USB Audio Speaker",
+       },
+       {
+           USB_VENDOR_AVERATEC, USB_PRODUCT_AVERATEC_USBWLAN,
+           0,
+           "Averatec",
+           "WLAN",
        },
        {
            USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
@@ -483,16 +660,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "1200U scanner",
        },
        {
-           USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
+           USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4,
            0,
-           "Belkin Components",
-           "F5U002 Parallel printer adapter",
+           "B&B Electronics",
+           "uLinks Isolated RS-422/485 to USB adapter",
        },
        {
-           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN,
+           USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
            0,
            "Belkin Components",
-           "USB to LAN Converter",
+           "F5U002 Parallel printer adapter",
        },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103,
@@ -506,18 +683,48 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Belkin Components",
            "F5U109 Serial adapter",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409,
+           0,
+           "Belkin Components",
+           "F5U409 Serial",
+       },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI,
+           0,
+           "Belkin Components",
+           "SCSI Adaptor",
+       },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN,
+           0,
+           "Belkin Components",
+           "USB to LAN Converter",
+       },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U208,
            0,
            "Belkin Components",
            "F5U208 VideoBus II",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U237,
+           0,
+           "Belkin Components",
+           "F5U237 USB 2.0 7-Port Hub",
+       },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409,
            0,
            "Belkin Components",
            "F5U409 Serial adapter",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_UPS,
+           0,
+           "Belkin Components",
+           "UPS",
+       },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120,
            0,
@@ -552,7 +759,13 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033,
            0,
            "Broadcom",
-           "BCM2033 Bluetooth USB dongle",
+           "BCM2033",
+       },
+       {
+           USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF,
+           0,
+           "Broadcom",
+           "BCM2033 (no firmware)",
        },
        {
            USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,
@@ -596,18 +809,48 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Canon",
            "PowerShot S10",
        },
+       {
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_S20,
+           0,
+           "Canon",
+           "PowerShot S20",
+       },
        {
            USB_VENDOR_CANON, USB_PRODUCT_CANON_S100,
            0,
            "Canon",
            "PowerShot S100",
        },
+       {
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_S100_EU,
+           0,
+           "Canon",
+           "PowerShot S100",
+       },
+       {
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_G1,
+           0,
+           "Canon",
+           "PowerShot G1",
+       },
+       {
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_A20,
+           0,
+           "Canon",
+           "PowerShot A20",
+       },
        {
            USB_VENDOR_CANON, USB_PRODUCT_CANON_S200,
            0,
            "Canon",
            "PowerShot S200",
        },
+       {
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_EOS300D,
+           0,
+           "Canon",
+           "EOS 300D / Digital Rebel",
+       },
        {
            USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
            0,
@@ -632,12 +875,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Computer Access Technology",
            "Andromeda hub",
        },
+       {
+           USB_VENDOR_CASIO, USB_PRODUCT_CASIO_QV,
+           0,
+           "CASIO",
+           "QV DigitalCamera",
+       },
+       {
+           USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300,
+           0,
+           "CASIO",
+           "BE-300 PDA",
+       },
        {
            USB_VENDOR_CASIO, USB_PRODUCT_CASIO_NAMELAND,
            0,
            "CASIO",
            "CASIO Nameland EZ-USB",
        },
+       {
+           USB_VENDOR_CCYU, USB_PRODUCT_CCYU_EASYDISK,
+           0,
+           "CCYU Technology",
+           "EasyDisk Portable Device",
+       },
        {
            USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
            0,
@@ -674,12 +935,90 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Chicony Electronics",
            "KB-8933 keyboard",
        },
+       {
+           USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TWINKLECAM,
+           0,
+           "Chicony Electronics",
+           "TwinkleCam USB camera",
+       },
+       {
+           USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROTHROTTLE,
+           0,
+           "CH Products",
+           "Pro Throttle",
+       },
+       {
+           USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROPEDALS,
+           0,
+           "CH Products",
+           "Pro Pedals",
+       },
+       {
+           USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK,
+           0,
+           "CH Products",
+           "Fighterstick",
+       },
+       {
+           USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_FLIGHTYOKE,
+           0,
+           "CH Products",
+           "Flight Sim Yoke",
+       },
+       {
+           USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC,
+           0,
+           "Compaq",
+           "iPAQ PocketPC",
+       },
+       {
+           USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_A1500,
+           0,
+           "Compaq",
+           "A1500",
+       },
+       {
+           USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_W100,
+           0,
+           "Compaq",
+           "W100",
+       },
+       {
+           USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_W200,
+           0,
+           "Compaq",
+           "WLAN MultiPort W200",
+       },
        {
            USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_PJB100,
            0,
-           "Compaq Computers",
+           "Compaq",
            "Personal Jukebox PJB100",
        },
+       {
+           USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX,
+           0,
+           "Compaq",
+           "iPAQ Linux",
+       },
+       {
+           USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_HNE200,
+           0,
+           "Compaq",
+           "HNE-200 USB Ethernet adapter",
+       },
+       {
+           USB_VENDOR_COMPOSITE, USB_PRODUCT_COMPOSITE_USBPS2,
+           0,
+           "Composite",
+           "USB to PS2 Adaptor",
+       },
+       {
+           USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
+           0,
+           "Concord Camera",
+           "Eye Q 3x",
+       },
        {
            USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
            0,
@@ -698,12 +1037,36 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Corega",
            "FEther USB-TX",
        },
+       {
+           USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLAN_USB_USB_11,
+           0,
+           "Corega",
+           "WirelessLAN USB-11",
+       },
        {
            USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS,
            0,
            "Corega",
            "FEther USB-TXS",
        },
+       {
+           USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLANUSB,
+           0,
+           "Corega",
+           "Wireless LAN USB Stick-11",
+       },
+       {
+           USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX,
+           0,
+           "Corega",
+           "FEther USB2-TX",
+       },
+       {
+           USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLUSB_11_KEY,
+           0,
+           "Corega",
+           "ULUSB-11 Key",
+       },
        {
            USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC,
            0,
@@ -713,9 +1076,27 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II,
            0,
-           "Creative",
+           "Creative Labs",
            "Nomad II MP3 player",
        },
+       {
+           USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_IIMG,
+           0,
+           "Creative Labs",
+           "Nomad II MG",
+       },
+       {
+           USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD,
+           0,
+           "Creative Labs",
+           "Nomad",
+       },
+       {
+           USB_VENDOR_CREATIVE2, USB_PRODUCT_CREATIVE2_VOIP_BLASTER,
+           0,
+           "Creative Labs",
+           "Voip Blaster",
+       },
        {
            USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_631,
            0,
@@ -749,13 +1130,13 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_CSR, USB_PRODUCT_CSR_BT_DONGLE,
            0,
-           "Cambridge Silicon Radio Ltd.",
+           "Cambridge Silicon Radio",
            "Bluetooth USB dongle",
        },
        {
            USB_VENDOR_CSR, USB_PRODUCT_CSR_CSRDFU,
            0,
-           "Cambridge Silicon Radio Ltd.",
+           "Cambridge Silicon Radio",
            "USB Bluetooth Device in DFU State",
        },
        {
@@ -776,6 +1157,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Cypress Semiconductor",
            "thermometer",
        },
+       {
+           USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_KBDHUB,
+           0,
+           "Cypress Semiconductor",
+           "Keyboard/Hub",
+       },
        {
            USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_FMRADIO,
            0,
@@ -792,7 +1179,7 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
            0,
            "Daisy Technology",
-           "USB MultiMedia Reader",
+           "PhotoClip USBMediaReader",
        },
        {
            USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
@@ -800,6 +1187,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Dallas Semiconductor",
            "J-6502 speakers",
        },
+       {
+           USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON,
+           0,
+           "Dallas Semiconductor",
+           "USB-FOB/iBUTTON",
+       },
        {
            USB_VENDOR_DELL, USB_PRODUCT_DELL_PORT,
            0,
@@ -807,19 +1200,37 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Port Replicator",
        },
        {
-           USB_VENDOR_DELL, USB_PRODUCT_DELL_BC02,
+           USB_VENDOR_DELL, USB_PRODUCT_DELL_X3,
            0,
            "Dell",
-           "BC02 Bluetooth USB Adapter",
+           "Dell Axim X3 PDA",
        },
        {
-           USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE,
+           USB_VENDOR_DELL, USB_PRODUCT_DELL_X30,
            0,
-           "DeLorme Publishing",
-           "Earthmate GPS",
+           "Dell",
+           "Dell Axim X30 PDA",
        },
        {
-           USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
+           USB_VENDOR_DELL, USB_PRODUCT_DELL_BC02,
+           0,
+           "Dell",
+           "Dell BC02 Bluetooth USB Adapter",
+       },
+       {
+           USB_VENDOR_DELL, USB_PRODUCT_DELL_TM1180,
+           0,
+           "Dell",
+           "TrueMobile 1180 WLAN",
+       },
+       {
+           USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE,
+           0,
+           "DeLorme Publishing",
+           "Earthmate GPS",
+       },
+       {
+           USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
            0,
            "Diamond",
            "Rio 500 USB",
@@ -842,6 +1253,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Digi International",
            "AccelePort USB 8",
        },
+       {
+           USB_VENDOR_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2,
+           0,
+           "Digital Stream",
+           "PS/2 Active Adapter",
+       },
        {
            USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100,
            0,
@@ -854,6 +1271,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "D-Link",
            "10/100 ethernet adapter",
        },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122,
+           0,
+           "D-Link",
+           "Wireless DWL122",
+       },
        {
            USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
            0,
@@ -896,6 +1319,36 @@ const struct usb_knowndev usb_knowndevs[] = {
            "D-Link",
            "10/100 ethernet adapter",
        },
+       {
+           USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL,
+           0,
+           "eGalax",
+           "Touch Panel",
+       },
+       {
+           USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL2,
+           0,
+           "eGalax",
+           "Touch Panel",
+       },
+       {
+           USB_VENDOR_EGALAX2, USB_PRODUCT_EGALAX2_TPANEL,
+           0,
+           "eGalax, Inc.",
+           "Touch Panel",
+       },
+       {
+           USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0,
+           0,
+           "DMI",
+           "Storage Adapter",
+       },
+       {
+           USB_VENDOR_EICON, USB_PRODUCT_EICON_DIVA852,
+           0,
+           "Eicon Networks",
+           "Diva 852 ISDN TA",
+       },
        {
            USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
            0,
@@ -942,13 +1395,13 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT,
            0,
            "Elecom",
-           "UC-SGT",
+           "UC-SGT serial adapter",
        },
        {
            USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0,
            0,
            "Elecom",
-           "UC-SGT",
+           "UC-SGT0 Serial",
        },
        {
            USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3,
@@ -971,7 +1424,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_EMS, USB_PRODUCT_EMS_DUAL_SHOOTER,
            0,
-           "EMS Production Ltd.",
+           "EMS Production",
            "PSX gun controller converter",
        },
        {
@@ -1010,6 +1463,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Entrega",
            "Centronics connector",
        },
+       {
+           USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX1,
+           0,
+           "Entrega",
+           "Ethernet Adapter",
+       },
        {
            USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S9,
            0,
@@ -1028,6 +1487,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Entrega",
            "2U4S serial connector/usb hub",
        },
+       {
+           USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX2,
+           0,
+           "Entrega",
+           "Ethernet Adapter",
+       },
        {
            USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER1,
            0,
@@ -1163,7 +1628,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
            0,
-           "Advanced Gravis Computer Tech.",
+           "Advanced Gravis Computer",
            "GamePad Pro",
        },
        {
@@ -1184,6 +1649,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Freecom",
            "Connector for DVD drive",
        },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM,
+           0,
+           "Future Technology Devices",
+           "8U232AM Serial converter",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
+           0,
+           "Future Technology Devices",
+           "PS/2 Keyboard/Mouse",
+       },
        {
            USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX,
            0,
@@ -1191,10 +1668,52 @@ const struct usb_knowndev usb_knowndevs[] = {
            "8U100AX Serial converter",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200_USB,
            0,
            "Future Technology Devices",
-           "8U232AM Serial converter",
+           "Matrix Orbital MX200 Series LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24_USB,
+           0,
+           "Future Technology Devices",
+           "Matrix Orbital LK202-24 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK204_24,
+           0,
+           "Future Technology Devices",
+           "Matrix Orbital LK204-24 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_632,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-632 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-634 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-633 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_631,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-631 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20,
+           0,
+           "Future Technology Devices",
+           "SEMC DSS-20 SyncStation",
        },
        {
            USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
@@ -1214,6 +1733,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "General Instruments (Motorola)",
            "SURFboard SB5100 Cable modem",
        },
+       {
+           USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GENELINK,
+           0,
+           "Genesys Logic",
+           "GeneLink Host-Host Bridge",
+       },
        {
            USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650,
            0,
@@ -1230,7 +1755,7 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE_2,
            0,
            "Genesys Logic",
-           "GL641USB USB-IDE Bridge No 2",
+           "GL641USB USB-IDE Bridge",
        },
        {
            USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE,
@@ -1239,10 +1764,40 @@ const struct usb_knowndev usb_knowndevs[] = {
            "GL641USB USB-IDE Bridge",
        },
        {
-           USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001,
+           USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
            0,
-           "HAL Corporation",
-           "Crossam2+USB IR commander",
+           "GoHubs",
+           "GoCOM232 Serial converter",
+       },
+       {
+           USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
+           0,
+           "Advanced Gravis Computer",
+           "GamePad Pro",
+       },
+       {
+           USB_VENDOR_GREENHOUSE, USB_PRODUCT_GREENHOUSE_KANA21,
+           0,
+           "GREENHOUSE",
+           "CF-writer with Portable MP3 Player",
+       },
+       {
+           USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
+           0,
+           "Griffin Technology",
+           "iMate, ADB adapter",
+       },
+       {
+           USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_POWERMATE,
+           0,
+           "Griffin Technology",
+           "PowerMate Assignable Controller",
+       },
+       {
+           USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_DALEADER,
+           0,
+           "Guillemot",
+           "DA Leader",
        },
        {
            USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
@@ -1262,6 +1817,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hagiwara Sys-Com",
            "FlashGate",
        },
+       {
+           USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001,
+           0,
+           "HAL Corporation",
+           "Crossam2+USB IR commander",
+       },
        {
            USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
            0,
@@ -1289,13 +1850,19 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
            0,
-           "Hawking Technologies",
+           "Hawking",
            "10/100 USB Ethernet",
        },
+       {
+           USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DZMV100A,
+           0,
+           "Hitachi",
+           "DVD-CAM DZ-MV100A Camcorder",
+       },
        {
            USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DVDCAM_USB,
            0,
-           "Hitachi, Ltd.",
+           "Hitachi",
            "DVDCAM USB HS Interface",
        },
        {
@@ -1412,6 +1979,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hewlett Packard",
            "Scanjet 4300C",
        },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_CD4E,
+           0,
+           "Hewlett Packard",
+           "CD-Writer+ CD-4e",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_G85XI,
            0,
@@ -1442,6 +2015,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hewlett Packard",
            "ScanJet 3400cse",
        },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_885C,
+           0,
+           "Hewlett Packard",
+           "DeskJet 885C",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
            0,
@@ -1472,6 +2051,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hewlett Packard",
            "Scanjet 4400C",
        },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_816C,
+           0,
+           "Hewlett Packard",
+           "DeskJet 816C",
+       },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_2300D,
+           0,
+           "Hewlett Packard",
+           "Laserjet 2300d",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
            0,
@@ -1484,6 +2075,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hewlett Packard",
            "Scanjet 5400C",
        },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_2215,
+           0,
+           "Hewlett Packard",
+           "iPAQ 22xx/Jornada 548",
+       },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_959C,
+           0,
+           "Hewlett Packard",
+           "Deskjet 959C",
+       },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_568J,
+           0,
+           "Hewlett Packard",
+           "Jornada 568",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_930C,
            0,
@@ -1502,12 +2111,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hewlett Packard",
            "DeskJet 640c",
        },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_4670V,
+           0,
+           "Hewlett Packard",
+           "ScanJet 4670v",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
            0,
            "Hewlett Packard",
            "Photosmart P1100",
        },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_6127,
+           0,
+           "Hewlett Packard",
+           "Deskjet 6127",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_HN210E,
            0,
@@ -1520,156 +2141,408 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hewlett Packard",
            "PhotoSmart C500",
        },
+       {
+           USB_VENDOR_IBM, USB_PRODUCT_IBM_OPTTRAVELMOUSE,
+           0,
+           "IBM",
+           "Optical",
+       },
        {
            USB_VENDOR_IBM, USB_PRODUCT_IBM_USBCDROMDRIVE,
            0,
-           "IBM Corporation",
+           "IBM",
            "USB CD-ROM Drive",
        },
        {
-           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
+           USB_VENDOR_IIYAMA, USB_PRODUCT_IIYAMA_HUB,
            0,
-           "Inside Out Networks",
-           "EdgePort/4 serial ports",
+           "Iiyama",
+           "Hub",
        },
        {
-           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002,
+           USB_VENDOR_IMATION, USB_PRODUCT_IMATION_FLASHGO,
            0,
-           "In-System Design",
-           "Parallel printer adapter",
+           "Imation",
+           "Flash Go!",
        },
        {
-           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
            0,
-           "In-System Design",
-           "ATAPI adapter",
+           "Inside Out Networks",
+           "EdgePort/4 RS232",
        },
        {
-           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_HUBPORT7,
            0,
-           "In-System Design",
-           "IDE adapter ISD110",
+           "Inside Out Networks",
+           "Hubport/7",
        },
        {
-           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD105,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_RAPIDPORT4,
            0,
-           "In-System Design",
-           "IDE adapter ISD105",
+           "Inside Out Networks",
+           "Rapidport/4",
        },
        {
-           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4T,
            0,
-           "In-System Design",
-           "USB cable",
+           "Inside Out Networks",
+           "Edgeport/4 RS232 for Telxon",
        },
        {
-           USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2,
            0,
-           "Intel",
-           "Easy PC Camera",
+           "Inside Out Networks",
+           "Edgeport/2 RS232",
        },
        {
-           USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4I,
            0,
-           "Intel",
-           "82930 test board",
+           "Inside Out Networks",
+           "Edgeport/4 RS422",
        },
        {
-           USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2I,
            0,
-           "Intrepid Control Systems",
-           "ValueCAN CAN bus interface",
+           "Inside Out Networks",
+           "Edgeport/2 RS422/RS485",
        },
        {
-           USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_HUBPORT4,
            0,
-           "Intrepid Control Systems",
-           "NeoVI Blue vehicle bus interface",
+           "Inside Out Networks",
+           "Hubport/4",
        },
        {
-           USB_VENDOR_INTERSIL, USB_PRODUCT_INTERSIL_PRISM_2X,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8HAND,
            0,
-           "Intersil",
-           "Prism2.x or Atmel WLAN",
+           "Inside Out Networks",
+           "Hand-built Edgeport/8",
        },
        {
-           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_IU_CD2,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_MULTIMODEM,
            0,
-           "I/O Data",
-           "DVD Multi-plus unit iU-CD2",
+           "Inside Out Networks",
+           "MultiTech version of RP/4",
        },
        {
-           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_DVR_UEH8,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT,
            0,
-           "I/O Data",
-           "DVD Multi-plus unit DVR-UEH8",
+           "Inside Out Networks",
+           "Edgeport/(4)21 Parallel port (USS720)",
        },
        {
-           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT421,
            0,
-           "I/O Data",
-           "USB ETT",
+           "Inside Out Networks",
+           "Edgeport/421 Hub+RS232+Parallel",
        },
        {
-           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT21,
            0,
-           "I/O Data",
-           "USB ETTX",
+           "Inside Out Networks",
+           "Edgeport/21 RS232+Parallel",
        },
        {
-           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8DC,
            0,
-           "I/O Data",
-           "USB ETTX",
+           "Inside Out Networks",
+           "1/2 Edgeport/8 (2 EP/4s on 1 PCB)",
        },
        {
-           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8,
            0,
-           "I/O Data",
-           "USB serial adapter USB-RSAQ1",
+           "Inside Out Networks",
+           "Edgeport/8",
        },
        {
-           USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2DIN,
            0,
-           "Iomega",
-           "Zip 100",
+           "Inside Out Networks",
+           "Edgeport/2 RS232 / Apple DIN connector",
        },
        {
-           USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4DIN,
            0,
-           "Iomega",
-           "Zip 250",
+           "Inside Out Networks",
+           "Edgeport/4 RS232 / Apple DIN connector",
        },
        {
-           USB_VENDOR_JVC, USB_PRODUCT_JVC_GR_DX95,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT16DC,
            0,
-           "JVC",
-           "GR-DX95",
+           "Inside Out Networks",
+           "1/2 Edgeport/16 (2 EP/8s on 1 PCB))",
        },
        {
-           USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORTCOMP,
            0,
-           "Japan Radio Company",
-           "AirH\" PHONE AH-J3001V/J3002V",
+           "Inside Out Networks",
+           "Edgeport Compatible",
        },
        {
-           USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8I,
            0,
-           "Kawasaki LSI",
-           "USB ethernet controller engine",
+           "Inside Out Networks",
+           "Edgeport/8 RS422",
        },
        {
-           USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN,
+           USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_MT4X56USB,
            0,
-           "Kawasaki LSI",
-           "USB ethernet controller engine",
+           "Inside Out Networks",
+           "OEM device",
        },
        {
-           USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002,
+           0,
+           "In-System Design",
+           "Parallel printer adapter",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI,
+           0,
+           "In-System Design",
+           "ATAPI adapter",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_IDEUSB2,
+           0,
+           "In-System Design",
+           "USB2 Storage Adapter",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
+           0,
+           "In-System Design",
+           "IDE adapter ISD110",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD105,
+           0,
+           "In-System Design",
+           "IDE adapter ISD105",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2,
+           0,
+           "In-System Design",
+           "Portable USB Harddrive V2",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2_5,
+           0,
+           "In-System Design",
+           "Portable USB Harddrive V2",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE,
+           0,
+           "In-System Design",
+           "USB cable",
+       },
+       {
+           USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ADAPTERV2,
+           0,
+           "In-System Design",
+           "USB Storage Adapter V2",
+       },
+       {
+           USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA,
+           0,
+           "Intel",
+           "Easy PC Camera",
+       },
+       {
+           USB_VENDOR_INTEL, USB_PRODUCT_INTEL_I2011B,
+           0,
+           "Intel",
+           "Wireless 2011B",
+       },
+       {
+           USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
+           0,
+           "Intel",
+           "82930 test board",
+       },
+       {
+           USB_VENDOR_INTERSIL, USB_PRODUCT_INTERSIL_PRISM_2X,
+           0,
+           "Intersil",
+           "Prism2.x WLAN",
+       },
+       {
+           USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN,
+           0,
+           "Intrepid",
+           "ValueCAN",
+       },
+       {
+           USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI,
+           0,
+           "Intrepid",
+           "NeoVI Blue",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_IU_CD2,
+           0,
+           "I-O Data",
+           "DVD Multi-plus unit iU-CD2",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_DVR_UEH8,
+           0,
+           "I-O Data",
+           "DVD Multi-plus unit DVR-UEH8",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSSMRW,
+           0,
+           "I-O Data",
+           "USB-SSMRW SD-card adapter",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSDRW,
+           0,
+           "I-O Data",
+           "USB-SDRW SD-card adapter",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT,
+           0,
+           "I-O Data",
+           "USB ETT",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
+           0,
+           "I-O Data",
+           "USB ETTX",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS,
+           0,
+           "I-O Data",
+           "USB ETTX",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBWNB11,
+           0,
+           "I-O Data",
+           "USB Airport WN-B11",
+       },
+       {
+           USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ,
+           0,
+           "I-O Data",
+           "USB serial adapter USB-RSAQ1",
+       },
+       {
+           USB_VENDOR_IODATA2, USB_PRODUCT_IODATA2_USB2SC,
+           0,
+           "I-O Data",
+           "USB2.0-SCSI Bridge USB2-SC",
+       },
+       {
+           USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
+           0,
+           "Iomega",
+           "Zip 100",
+       },
+       {
+           USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250,
+           0,
+           "Iomega",
+           "Zip 250",
+       },
+       {
+           USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250_2,
+           0,
+           "Iomega",
+           "Zip 250",
+       },
+       {
+           USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_CDRW,
+           0,
+           "Iomega",
+           "CDRW 9602",
+       },
+       {
+           USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX,
+           0,
+           "iRiver",
+           "iFP-1xx",
+       },
+       {
+           USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_3XX,
+           0,
+           "iRiver",
+           "iFP-3xx",
+       },
+       {
+           USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_5XX,
+           0,
+           "iRiver",
+           "iFP-5xx",
+       },
+       {
+           USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA,
+           0,
+           "Jaton",
+           "Ethernet Device Adapter",
+       },
+       {
+           USB_VENDOR_JENOPTIK, USB_PRODUCT_JENOPTIK_JD350,
+           0,
+           "Jenoptik",
+           "JD 350 Camera/mp3 player",
+       },
+       {
+           USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V,
+           0,
+           "Japan Radio Company",
+           "AirH\"PHONE AH-J3001V/J3002V",
+       },
+       {
+           USB_VENDOR_JVC, USB_PRODUCT_JVC_GR_DX95,
+           0,
+           "JVC",
+           "GR-DX95",
+       },
+       {
+           USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_XP7250_WL,
+           0,
+           "JVC",
+           "MP-XP7250 Builtin WLAN",
+       },
+       {
+           USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V,
+           0,
+           "Japan Radio Company",
+           "AirH\" PHONE AH-J3001V/J3002V",
+       },
+       {
+           USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
+           0,
+           "Kawasaki LSI",
+           "10BT Ethernet adapter, in the DU-H3E",
+       },
+       {
+           USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN,
+           0,
+           "Kawasaki LSI",
+           "10BT Ethernet adapter, in the DU-H3E",
+       },
+       {
+           USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
            0,
            "Kawatsu Semiconductor",
            "MiniHub 4000P",
        },
+       {
+           USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_KC180,
+           0,
+           "Kawatsu Semiconductor",
+           "KC-180 IrDA",
+       },
        {
            USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ,
            0,
@@ -1694,6 +2567,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Kensington",
            "TurboBall",
        },
+       {
+           USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT_MAC,
+           0,
+           "Kensington",
+           "Orbit USB trackball for Mac",
+       },
+       {
+           USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA,
+           0,
+           "Kensington",
+           "VideoCAM VGA",
+       },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
            0,
@@ -1712,6 +2597,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Keyspan",
            "USA-19 serial adapter",
        },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF,
+           0,
+           "Keyspan",
+           "USA-18 serial adapter (no firmware)",
+       },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
            0,
@@ -1724,18 +2615,138 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Keyspan",
            "USA-19W serial adapter",
        },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19,
+           0,
+           "Keyspan",
+           "USA-19 serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W,
+           0,
+           "Keyspan",
+           "USA-19W serial adapter",
+       },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W,
            0,
            "Keyspan",
            "USA-49W serial adapter",
        },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W,
+           0,
+           "Keyspan",
+           "USA-49W serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI_NF,
+           0,
+           "Keyspan",
+           "USA-19QI serial adapter (no firmware)",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI,
+           0,
+           "Keyspan",
+           "USA-19QI serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q_NF,
+           0,
+           "Keyspan",
+           "USA-19Q serial adapter (no firmware)",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q,
+           0,
+           "Keyspan",
+           "USA-19Q serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
+           0,
+           "Keyspan",
+           "USA-28 serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB,
+           0,
+           "Keyspan",
+           "USA-28X/XB serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18,
+           0,
+           "Keyspan",
+           "USA-18 serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
+           0,
+           "Keyspan",
+           "USA-18X serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XB_NF,
+           0,
+           "Keyspan",
+           "USA-28XB serial adapter (no firmware)",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA_NF,
+           0,
+           "Keyspan",
+           "USA-28XB serial adapter (no firmware)",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA,
+           0,
+           "Keyspan",
+           "USA-28XA serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA_NF,
+           0,
+           "Keyspan",
+           "USA-18XA serial adapter (no firmware)",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA,
+           0,
+           "Keyspan",
+           "USA-18XA serial adapter",
+       },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW,
            0,
            "Keyspan",
            "USA-19QW serial adapter",
        },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW,
+           0,
+           "Keyspan",
+           "USA-19WQ serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10,
+           0,
+           "Keyspan",
+           "UIA-10 remote control",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA11,
+           0,
+           "Keyspan",
+           "UIA-11 remote control",
+       },
+       {
+           USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_XX1,
+           0,
+           "Kingston Technology",
+           "Ethernet Adapter",
+       },
        {
            USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX,
            0,
@@ -1778,6 +2789,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Eastman Kodak",
            "Digital Science DC280",
        },
+       {
+           USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DX4900,
+           0,
+           "Eastman Kodak",
+           "EasyShare DX4900",
+       },
        {
            USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA,
            0,
@@ -1796,6 +2813,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "KYE Systems",
            "Genius NetScroll mouse",
        },
+       {
+           USB_VENDOR_KYE, USB_PRODUCT_KYE_G07,
+           0,
+           "KYE Systems",
+           "MaxFire G-07 gamepad",
+       },
        {
            USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000,
            0,
@@ -1811,7 +2834,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V,
            0,
-           "Kyocera Corp.",
+           "Kyocera",
            "AH-K3001V",
        },
        {
@@ -1826,12 +2849,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "LaCie",
            "CD R/W",
        },
+       {
+           USB_VENDOR_LACIE, USB_PRODUCT_LACIE_PKTDRV,
+           0,
+           "LaCie",
+           "PocketDrive",
+       },
        {
            USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT,
            0,
            "Lexar Media",
            "jumpSHOT CompactFlash Reader",
        },
+       {
+           USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_2662WAR,
+           0,
+           "Lexar Media",
+           "2662W-AR",
+       },
+       {
+           USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_MCR,
+           0,
+           "Lexar Media",
+           "Multi-Card Reader",
+       },
        {
            USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
            0,
@@ -1875,16 +2916,28 @@ const struct usb_knowndev usb_knowndevs[] = {
            "USB10TA Ethernet",
        },
        {
-           USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
+           USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11,
            0,
            "Linksys",
-           "USB10TX",
+           "WUSB11 Wireless USB Network Adapter",
+       },
+       {
+           USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11_25,
+           0,
+           "Linksys",
+           "WUSB11 Wireless USB Network Adapter (version 2.5)",
+       },
+       {
+           USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB12_11,
+           0,
+           "Linksys",
+           "WUSB12 802.11b v1.1",
        },
        {
            USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_WUSB11,
            0,
            "Linksys",
-           "WUSB11 Wireless adapter",
+           "WUSB11",
        },
        {
            USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M,
@@ -1896,7 +2949,25 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_LINKSYS3, USB_PRODUCT_LINKSYS3_WUSB11v28,
            0,
            "Linksys",
-           "WUSB11 v2.8 wireless adapter",
+           "WUSB11-V28",
+       },
+       {
+           USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
+           0,
+           "Linksys",
+           "USB10TX",
+       },
+       {
+           USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2,
+           0,
+           "Logitec Corp",
+           "DVD Multi-plus unit LDR-H443SU2",
+       },
+       {
+           USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443U2,
+           0,
+           "Logitec Corp",
+           "DVD Multi-plus unit LDR-H443U2",
        },
        {
            USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
@@ -1940,6 +3011,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Logitech",
            "QuickCam",
        },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMEXP2,
+           0,
+           "Logitech",
+           "QuickCam Express",
+       },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO3k,
+           0,
+           "Logitech",
+           "QuickCam Pro 3000",
+       },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRONB,
+           0,
+           "Logitech",
+           "QuickCam for Notebook Pro",
+       },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO4K,
+           0,
+           "Logitech",
+           "QuickCam Pro 4000",
+       },
        {
            USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
            0,
@@ -1968,19 +3063,25 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BD58,
            0,
            "Logitech",
-           "BD58 mouse",
+           "BD58 mouse",
+       },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_USBPS2MOUSE,
+           0,
+           "Logitech",
+           "USB-PS/2 Optical Mouse",
        },
        {
-           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A,
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MUV55A,
            0,
            "Logitech",
-           "iFeel Mouse",
+           "M-UV55a",
        },
        {
-           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A,
            0,
            "Logitech",
-           "USB-PS/2 Trackball",
+           "iFeel Mouse",
        },
        {
            USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
@@ -2000,6 +3101,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Logitech",
            "WingMan Force joystick",
        },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMFFGP,
+           0,
+           "Logitech",
+           "WingMan Formula Force GP (GT-Force)",
+       },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
+           0,
+           "Logitech",
+           "USB-PS/2 Trackball",
+       },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB18,
+           0,
+           "Logitech",
+           "TrackMan Wheel",
+       },
        {
            USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RK53,
            0,
@@ -2012,6 +3131,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Logitech",
            "Cordless keyboard",
        },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_CDO,
+           0,
+           "Logitech",
+           "Cordless Desktop Optical",
+       },
        {
            USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MX700,
            0,
@@ -2045,7 +3170,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_LUWEN, USB_PRODUCT_LUWEN_EASYDISK,
            0,
-           "Luwen",
+           "EasyDisk",
            "EasyDisc",
        },
        {
@@ -2108,6 +3233,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "MCT",
            "Sitecom USB-232 Products",
        },
+       {
+           USB_VENDOR_MCT, USB_PRODUCT_MCT_ML_4500,
+           0,
+           "MCT",
+           "ML-4500",
+       },
+       {
+           USB_VENDOR_MEDIAGEAR, USB_PRODUCT_MEDIAGEAR_READER9IN1,
+           0,
+           "MediaGear",
+           "USB2.0 9 in 1 Reader",
+       },
        {
            USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
            0,
@@ -2132,18 +3269,42 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Melco",
            "LUA-KTX Ethernet",
        },
+       {
+           USB_VENDOR_MELCO, USB_PRODUCT_MELCO_S11,
+           0,
+           "Melco",
+           "WLI-USB-S11",
+       },
+       {
+           USB_VENDOR_MELCO, USB_PRODUCT_MELCO_MCRSM2,
+           0,
+           "Melco",
+           "MCR-SM2 SmartMedia Card Reader/Writer",
+       },
        {
            USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG,
            0,
            "Melco",
            "USB-IDE Bridge: DUB-PxxG",
        },
+       {
+           USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KS11G,
+           0,
+           "Melco",
+           "WLI-USB-KS11G USB-wlan",
+       },
        {
            USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX,
            0,
            "Melco",
            "LUA-U2-KTX Ethernet",
        },
+       {
+           USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KB11,
+           0,
+           "Melco",
+           "WLI-USB-KB11 WLAN",
+       },
        {
            USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
            0,
@@ -2153,9 +3314,15 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_MSI, USB_PRODUCT_MSI_BT_DONGLE,
            0,
-           "Micro Star International",
+           "Micro Star",
            "Bluetooth USB dongle",
        },
+       {
+           USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
+           0,
+           "Micronet Communications",
+           "SP128AR EtherFast",
+       },
        {
            USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC,
            0,
@@ -2192,6 +3359,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Microsoft",
            "Internet Keyboard Pro",
        },
+       {
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_TBEXPLORER,
+           0,
+           "Microsoft",
+           "Trackball Explorer",
+       },
        {
            USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE,
            0,
@@ -2204,6 +3377,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Microsoft",
            "Internet Keyboard Pro",
        },
+       {
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN510,
+           0,
+           "Microsoft",
+           "MN510 Wireless",
+       },
        {
            USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110,
            0,
@@ -2264,6 +3443,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Microtek",
            "ScanMaker V6USL",
        },
+       {
+           USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_6000,
+           0,
+           "Microtek",
+           "ScanMaker 6000",
+       },
        {
            USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2,
            0,
@@ -2288,6 +3473,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Midiman",
            "Midisport 2x2",
        },
+       {
+           USB_VENDOR_MINDSATWORK, USB_PRODUCT_MINDSATWORK_DW,
+           0,
+           "Minds At Work",
+           "Digital Wallet",
+       },
        {
            USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_2300,
            0,
@@ -2306,24 +3497,66 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Minolta",
            "Dimage X",
        },
+       {
+           USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGE7I,
+           0,
+           "Minolta",
+           "Dimage 7i",
+       },
        {
            USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_5400,
            0,
            "Minolta",
            "Dimage 5400",
        },
+       {
+           USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1,
+           0,
+           "Minolta",
+           "Dimage A1",
+       },
+       {
+           USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_XT,
+           0,
+           "Minolta",
+           "Dimage Xt",
+       },
        {
            USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
            0,
            "Mitsumi",
            "CD-R/RW Drive",
        },
+       {
+           USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_MOUSE,
+           0,
+           "Mitsumi",
+           "Mouse",
+       },
+       {
+           USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_SONY_MOUSE,
+           0,
+           "Mitsumi",
+           "Quick Scroll Mouse",
+       },
        {
            USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_BT_DONGLE,
            0,
            "Mitsumi",
            "Bluetooth USB dongle",
        },
+       {
+           USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_FDD,
+           0,
+           "Mitsumi",
+           "FDD",
+       },
+       {
+           USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA,
+           0,
+           "Mobility",
+           "Ethernet Adapter",
+       },
        {
            USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
            0,
@@ -2336,6 +3569,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Motorola",
            "SB4100 USB Cable Modem",
        },
+       {
+           USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_T720C,
+           0,
+           "Motorola",
+           "T720c",
+       },
+       {
+           USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_A920,
+           0,
+           "Motorola",
+           "A920",
+       },
+       {
+           USB_VENDOR_MSI, USB_PRODUCT_MSI_BT_DONGLE,
+           0,
+           "Micro Star",
+           "Bluetooth USB dongle",
+       },
        {
            USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
            0,
@@ -2391,124 +3642,310 @@ const struct usb_knowndev usb_knowndevs[] = {
            "BearPaw 1200TA scanner",
        },
        {
-           USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB,
+           USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB,
+           0,
+           "Mustek Systems",
+           "600 USB scanner",
+       },
+       {
+           USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
+           0,
+           "Mustek Systems",
+           "MDC-800 digital camera",
+       },
+       {
+           USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_DV2000,
+           0,
+           "Mustek Systems",
+           "DV2000 digital camera",
+       },
+       {
+           USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY,
+           0,
+           "M-Systems",
+           "DiskOnKey",
+       },
+       {
+           USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2,
+           0,
+           "M-Systems",
+           "DiskOnKey",
+       },
+       {
+           USB_VENDOR_NI, USB_PRODUCT_NI_GPIB_USB_A,
+           0,
+           "National Instruments",
+           "GPIB-USB-A",
+       },
+       {
+           USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200,
+           0,
+           "National Semiconductor",
+           "BearPaw 1200",
+       },
+       {
+           USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400,
+           0,
+           "National Semiconductor",
+           "BearPaw 2400",
+       },
+       {
+           USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB_20,
+           0,
+           "NEC",
+           "2.0 hub",
+       },
+       {
+           USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
+           0,
+           "NEC",
+           "hub",
+       },
+       {
+           USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB_B,
+           0,
+           "NEC",
+           "hub",
+       },
+       {
+           USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY760,
+           0,
+           "NEC",
+           "Picty760",
+       },
+       {
+           USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY900,
+           0,
+           "NEC",
+           "Picty900",
+       },
+       {
+           USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY920,
+           0,
+           "NEC",
+           "Picty920",
+       },
+       {
+           USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY800,
+           0,
+           "NEC",
+           "Picty800",
+       },
+       {
+           USB_VENDOR_NEC2, USB_PRODUCT_NEC2_HUB2_0,
+           0,
+           "NEC",
+           "USB2.0 Hub Controller",
+       },
+       {
+           USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3050,
+           0,
+           "Neodio",
+           "6-in-1 Flash Device Controller",
+       },
+       {
+           USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3260,
+           0,
+           "Neodio",
+           "8-in-1 Multi-format Flash Controller",
+       },
+       {
+           USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010,
+           0,
+           "Neodio",
+           "Multi-format Flash Controller",
+       },
+       {
+           USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
+           0,
+           "NetChip Technology",
+           "Turbo-Connect",
+       },
+       {
+           USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK40,
+           0,
+           "NetChip Technology",
+           "Clik! 40",
+       },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
+           0,
+           "BayNETGEAR",
+           "Ethernet adapter",
+       },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101X,
+           0,
+           "BayNETGEAR",
+           "Ethernet adapter",
+       },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101,
+           0,
+           "BayNETGEAR",
+           "10/100 Ethernet",
+       },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120,
+           0,
+           "BayNETGEAR",
+           "USB 2.0 Fast Ethernet Adapter",
+       },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111NA,
+           0,
+           "BayNETGEAR",
+           "802.11b Adapter",
+       },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_XA601,
+           0,
+           "BayNETGEAR",
+           "USB to PL Adapter",
+       },
+       {
+           USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101,
+           0,
+           "Netgear",
+           "MA101",
+       },
+       {
+           USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101B,
+           0,
+           "Netgear",
+           "MA101 Rev B",
+       },
+       {
+           USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
+           0,
+           "Nikon",
+           "Digital Camera E990",
+       },
+       {
+           USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E880,
+           0,
+           "Nikon",
+           "Digital Camera E880",
+       },
+       {
+           USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E885,
            0,
-           "Mustek Systems",
-           "600 USB scanner",
+           "Nikon",
+           "Digital Camera E885",
        },
        {
-           USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
+           USB_VENDOR_NIKON, USB_PRODUCT_NIKON_LS40,
            0,
-           "Mustek Systems",
-           "MDC-800 digital camera",
+           "Nikon",
+           "CoolScan LS40 ED",
        },
        {
-           USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY,
+           USB_VENDOR_NHJ, USB_PRODUCT_NHJ_CAM2,
            0,
-           "M-Systems",
-           "DiskOnKey",
+           "NHJ",
+           "Camera",
        },
        {
-           USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2,
+           USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
            0,
-           "M-Systems",
-           "DiskOnKey",
+           "Olympus",
+           "C-1 Digital Camera",
        },
        {
-           USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200,
+           USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700,
            0,
-           "National Semiconductor",
-           "BearPaw 1200",
+           "Olympus",
+           "C-700 Ultra Zoom",
        },
        {
-           USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400,
+           USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
            0,
-           "National Semiconductor",
-           "BearPaw 2400",
+           "OmniVision",
+           "OV511 Camera",
        },
        {
-           USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
+           USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511PLUS,
            0,
-           "NEC",
-           "hub",
+           "OmniVision",
+           "OV511+ Camera",
        },
        {
-           USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB_B,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD2,
            0,
-           "NEC",
-           "hub",
+           "OnSpec",
+           "disk",
        },
        {
-           USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3260,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDCFEB,
            0,
-           "Neodio",
-           "8-in-1 Multi-format Flash Controller",
+           "OnSpec",
+           "MDCFE-B USB CF Reader",
        },
        {
-           USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SIIGMS,
            0,
-           "Neodio",
-           "Multi-format Flash Controller",
+           "OnSpec",
+           "Memory Stick+CF Reader/Writer",
        },
        {
-           USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB3,
            0,
-           "NetChip Technology",
-           "Turbo-Connect",
+           "OnSpec",
+           "Datafab-based Reader",
        },
        {
-           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB4,
            0,
-           "BayNETGEAR",
-           "Ethernet adapter",
+           "OnSpec",
+           "Datafab-based Reader",
        },
        {
-           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_PNYCFSM,
            0,
-           "BayNETGEAR",
-           "USB 2.0 Ethernet adapter",
+           "OnSpec",
+           "PNY/Datafab CF+SM Reader",
        },
        {
-           USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_STECHCFSM,
            0,
-           "Nikon",
-           "Digital Camera E990",
+           "OnSpec",
+           "Simple Tech/Datafab CF+SM Reader",
        },
        {
-           USB_VENDOR_NIKON, USB_PRODUCT_NIKON_LS40,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_LC1,
            0,
-           "Nikon",
-           "CoolScan LS40 ED",
+           "OnSpec",
+           "CF + SM Combo (LC1)",
        },
        {
-           USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_UCF100,
            0,
-           "Olympus",
-           "C-1 Digital Camera",
+           "OnSpec",
+           "FlashLink UCF-100 CompactFlash Reader",
        },
        {
-           USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700,
+           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II,
            0,
-           "Olympus",
-           "C-700 Ultra Zoom",
+           "OnSpec",
+           "Datafab MD1-II PC-Card Reader",
        },
        {
-           USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
+           USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_8IN2,
            0,
-           "OmniVision Technologies",
-           "OV511 Camera",
+           "OnSpec Electronic Inc.",
+           "8In2",
        },
        {
-           USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511PLUS,
+           USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID,
            0,
-           "OmniVision Technologies",
-           "OV511+ Camera",
+           "Ours Technology",
+           "Solid state disk",
        },
        {
-           USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_UCF100,
+           USB_VENDOR_OTI, USB_PRODUCT_OTI_FLASHDISK,
            0,
-           "OnSpec Electronic",
-           "FlashLink UCF-100 CompactFlash Reader",
+           "Ours Technology",
+           "Flash Disk 128M",
        },
        {
            USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
@@ -2576,6 +4013,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Palm Computing",
            "Palm Zire",
        },
+       {
+           USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120,
+           0,
+           "Panasonic (Matsushita)",
+           "LS-120 Camera",
+       },
        {
            USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLRW32AN,
            0,
@@ -2600,6 +4043,36 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Panasonic (Matsushita)",
            "MultiMediaCard Adapter",
        },
+       {
+           USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISKPRO,
+           0,
+           "",
+           "USB Disk Pro",
+       },
+       {
+           USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER,
+           0,
+           "",
+           "USB 6 in 1 Card Reader/Writer",
+       },
+       {
+           USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE,
+           0,
+           "",
+           "USB 3 in 1 Card Reader/Writer",
+       },
+       {
+           USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK,
+           0,
+           "",
+           "USB Disk",
+       },
+       {
+           USB_VENDOR_PEN, USB_PRODUCT_PEN_ATTACHE,
+           0,
+           "",
+           "USB 2.0 Flash Drive",
+       },
        {
            USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
            0,
@@ -2642,18 +4115,54 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Philips",
            "hub",
        },
+       {
+           USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA645VC,
+           0,
+           "Philips",
+           "PCA645VC PC Camera",
+       },
        {
            USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA646VC,
            0,
            "Philips",
            "PCA646VC PC Camera",
        },
+       {
+           USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC675K,
+           0,
+           "Philips",
+           "PCVC675K Vesta PC Camera",
+       },
        {
            USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K,
            0,
            "Philips",
            "PCVC680K Vesta Pro PC Camera",
        },
+       {
+           USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC690K,
+           0,
+           "Philips",
+           "PCVC690K Vesta Pro Scan PC Camera",
+       },
+       {
+           USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC730K,
+           0,
+           "Philips",
+           "PCVC730K ToUCam Fun PC Camera",
+       },
+       {
+           USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC740K,
+           0,
+           "Philips",
+           "PCVC740K ToUCam Pro PC Camera",
+       },
+       {
+           USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC750K,
+           0,
+           "Philips",
+           "PCVC750K ToUCam Pro Scan PC Camera",
+       },
        {
            USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
            0,
@@ -2684,10 +4193,40 @@ const struct usb_knowndev usb_knowndevs[] = {
            "P.I. Engineering",
            "PS2 to Mac USB Adapter",
        },
+       {
+           USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_XKEYS58,
+           0,
+           "P.I. Engineering",
+           "Xkeys Programmable Keyboard (58 Keys)",
+       },
+       {
+           USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_XKEYS,
+           0,
+           "P.I. Engineering",
+           "Xkeys Programmable Keyboard",
+       },
+       {
+           USB_VENDOR_PILOTECH, USB_PRODUCT_PILOTECH_CRW600,
+           0,
+           "Pilotech",
+           "CRW-600 6-in-1 Reader",
+       },
+       {
+           USB_VENDOR_PLANEX, USB_PRODUCT_PLANEX_GW_US11H,
+           0,
+           "Planex Communications",
+           "GW-US11H WLAN",
+       },
+       {
+           USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
+           0,
+           "Plantronics",
+           "Platronics DSP-400 Headset",
+       },
        {
            USB_VENDOR_PLEXTOR, USB_PRODUCT_PLEXTOR_40_12_40U,
            0,
-           "Plextor Corp.",
+           "Plextor",
            "PlexWriter 40/12/40U",
        },
        {
@@ -2702,6 +4241,36 @@ const struct usb_knowndev usb_knowndevs[] = {
            "PNY",
            "USB 2.0 Flash Drive",
        },
+       {
+           USB_VENDOR_POINTCHIPS, USB_PRODUCT_POINTCHIPS_FLASH,
+           0,
+           "PointChips",
+           "Flash",
+       },
+       {
+           USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA8,
+           0,
+           "PortGear",
+           "Ethernet Adapter",
+       },
+       {
+           USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA9,
+           0,
+           "PortGear",
+           "Ethernet Adapter",
+       },
+       {
+           USB_VENDOR_PORTSMITH, USB_PRODUCT_PORTSMITH_EEA,
+           0,
+           "Portsmith",
+           "Express Ethernet Adapter",
+       },
+       {
+           USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH,
+           0,
+           "PQI",
+           "Travel Flash Drive",
+       },
        {
            USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
            0,
@@ -2834,12 +4403,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Prolific Technology",
            "ATAPI-4 Bridge Controller",
        },
+       {
+           USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501,
+           0,
+           "Prolific Technology",
+           "PL2501 Host-Host interface",
+       },
+       {
+           USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X,
+           0,
+           "Prolific Technology",
+           "PL2303 Serial adapter (Pharos GPS)",
+       },
        {
            USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100,
            0,
            "Putercom",
            "USB-1284 BRIDGE",
        },
+       {
+           USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
+           0,
+           "Qtronix",
+           "Scorpion-980N keyboard",
+       },
        {
            USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_CDMA_MSM,
            0,
@@ -2852,12 +4439,6 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Qualcomm",
            "CDMA Technologies MSM phone",
        },
-       {
-           USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
-           0,
-           "Qtronix",
-           "Scorpion-980N keyboard",
-       },
        {
            USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD,
            0,
@@ -2870,18 +4451,90 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Rainbow Technologies",
            "i-Key 2000",
        },
+       {
+           USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
+           0,
+           "RATOC Systems",
+           "USB serial REX-USB60",
+       },
        {
            USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_USBKR100,
            0,
-           "RealTek",
+           "Realtek",
            "USBKR100 USB Ethernet (GREEN HOUSE)",
        },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA100,
+           0,
+           "Roland",
+           "UA-100 USB Audio I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM4,
+           0,
+           "Roland",
+           "UM-4 MIDI I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8850,
+           0,
+           "Roland",
+           "RolandED SC-8850 SOUND Canvas MIDI Synth.",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_U8,
+           0,
+           "Roland",
+           "U-8 USB Audio I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM2,
+           0,
+           "Roland",
+           "UM-2 MIDI I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8820,
+           0,
+           "Roland",
+           "SoundCanvas SC-8820 MIDI Synth.",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_PC300,
+           0,
+           "Roland",
+           "PC-300 MIDI Keyboard",
+       },
        {
            USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
            0,
            "Roland",
            "UM-1 MIDI I/F",
        },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SK500,
+           0,
+           "Roland",
+           "SoundCanvas SK-500 MIDI Keyboard",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SCD70,
+           0,
+           "Roland",
+           "SC-D70 MIDI Synth.",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA3,
+           0,
+           "Roland",
+           "EDIROL UA-3 USB audio I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_XV5050,
+           0,
+           "Roland",
+           "XV-5050 MIDI Synth.",
+       },
        {
            USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880N,
            0,
@@ -2894,6 +4547,54 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Roland",
            "EDIROL UM-880 MIDI I/F (generic)",
        },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD90,
+           0,
+           "Roland",
+           "EDIROL SD-90 STDIO Canvas MIDI Synth.",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA1A,
+           0,
+           "Roland",
+           "UA-1A USB Audio I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM550,
+           0,
+           "Roland",
+           "UM-550 MIDI I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD20,
+           0,
+           "Roland",
+           "SD-20 MIDI Synth.",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD80,
+           0,
+           "Roland",
+           "SD-80 MIDI Synth.",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA700,
+           0,
+           "Roland",
+           "UA-700 USB Audio I/F",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA3FXA,
+           0,
+           "Roland",
+           "EDIROL UA-3FX USB audio I/F (advanced)",
+       },
+       {
+           USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA3FX,
+           0,
+           "Roland",
+           "EDIROL UA-3FX USB audio I/F",
+       },
        {
            USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
            0,
@@ -2901,10 +4602,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "gamepad 203USB",
        },
        {
-           USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
+           USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
+           0,
+           "RATOC Systems",
+           "USB serial adapter REX-USB60",
+       },
+       {
+           USB_VENDOR_SAITEK, USB_PRODUCT_SAITEK_CYBORG_3D_GOLD,
            0,
-           "RATOC Systems, Inc.",
-           "USB serial adapter REX-USB60",
+           "Saitek",
+           "Cyborg 3D Gold Joystick",
        },
        {
            USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_ML6060,
@@ -2915,45 +4622,57 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A,
            0,
-           "SanDisk Corp",
+           "SanDisk",
            "ImageMate SDDR-05a",
        },
        {
-           USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05,
+           USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31,
            0,
-           "SanDisk Corp",
-           "ImageMate SDDR-05",
+           "SanDisk",
+           "ImageMate SDDR-31",
        },
        {
-           USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31,
+           USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05,
            0,
-           "SanDisk Corp",
-           "ImageMate SDDR-31",
+           "SanDisk",
+           "ImageMate SDDR-05",
        },
        {
            USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12,
            0,
-           "SanDisk Corp",
+           "SanDisk",
            "ImageMate SDDR-12",
        },
        {
            USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09,
            0,
-           "SanDisk Corp",
+           "SanDisk",
            "ImageMate SDDR-09",
        },
+       {
+           USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR86,
+           0,
+           "SanDisk",
+           "ImageMate SDDR-86",
+       },
        {
            USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR75,
            0,
-           "SanDisk Corp",
+           "SanDisk",
            "ImageMate SDDR-75",
        },
        {
            USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ2_256,
            0,
-           "SanDisk Corp",
+           "SanDisk",
            "Cruzer Mini 256MB",
        },
+       {
+           USB_VENDOR_SANWASUPPLY, USB_PRODUCT_SANWASUPPLY_JYDV9USB,
+           0,
+           "Sanwa Supply",
+           "JY-DV9USB gamepad",
+       },
        {
            USB_VENDOR_SANYO, USB_PRODUCT_SANYO_SCP4900,
            0,
@@ -2964,7 +4683,7 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R,
            0,
            "ScanLogic",
-           "SL11R IDE Adapter",
+           "SL11R-IDE",
        },
        {
            USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX,
@@ -2972,6 +4691,54 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ScanLogic",
            "Phantom 336CX - C3 scanner",
        },
+       {
+           USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_USBSERIAL,
+           0,
+           "Sealevel System",
+           "USB-Serial converter",
+       },
+       {
+           USB_VENDOR_SGI, USB_PRODUCT_SGI_SN1_L1_SC,
+           0,
+           "Silicon Graphics",
+           "SN1 L1 System Controller",
+       },
+       {
+           USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA,
+           0,
+           "Shark",
+           "Pocket Adapter",
+       },
+       {
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500,
+           0,
+           "Sharp",
+           "SL5500",
+       },
+       {
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_A300,
+           0,
+           "Sharp",
+           "A300",
+       },
+       {
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600,
+           0,
+           "Sharp",
+           "SL5600",
+       },
+       {
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C700,
+           0,
+           "Sharp",
+           "C700",
+       },
+       {
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C750,
+           0,
+           "Sharp",
+           "C750",
+       },
        {
            USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
            0,
@@ -2990,6 +4757,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Shuttle Technology",
            "ImageMate SDDR09",
        },
+       {
+           USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBSMCF,
+           0,
+           "Shuttle Technology",
+           "eUSB SmartMedia / CompactFlash Adapter",
+       },
        {
            USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,
            0,
@@ -3038,24 +4811,60 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Shuttle Technology",
            "eUSB ORCA Quad Reader",
        },
+       {
+           USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SCM,
+           0,
+           "Shuttle Technology",
+           "SCM Micro",
+       },
        {
            USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
            0,
            "Siemens",
            "SpeedStream USB",
        },
+       {
+           USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM22,
+           0,
+           "Siemens",
+           "SpeedStream USB 1022",
+       },
+       {
+           USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA,
+           0,
+           "Sigmatel",
+           "IrDA",
+       },
        {
            USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_I_BEAD100,
            0,
            "Sigmatel",
            "i-Bead 100 MP3 Player",
        },
+       {
+           USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X,
+           0,
+           "Sigmatel",
+           "Datum Networks SSF-7X Multi Players",
+       },
        {
            USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
            0,
            "SIIG",
            "DigiFilm-Combo Reader",
        },
+       {
+           USB_VENDOR_SIIG, USB_PRODUCT_SIIG_UISDMC2S,
+           0,
+           "SIIG",
+           "MULTICARDREADER",
+       },
+       {
+           USB_VENDOR_SIIG, USB_PRODUCT_SIIG_MULTICARDREADER,
+           0,
+           "SIIG",
+           "MULTICARDREADER",
+       },
        {
            USB_VENDOR_SIIG, USB_PRODUCT_SIIG_WINTERREADER,
            0,
@@ -3066,7 +4875,13 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308,
            0,
            "SIIG",
-           "USB to Serial",
+           "Serial",
+       },
+       {
+           USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E,
+           0,
+           "Silicom",
+           "U2E",
        },
        {
            USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
@@ -3090,7 +4905,13 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029,
            0,
            "Sitecom",
-           "USB 2.0 Ethernet Adapter",
+           "LN029",
+       },
+       {
+           USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104,
+           0,
+           "Sitecom",
+           "CN104 serial",
        },
        {
            USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
@@ -3152,6 +4973,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sony",
            "DSC cameras",
        },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_NWMS7,
+           0,
+           "Sony",
+           "Memorystick NW-MS7",
+       },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_DRIVEV2,
+           0,
+           "Sony",
+           "Harddrive V2",
+       },
        {
            USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1,
            0,
@@ -3176,12 +5009,36 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sony",
            "Sony Clie v3.5",
        },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARD,
+           0,
+           "Sony",
+           "PlayStation2 keyboard",
+       },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARDHUB,
+           0,
+           "Sony",
+           "PlayStation2 keyboard hub",
+       },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2MOUSE,
+           0,
+           "Sony",
+           "PlayStation2 mouse",
+       },
        {
            USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40,
            0,
            "Sony",
            "Sony Clie v4.0",
        },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC_U03,
+           0,
+           "Sony",
+           "MSC memory stick slot MSC-U03",
+       },
        {
            USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40_MS,
            0,
@@ -3212,6 +5069,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sony",
            "Sony Clie nx60",
        },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25,
+           0,
+           "Sony",
+           "Sony Clie tj25",
+       },
        {
            USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10,
            0,
@@ -3242,6 +5105,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "STSN",
            "Internet Access Device",
        },
+       {
+           USB_VENDOR_SUNCOMM, USB_PRODUCT_SUNCOMM_MB_ADAPTOR,
+           0,
+           "Sun Communications, Inc.",
+           "Mobile Adaptor",
+       },
        {
            USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_DS96L,
            0,
@@ -3249,16 +5118,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "SUNTAC U-Cable type D2",
        },
        {
-           USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U,
+           USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
            0,
            "SUN Corporation",
-           "SUNTAC Ir-Trinity",
+           "SUNTAC U-Cable type P1",
        },
        {
-           USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX,
+           USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
            0,
            "SUN Corporation",
-           "SUNTAC U-Cable type A3",
+           "SUNTAC Slipper U",
        },
        {
            USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U,
@@ -3267,16 +5136,10 @@ const struct usb_knowndev usb_knowndevs[] = {
            "SUNTAC Ir-Trinity",
        },
        {
-           USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
-           0,
-           "SUN Corporation",
-           "SUNTAC U-Cable type P1",
-       },
-       {
-           USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
+           USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX,
            0,
            "SUN Corporation",
-           "SUNTAC Slipper U",
+           "SUNTAC U-Cable type A3",
        },
        {
            USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS144L4,
@@ -3296,6 +5159,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sun Microsystems (unofficial)",
            "Type 6 USB mouse",
        },
+       {
+           USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10,
+           0,
+           "",
+           "USB Cable",
+       },
+       {
+           USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL,
+           0,
+           "System Talks",
+           "SGC-X2UL",
+       },
        {
            USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
            0,
@@ -3320,12 +5195,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Diamond (Supra)",
            "Rio 800 USB",
        },
+       {
+           USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_PSAPLAY120,
+           0,
+           "Diamond (Supra)",
+           "Nike psa[play 120",
+       },
        {
            USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL,
            0,
-           "System TALKS, Inc.",
+           "System Talks",
            "SGC-X2UL",
        },
+       {
+           USB_VENDOR_TANGTOP, USB_PRODUCT_TANGTOP_USBPS2,
+           0,
+           "Tangtop",
+           "USBPS2",
+       },
        {
            USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE,
            0,
@@ -3368,6 +5255,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "TEAC",
            "FD-05PUB floppy",
        },
+       {
+           USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_0193,
+           0,
+           "Tekram Technology",
+           "ALLNET 0193 WLAN",
+       },
+       {
+           USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZYAIR_B200,
+           0,
+           "Tekram Technology",
+           "ZyXEL ZyAIR B200 WLAN",
+       },
        {
            USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
            0,
@@ -3386,16 +5285,28 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Texas Instruments",
            "TUSB2046 hub",
        },
+       {
+           USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
+           0,
+           "Texas Instruments",
+           "Nex II Digital",
+       },
        {
            USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
            0,
            "Thrustmaster",
            "Fusion Digital Gamepad",
        },
+       {
+           USB_VENDOR_TODOS, USB_PRODUCT_TODOS_ARGOS_MINI,
+           0,
+           "Todos Data System",
+           "Argos Mini Smartcard Reader",
+       },
        {
            USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_POCKETPC_E740,
            0,
-           "Toshiba Corporation",
+           "Toshiba",
            "PocketPC e740",
        },
        {
@@ -3408,7 +5319,37 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
            0,
            "Trek Technology",
-           "ThumbDrive_8MB",
+           "ThumbDrive 8MB",
+       },
+       {
+           USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209,
+           0,
+           "Tripp-Lite",
+           "U209 Serial adapter",
+       },
+       {
+           USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
+           0,
+           "Trumpion Microelectronics",
+           "USB/MP3 decoder",
+       },
+       {
+           USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_C3310,
+           0,
+           "Trumpion Microelectronics",
+           "Comotron C3310 MP3 player",
+       },
+       {
+           USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000,
+           0,
+           "Tsunami",
+           "SM-2000",
+       },
+       {
+           USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_MDIV,
+           0,
+           "TwinMOS",
+           "Memory Disk IV",
        },
        {
            USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
@@ -3458,16 +5399,40 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Universal Access",
            "Panache Surf USB ISDN Adapter",
        },
+       {
+           USB_VENDOR_USR, USB_PRODUCT_USR_USR1120,
+           0,
+           "U.S. Robotics",
+           "USR1120 WLAN",
+       },
        {
            USB_VENDOR_VIDZMEDIA, USB_PRODUCT_VIDZMEDIA_MONSTERTV,
            0,
            "VidzMedia Pte Ltd",
            "MonsterTV P2H",
        },
+       {
+           USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773HUB,
+           0,
+           "ViewSonic",
+           "G773 Monitor Hub",
+       },
+       {
+           USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_P815HUB,
+           0,
+           "ViewSonic",
+           "P815 Monitor Hub",
+       },
+       {
+           USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773CTRL,
+           0,
+           "ViewSonic",
+           "G773 Monitor Control",
+       },
        {
            USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002,
            0,
-           "VLSI Vision / STMicroelectronics Imaging",
+           "VLSI Vision",
            "CPiA Camera",
        },
        {
@@ -3512,6 +5477,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Visioneer",
            "OneTouch 8600",
        },
+       {
+           USB_VENDOR_VIVITAR, USB_PRODUCT_VIVITAR_DSC350,
+           0,
+           "Vivitar",
+           "DSC350 Camera",
+       },
+       {
+           USB_VENDOR_VODAFONE, USB_PRODUCT_VODAFONE_MC3G,
+           0,
+           "Vodafone",
+           "Mobile Connect 3G datacard",
+       },
        {
            USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
            0,
@@ -3554,10 +5531,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Western Digital",
            "USB HUB",
        },
+       {
+           USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
+           0,
+           "Xirlink",
+           "IMAGING DEVICE",
+       },
        {
            USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
            0,
-           "Xirlink / Veo",
+           "Xirlink",
            "IBM PC Camera",
        },
        {
@@ -3572,6 +5555,48 @@ const struct usb_knowndev usb_knowndevs[] = {
            "YAMAHA",
            "UX256 MIDI I/F",
        },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU1000,
+           0,
+           "YAMAHA",
+           "MU1000 MIDI Synth.",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU2000,
+           0,
+           "YAMAHA",
+           "MU2000 MIDI Synth.",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU500,
+           0,
+           "YAMAHA",
+           "MU500 MIDI Synth.",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UW500,
+           0,
+           "YAMAHA",
+           "UW500 USB Audio I/F",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF6,
+           0,
+           "YAMAHA",
+           "MOTIF6 MIDI Synth. Workstation",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF7,
+           0,
+           "YAMAHA",
+           "MOTIF7 MIDI Synth. Workstation",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF8,
+           0,
+           "YAMAHA",
+           "MOTIF8 MIDI Synth. Workstation",
+       },
        {
            USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96,
            0,
@@ -3579,16 +5604,40 @@ const struct usb_knowndev usb_knowndevs[] = {
            "UX96 MIDI I/F",
        },
        {
-           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA54I,
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX16,
            0,
            "YAMAHA",
-           "NetVolante RTA54i Broadband&ISDN Router",
+           "UX16 MIDI I/F",
        },
        {
-           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA55I,
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_S08,
            0,
            "YAMAHA",
-           "NetVolante RTA55i Broadband VoIP Router",
+           "S08 MIDI Keyboard",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CLP150,
+           0,
+           "YAMAHA",
+           "CLP-150 digital piano",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CLP170,
+           0,
+           "YAMAHA",
+           "CLP-170 digital piano",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RPU200,
+           0,
+           "YAMAHA",
+           "RP-U200",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA54I,
+           0,
+           "YAMAHA",
+           "NetVolante RTA54i Broadband&ISDN Router",
        },
        {
            USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65B,
@@ -3597,10 +5646,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "NetVolante RTW65b Broadband Wireless Router",
        },
        {
-           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65I,
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65I,
+           0,
+           "YAMAHA",
+           "NetVolante RTW65i Broadband&ISDN Wireless Router",
+       },
+       {
+           USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA55I,
            0,
            "YAMAHA",
-           "NetVolante RTW65i Broadband&ISDN Wireless Router",
+           "NetVolante RTA55i Broadband VoIP Router",
        },
        {
            USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
@@ -3608,6 +5663,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Yano",
            "U640MO-03",
        },
+       {
+           USB_VENDOR_ZEEVO, USB_PRODUCT_ZEEVO_BLUETOOTH,
+           0,
+           "Zeevo, Inc.",
+           "BT-500 Bluetooth USB Adapter",
+       },
+       {
+           USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_725,
+           0,
+           "Z-Com",
+           "725/726 Prism2.5 WLAN",
+       },
        {
            USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
            0,
@@ -3626,6 +5693,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ZyXEL Communication",
            "Scorpion-980N keyboard",
        },
+       {
+           USB_VENDOR_EGALAX2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "eGalax, Inc.",
+           NULL,
+       },
        {
            USB_VENDOR_LTS, 0,
            USB_KNOWNDEV_NOPROD,
@@ -3851,7 +5924,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_CREATIVE, 0,
            USB_KNOWNDEV_NOPROD,
-           "Creative",
+           "Creative Labs",
            NULL,
        },
        {
@@ -3887,7 +5960,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_GRAVIS, 0,
            USB_KNOWNDEV_NOPROD,
-           "Advanced Gravis Computer Tech.",
+           "Advanced Gravis Computer",
            NULL,
        },
        {
@@ -4106,10 +6179,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Lucent",
            NULL,
        },
+       {
+           USB_VENDOR_PLANTRONICS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Plantronics",
+           NULL,
+       },
        {
            USB_VENDOR_KYOCERA, 0,
            USB_KNOWNDEV_NOPROD,
-           "Kyocera Corp.",
+           "Kyocera",
            NULL,
        },
        {
@@ -4133,13 +6212,13 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_COMPAQ, 0,
            USB_KNOWNDEV_NOPROD,
-           "Compaq Computers",
+           "Compaq",
            NULL,
        },