diff -Naur usbutils-0.72/usb.ids usbutils-0.72.tpg/usb.ids
--- usbutils-0.72/usb.ids	2006-02-09 07:35:34.000000000 +0000
+++ usbutils-0.72.tpg/usb.ids	2007-10-18 22:39:24.000000000 +0000
@@ -1,12 +1,15 @@
 #
 #	List of USB ID's
 #
-#	Maintained by Vojtech Pavlik <vojtech@suse.cz>
+#	Originally maintained by Vojtech Pavlik <vojtech@suse.cz>
+#	Modified version maintained by Diego Pettenò <flameeyes@gmail.com>
 #	If you have any new entries, send them to the maintainer.
+#	Send entries as patches (diff -u old new).
 #	The latest version can be obtained from
-#		http://www.linux-usb.org/usb.ids
+#		http://dev.gentooexperimental.org/~flameeyes/usb.ids
 #
-# $Id: usb.ids,v 1.11 2006/02/09 07:35:34 dbrownell Exp $
+# Original:
+# $Id: usb.ids,v 1.230 2006/12/12 21:43:04 dbrownell Exp $
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -29,11 +32,23 @@
 03ea  Data Broadcasting Corp.
 03eb  Atmel Corp.
 	2002  Mass Storage Device
+	2015  at90usbkey sample firmware (HID keyboard)
+	2018  at90usbkey sample firmware (CDC ACM)
+	2019  stk525 sample firmware (microphone)
+	201c  at90usbkey sample firmware (HID mouse)
+	201d  at90usbkey sample firmware (HID generic)
+	2022  at90usbkey sample firmware (composite device)
 	2103  JTAG ICE mkII
+	2104  AVR ISP mkII
+	2107  AVR Dragon
+	2ffb  at90usb AVR DFU bootloader
+	2ffd  at89c5130/c5131 DFU bootloader
+	2fff  at89c5132/c51snd1c DFU bootloader
 	3301  at43301 4-port Hub
 	3312  4-port Hub
 	5601  at76c510 Prism-II 802.11b Access Point
 	5603  Cisco 7920 WiFi IP Phone
+	6124  at91sam SAMBA bootloader
 	7603  at76c503a D-Link DWL-120 802.11b Adapter
 	7605  at76c503a 802.11b Adapter
 	7606  at76c505 802.11b Adapter
@@ -48,15 +63,15 @@
 03f0  Hewlett-Packard
 	0004  DeskJet 895c
 	0101  ScanJet 4100c
-	0102  PhotoSmart S20
+	0102  PhotoSmart S20/S20xi
 	0104  DeskJet 880c/970c
-	0105  ScanJet 4200c
+	0105  ScanJet 4200C/4200Cxi/4200Cse
 	0107  CD-Writer Plus
 	010c  Multimedia Keyboard Hub
 	0111  G55xi Printer/Scanner/Copier
 	011c  hn210w 802.11b Adapter
 	0121  HP49g+ Calculator
-	0201  ScanJet 6200c
+	0201  ScanJet 6200C/6250C
 	0202  PhotoSmart S20
 	0204  DeskJet 815c
 	0205  ScanJet 3300c
@@ -73,52 +88,68 @@
 	0505  ScanJet 2100c
 	050c  5219 Wireless Keyboard
 	0517  LaserJet 1000
-	0601  ScanJet 6300c
+	0601  ScanJet 6300C/6350C/6390C
 	0604  DeskJet 840c
-	0605  ScanJet 2200c
-	0701  ScanJet 5300c/5370c
+	0605  ScanJet 2200C
+	0701  ScanJet 5300C/5370C
 	0704  DeskJet 825c
-	0705  ScanJet 4400c
+	0705  ScanJet 4400C
 	0712  DeskJet 1180c
-	0801  ScanJet 7400c
+	0801  ScanJet 7400C/7450C/7490C
 	0804  DeskJet 816c
-	0901  ScanJet 2300c
+	0805  HP4470C
+	0901  ScanJet 2300C
 	0904  DeskJet 845c
+	0a01  ScanJet 2400c
+	0b01  ScanJet 8250/8250/8290/8200
+	1001  Photo Scanner 1000
 	1004  DeskJet 970c/970cse
-	1005  ScanJet 5400c
+	1005  ScanJet 5400C
 	1016  Jornada 548 / iPAQ HW6515 Pocket PC 
 	1104  DeskJet 959c
 	1105  ScanJet 5470c
 	1116  Jornada 568 Pocket PC
 	1151  750xi Printer/Scanner/Copier
 	1204  DeskJet 930c
-	1305  ScanJet 4570c
+	1205  ScanJet 4500C/5550C
+	1305  ScanJet 4570C/5500C
 	1317  LaserJet 1005
-	1405  Scanjet 3670
+	1405  Scanjet 3670C/3690C
 	1504  DeskJet 920c
 	1604  DeskJet 940c
+	1605  ScanJet 5530C Photosmart
+	1705  ScanJet 5590
+	171d  USB Wireless (Bluetooth + WLAN) Interface [HP Integrated Module]
+	1805  ScanJet 7650
 	1904  DeskJet 3820
+	1b05  ScanJet 4850C/4890C
 	1c17  Color LaserJet 2550l
 	1e11  PSC-950
 	2002  Hub
 	2004  DeskJet 640c
-	2005  ScanJet 3570c
+	2005  ScanJet 3530C/3570C
 	2104  DeskJet 630c
-	2205  ScanJet 3500c
+	2205  ScanJet 3500C
 	2304  DeskJet 656c
 	2305  ScanJet 3970c
+	2405  ScanJet 4070 Photosmart
+	2505  ScanJet 3770
+	2605  ScanJet 3800c
 	2811  PSC-2100
 	2d11  OfficeJet 6110
+	3005  ScanJet 4600/4670
 	3102  PhotoSmart P1100 Printer w/ Card Reader
 	3104  DeskJet 960c
 	3304  DeskJet 990c
 	3404  DeskJet 6122
 	3504  DeskJet 6127c
+	3a11  OfficeJet 5500 series
 	3c02  PhotoSmart 7350
 	3d11  OfficeJet 4215
 	3f11  PSC-1315/PSC-1317
 	4002  PhotoSmart 720 / PhotoSmart 935 (storage)
 	4102  PhotoSmart 618
+	4105  ScanJet 4370
 	4202  PhotoSmart 812
 	4302  PhotoSmart 850 (ptp)
 	4402  PhotoSmart 935 (ptp)
@@ -248,6 +279,11 @@
 	057c  CX7530
 	057f  DX7590
 	5010  Wireless Adapter
+	6001  i30
+	6002  i40
+	6003  i50
+	6004  i60
+	6005  i80
 040b  Weltrend Semiconductor
 	6510  Weltrend Bar Code Reader
 	6520  XBOX Xploder
@@ -261,6 +297,9 @@
 	0027  WLI-USB-KS11G 802.11b Adapter
 0412  Award Software International
 0413  Leadtek Research, Inc.
+	6025  WinFast DTV Dongle (cold state)
+	6026  WinFast DTV Dongle (warm state)
+	6f00  WinFast DTV Dongle (STK7700P based)
 0414  Giga-Byte Technology Co., Ltd
 0416  Winbond Electronics Corp.
 	0961  AVL Flash Card Reader
@@ -292,6 +331,7 @@
 	4003  VideoBlaster WebCam Go Plus [W9967CF]
 	4004  Nomad II MG
 	4005  WebCam Blaster Go ES
+	4007  WebCam Go Mini
 	400a  PC-Cam 300
 	400b  PC-Cam 600
 	400c  WebCam 5 [pwc]
@@ -301,6 +341,7 @@
 	4015  CardCam Value
 	4017  WebCam Mobile
 	4018  WebCam Vista
+	4028  WebCam VistaPlus
 	401c  WebCam NX [PD1110]
 	401d  WebCam NX Ultra
 	401e  WebCam NX Pro
@@ -321,6 +362,7 @@
 	4116  MuVo^2
 	4117  Nomad MuVo TX
 	411b  Zen Touch
+	411c  Nomad MuVo USB 2.0
 	411d  Zen
 	411e  Zen Micro
 	4123  Zen Portable Media Center
@@ -340,9 +382,15 @@
 	040f  6230 GSM Phone
 	0410  6630 Imaging Smartphone
 	0415  9300 GSM Smartphone
+	0418  E-70 (PC-Suite mode)
 	041a  9500 GSM Communicator (RNDIS)
 	041b  9300 GSM Smartphone (RNDIS)
 	0429  6230i Camera Phone
+	0435  E-70 (IP Passthrough/RNDIS mode)
+	044d  E-61 (PC Suite mode)
+	044e  E-61 (Data Exchange mode)
+	044f  E-61 (IP Passthrough/RNDIS mode)
+	0105  E-61 (Firmware update mode)
 	0800  Connectivity Cable DKU-5
 0422  ADI Systems, Inc.
 0423  Computer Access Technology Corp.
@@ -389,14 +437,21 @@
 	001c  Kodak Personal Picture Maker 200 Printer
 	001f  Kodak Personal Picture Maker 200 Card Reader
 	0020  Z51 Printer
-	0021  Z33 Printer
+	0021  Z33 Printer (Xerox WorkCentre XK35c)
 	002d  X70/X73 Scan/Print/Copy
 	003d  X83 Scan/Print/Copy
 	0057  Z35 Printer
 	0060  X74/X75 Scanner
 	0061  X74 Hub
+	0065  X5130
 	0069  X74/X75 Printer
 	0072  X6170 Printer
+	007c  Lexmark X1110/X1130/X1140/X1150/X1170/X1180/X1185
+	007d  Photo 3150
+	0093  X5250
+	0097  P6250
+	00bb  X2330
+	4303  Xerox WorkCentre Pro 412
 043e  LG Electronics USA, Inc.
 	42bd  Flatron 795FT Plus Monitor
 	4a4d  Flatron 915FT Plus Monitor
@@ -462,13 +517,26 @@
 	1004  Flight2000 F-23 Joystick
 	100a  Aashima Technology Trust Sight Fighter Vibration Feedback Joystick
 	2001  ColorPage-Vivid Pro Scanner
+	2004  ColorPage-HR6 V1 Scanner
 	2007  ColorPage-HR6 V2 Scanner
 	2008  ColorPage-HR6 V2 Scanner
 	2009  ColorPage-HR6A Scanner
-	2011  ColorPage-Vivid3x Scanner
+	2011  ColorPage-Vivid3x/Vivid3 V2 Scanner
 	2013  ColorPage-HR7 Scanner
+	2014  ColorPage-Vivid4
 	2015  ColorPage-HR7LE Scanner
 	2016  ColorPage-HR6X Scanner
+	2017  ColorPage-Vivid3xe
+	2018  ColorPage-HR7X
+	2019  ColorPage-HR6X Slim
+	201a  ColorPage-Vivid4xe
+	201b  ColorPage-Vivid4x
+	201c  ColorPage-HR8
+	201d  ColorPage-Vivid 1200 X
+	201e  ColorPage-Slim 1200
+	201f  ColorPage-Vivid 1200 XE
+	2020  ColorPage-Slim 1200 USB2
+	2021  ColorPage-SF600
 	301d  Genius MaxFire MiniPad
 	7004  VideoCAM Express
 	7007  VideoCAM Web
@@ -477,6 +545,20 @@
 045a  SONICblue, Inc.
 	0b4a  SupraMax 2890 56K Modem [Lucent Atlas]
 	0b68  SupraMax 56K Modem
+	5001  Rio 600 MP3 Player
+	5002  Rio 800 MP3 Player
+	5003  Nike Psa/Play MP3 Player
+	5005  Rio S10 MP3 Player
+	5006  Rio S50 MP3 Player
+	5007  Rio S35 MP3 Player
+	5008  Rio 900 MP3 Player
+	5009  Rio S30 MP3 Player
+	500d  Fuse MP3 Player
+	500e  Chiba MP3 Player
+	500f  Cali MP3 Player
+	5010  Rio S11 MP3 Player
+	503f  Cali256 MP3 Player
+	5202  Rio Riot MP3 Player
 	5210  Rio Karma Music Player
 	5220  Rio Nitrus MP3 Player
 045b  Hitachi, Ltd
@@ -516,6 +598,7 @@
 	008c  Wireless Intellimouse Explorer 2.0
 	00b9  Wireless Optical Mouse 3.0
 	00bd  Fingerprint Reader
+	00e1  Wireless Laser Mouse 6000
 	0284  Xbox DVD Playback Kit
 	0288  Xbox Controller S Hub
 	0289  Xbox Controller S
@@ -528,18 +611,23 @@
 	0340  Colorado 9600 Scanner
 	0341  Colorado 600u Scanner
 	0345  Visioneer 6200 Scanner
-	0346  Memorex Maxx 6136u Scanner
-	0347  Primascan Colorado 2600u/Visioneer 4400 Scanner
+	0346  Colorado 2400U/Memorex Maxx 6136u/TCE MK600U Scanner
+	0347  Memorex 6142u/ScanMaker 3630/Primascan Colorado 2600u/Tiny FU661E/Visioneer Onetouch 4400/Visioneer Scanner
 	0360  Colorado 19200 Scanner
 	0361  Colorado 1200u Scanner
-	0364  LG Electronics Scanworks 600U Scanner
+	0364  Colorado 2200 USB/LG Electronics Scanworks 600U Scanner
 	0371  Visioneer Onetouch 8920 Scanner
-	0377  Medion MD 5345 Scanner
-	037b  Medion MD 6190 Scanner
+	0374  UMAX Astra 2500
+	0377  Medion/Lifetec/Tevion/Cytron MD 5345/6228/6471 Scanner
+	037b  Medion/Lifetec/Tevion/Cytron MD 6190/41260/41985 Scanner
 	0380  G2-600 Scanner
 	0381  ReadyScan 636i Scanner
 	0382  G2-600 #2 Scanner
 	0383  G2E-600 Scanner
+	038a  UMAX Astra 3000/3600
+	038b  Xerox 2400 Onetouch
+	038c  UMAX Astra 4100
+	0392  Medion/Lifetec/Tevion/Cytron MD 6190
 	0813  IBM UltraPort Camera
 	0815  Micro Innovations WebCam
 	0819  Fujifilm IX-30 Camera [webcam mode]
@@ -582,7 +670,10 @@
 	08b2  QuickCam Pro 4000
 	08b3  QuickCam Zoom
 	08b4  QuickCam Zoom
+	08da  QuickCam Messanger
 	08f0  QuickCam Messenger
+	08f5  QuickCam Messenger Communicate
+	08f6  Quickcam Messenger Plus
 	0900  ClickSmart 310
 	0901  ClickSmart 510
 	0903  ClickSmart 820
@@ -594,6 +685,7 @@
 	0950  Pocket Camera
 	0960  ClickSmart 420
 	0970  Pocket750
+	0a02  Premium Stereo USB Headset 350
 	c000  N43 [Pilot Mouse]
 	c001  N48/M-BB48 [FirstMouse Plus]
 	c002  M-BA47 [MouseMan Plus]
@@ -638,6 +730,7 @@
 	c506  MX-700 Cordless Mouse Receiver
 	c50b  Cordless Desktop Optical
 	c50e  MX-1000 Cordless Mouse Receiver
+	c512  LX-700 Cordless Desktop Receiver
 	d001  QuickCam Pro
 046e  Behavior Tech. Computer Corp.
 	6782  BTC 7932 mouse+keyboard
@@ -668,6 +761,9 @@
 0474  Sanyo Electric Co., Ltd
 	0701  SCP-4900 Cellphone
 0475  Relisys/Teco Information System
+	0100  NEC Petiscan
+	0103  Eclipse 1200U/Episode
+	0210  Scorpio Ultra 3
 0476  AESP
 0477  Seagate Technology, Inc.
 0478  Connectix Corp.
@@ -679,6 +775,7 @@
 	0002  Keyboard and Mouse
 	0101  BlueTooth Keyboard and Mouse
 	020b  SK-3105 SmartCard Reader
+	1000  Trust Office Scan USB 19200
 	1002  HP ScanJet 4300c Parallel Port
 047c  Dell Computer Corp.
 047d  Kensington
@@ -701,6 +798,7 @@
 0482  Kyocera Corp.
 	000e  FS-1020D Printer
 0483  SGS Thomson Microelectronics
+	0138  ZTE ZXDSL 852 ver. II
 	1307  Cytronix 6in1 card reader
 	163d  Cool Icam Digi-MP3
 	2016  Fingerprint Reader
@@ -741,7 +839,7 @@
 	0021  S200 Scanner
 	0033  801.11b Adapter [orinoco]
 	0051  KU-0133 Easy Access Interner Keyboard
-	505a  SA-11x0 based Linux Device, or Itsy (experimental)
+	505a  Linux-USB "CDC Subset" Device, or Itsy (experimental)
 	8511  iPAQ Networking 10/100 Ethernet [pegasus2]
 04a0  Digital Equipment Corp.
 04a1  SystemSoft Corp.
@@ -761,8 +859,11 @@
 	20be  Prisa 640BT
 	20c0  Prisa 1240UT
 	20de  S2W 4300U+
-	20fc  Benq 5000
-	20fe  SW2 5300U
+	20f8  Benq 5000
+	20fc  Benq 5000E/5000U
+	20fe  SW2 5300U/Benq 5300
+	2137  Benq 5150/5250
+	2202  Benq 7400UT
 	3003  Benq WebCam
 	3008  Benq 1500
 	300a  Benq 3410
@@ -772,18 +873,32 @@
 04a7  Visioneer
 	0211  OneTouch 7600 Scanner
 	0221  OneTouch 5300 Scanner
-	0224  OneTouch 4800 USB/Microtek Scanport 3000
+	0224  OneTouch 4800 USB/Vantas 3000/Microtek Scanport 3000/Xerox One Touch 4800
 	0226  OneTouch 5300 USB
+	0229  OneTouch 7100
+	022a  OneTouch 6600
+	022c  OneTouch 9000/9020
 	0231  6100 Scanner
 	0311  6200 EPP/USB Scanner
 	0321  OneTouch 8100 EPP/USB Scanner
 	0331  OneTouch 8600 EPP/USB Scanner
+	0362  OneTouch 9320
+	0371  OneTouch 8700/8920
+	03a0  Xerox 4800 One Touch
+	0410  OneTouch Pro 8800/8820
+	0421  9450 USB
+	0427  Strobe XP 100
+	0444  OneTouch 7300
+	0446  Xerox DocuMate 510
+	0449  Xerox DocuMate 252
+	044c  Xerox DocuMate 262
+	0475  Xerox DocuMate 272
 04a8  Multivideo Labs, Inc.
 04a9  Canon, Inc.
 	1051  BJC-3000 Color Printer
 	1056  BJC-2110 Color Printer
 	105b  S600 Printer
-	105d  S450 Printer
+	105d  S450 Printer/IS 32 Scanner
 	1062  S500 Printer
 	1064  S300 Printer
 	106b  S520 Printer
@@ -792,6 +907,19 @@
 	1073  I550 Printer
 	1074  S330 Printer
 	1094  PIXMA iP3000x Printer
+	1601  DR-2080C Scanner
+	1607  DR-6080 Scanner
+	1700  PIXMA MP110 Scanner
+	1701  PIXMA MP130 Scanner
+	1706  PIXMA MP750 Scanner
+	1707  PIXMA MP780 Scanner
+	1708  PIXMA MP760 Scanner
+	1709  PIXMA MP150 Scanner
+	170a  PIXMA MP170 Scanner
+	170b  PIXMA MP450 Scanner
+	170c  PIXMA MP500 Scanner
+	170d  PIXMA MP800 Scanner
+	1713  PIXMA MP830 Scanner
 	2201  CanoScan FB320U
 	2202  CanoScan FB620U
 	2204  CanoScan FB630U
@@ -808,12 +936,21 @@
 	2210  CanoScan 9900F
 	2212  CanoScan 5000F
 	2213  LiDE 50/LiDE 35
+	2214  CanoScan LiDE 80
 	2215  CanoScan 3000/3000F/3000ex
 	2216  CanoScan 3200F
 	2217  CanoScan 5200F
+	2219  CanoScan 9950F
+	221b  CanoScan 4200F
+	221c  CanoScan LiDE 60
 	221e  CanoScan 8400F
+	221f  CanoScan LiDE 500F
+	2220  CanoScan LiDE 25
 	2611  SmartBase MPC400
 	262b  LaserShot LBP-1120 Printer
+	262f  MultiPASS MP730
+	2630  MultiPASS MP700
+	263c  Smartbase MP360
 	3041  PowerShot S10
 	3042  CanoScan FS4000US Film Scanner
 	3043  PowerShot S20
@@ -876,6 +1013,7 @@
 	30ec  EOS 20D (ptp)
 	30ee  EOS 350D
 	30ef  EOS 350D (ptp)
+	3138  PowerShot A710 IS
 04aa  DaeWoo Telecom, Ltd
 04ab  Chromatic Research
 04ac  Micro Audiometrics Corp.
@@ -911,7 +1049,9 @@
 	0301  Coolpix 2000 (storage)
 	0302  Coolpix 2000 (ptp)
 	0402  DSC D100 (ptp)
-	4000  Coolscan LS 40 ED
+	4000  LS 40 ED
+	4001  LS 50 ED/Coolscan V ED
+	4002  Super Coolscan LS-5000 ED
 04b1  Pan International
 04b3  IBM Corp.
 	3004  Media Access Pro Keyboard
@@ -953,30 +1093,73 @@
 	0005  Stylus Printer
 	0101  Perfection 636
 	0102  GT-2200
-	0103  Perfection 610
-	0104  Perfection 1200
-	0105  StylusScan 2000
+	0103  Perfection 610 (GT-6600)
+	0104  Perfection 1200 (GT-7600)
+	0105  Stylus Scan 2000
 	0106  Stylus Scan 2500
-	0107  Expression 1600U
-	0109  Expression 1640 XL
-	010a  Perfection 1640SU
-	010b  Perfection 1240
-	010c  Perfection 640
-	010e  Perfection 1680
-	010f  Perfection 1250
-	0110  Perfection 1650
-	0112  Perfection 2450
+	0107  Expression 1600 (ES-2000)
+	0109  Expression 1640 XL (ES-8500)
+	010a  Perfection 1640 (GT-8700)
+	010b  Perfection 1240 (GT-7700)
+	010c  Perfection 640 (GT-6700)
+	010e  Perfection 1680 (ES-2200)
+	010f  Perfection 1250 (GT-7200)
+	0110  Perfection 1650 (GT-8200)
+	0112  Perfection 2450 (GT-9700)
 	0114  Perfection 660
-	011b  Perfection 2400 Photo
-	011c  Perfection 3200
-	011d  Perfection 1260 Photo
-	011e  Perfection 1660 Photo
+	0116  Perfection 3170 (GT-9400)
+	0118  Perfection 4180 (GF-F600)
+	0119  Perfection 4490 (GT-X750)
+	011b  Perfection 2400 (GT-9300)
+	011c  Perfection 3200 (GT-9800)
+	011d  Perfection 1260 (GT-7300)
+	011e  Perfection 1660 (GT-8300)
 	011f  Perfection 1670
+	0121  Perfection 2480/2580 (GT-F500/F550)
+	0122  Perfection 3490/3590 (GT-F520/F570)
+	0126  GT-15000 (ES-7000)
+	0128  Perfection 4870 (GT-X700)
+	0129  Expression 10000XL (ES-10000G)
+	012a  Perfection 4990 (GT-X800)
+	012b  GT-2500 (ES-H300)
+	012c  Perfection V350 (GT-F700)
+	012d  Perfection V10/V100 (GT-S600/F650)
+	012f  Perfection V350 (GT-F700)
 	0202  Receipt Printer M129C
 	0601  Stylus Photo 875DC Card Reader
 	0602  Stylus Photo 895 Card Reader
-	0801  Stylus CX5200
-	0802  Stylus CX3200
+	0801  Stylus CX5100/5200 (CC-600)
+	0802  Stylus CX3100/3200 (CC-570)
+	0805  Stylus CX6300/6400/6500/6600
+	0806  Stylus Photo RX600/610
+	0807  Stylus Photo RX500/510
+	0808  Stylus CX5400
+	080d  Stylus CX4500/4600
+	080e  Stylus CX3500/3600 (PX-A550)
+	080f  Stylus Photo RX420/425/430
+	0810  Stylus Photo RX700 (PM-A900)
+	0811  Stylus Photo RX620/630 (PM-A870)
+	0813  Stylus CX6500/6600
+	0814  (PM-A700)
+	0815  AcuLaser CX11 (LP-A500)
+	0817  (LP-M5500)
+	0818  Stylus CX3700/CX3800/DX3800
+	0819  Stylus CX4700/CX4800/DX4800 (PX-A750)
+	081a  Stylus Photo RX520/RX530 (PM-A750)
+	081c  Stylus Photo RX640/RX650 (PM-A890)
+	081d  (PM-A950)
+	081f  Stylus CX7700/7800
+	0820  Stylus CX4100/CX4200/DX4200
+	0827  Stylus Photo RX560/580/590 (PM-A820)
+	0828  (PM-A970)
+	0829  (PM-T990)
+	082a  (PM-A920)
+	082b  Stylus CX4900/CX5000/DX5000
+	082e  Stylus CX5900/CX6000/DX6000 (PX-A720)
+	082f  Stylus CX3900/DX4000 (PX-A620)
+	0830  Stylus CX2800/CX2900/ME200
+	0833  (LP-M5600)
+	0835  AcuLaser CX21
 04b9  Rainbow Technologies, Inc.
 	1000  iKey 1000 Token
 	1001  iKey 1200 Token
@@ -1001,14 +1184,24 @@
 04c3  Maxi Switch, Inc.
 04c4  Lockheed Martin Energy Research
 04c5  Fujitsu, Ltd
-	1029  fi-4010c Scanner
-	1041  fi-4120c Scanner
-	1042  fi-4220c Scanner
+	1029  fi-4010C/fi-4010CU Scanner
+	1033  fi-4110CU
+	1041  fi-4120C Scanner
+	1042  fi-4220C Scanner
+	1096  fi-5110EOX
+	1097  fi-5110C
+	10ae  fi-4120C2
+	10af  fi-4220C2
+	10e0  fi-5120C
+	10e1  fi-5220C
+	10e7  fi-5900C
+	10fe  S500
 04c6  Toshiba America Electronic Components
 04c7  Micro Macro Technologies
 04c8  Konica Corp.
 	0720  Digital Color Camera
 	0721  e-miniD Camera
+	0722  e-mini Camera
 	0723  KD-200Z Camera
 	0726  KD-310Z Camera
 04ca  Lite-On Technology Corp.
@@ -1104,6 +1297,9 @@
 	300c  ML-1210 Printer
 	324c  ML-1740 Printer
 	3260  CLP-510 Color Laser Printer
+	3409  SCX-4216F Scanner
+	3413  SCX-4100 Scanner
+	3903  Xerox WorkCentre XK50cx
 	5a03  Yepp MP3 Player
 	6601  Z100 Mobile Phone
 04e9  PC-Tel, Inc.
@@ -1186,6 +1382,8 @@
 	0803  Nostromo 1745 GamePad
 	0805  Nostromo N50 GamePad
 	1203  F5U120-PC Serial Port
+	3101  F1DG102U Flip KVM
+	3201  F1DG102U Flip KVM
 	7050  F5D7050 ver 1000 WiFi
 050e  Neon Technology, Inc.
 050f  KC Technology, Inc.
@@ -1207,7 +1405,7 @@
 051b  Silicon Graphics
 051c  Shuttle, Inc.
 051d  American Power Conversion
-	0002  Back-UPS Pro 500/1000/1500
+	0002  Back-UPS PRO RS or SmartUPS
 051e  Scientific Atlanta, Inc.
 051f  IO Systems (Elite Electronics), Inc.
 0520  Taiwan Semiconductor Manufacturing Co.
@@ -1436,6 +1634,7 @@
 	cafe  AccessRunner ADSL Modem
 	cb00  E-Tech ADSL Modem v2
 	cb01  GeekADSL Promax Q31 ADSL Modem
+	cb07  ZTE ZXDSL 852
 0573  Zoran Co. Personal Media Division (Nogatech)
 	0003  USBGear USBG-V1
 	0400  D-Link V100
@@ -1524,6 +1723,7 @@
 	2802  Monterey Keyboard
 	5492  Hub
 	6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
+	6362  Multi Card Reader
 	9213  MacAlly Kbd Hub
 	9215  AU9814 Hub
 	9254  Hub
@@ -1594,15 +1794,20 @@
 	0206  Apple Extended Keyboard [Mitsumi]
 	020e  Apple Internal Keyboard/Trackpad
 	020f  Apple Internal Keyboard/Trackpad
+	021b  Apple Internal Keyboard/Trackpad (MacBook Pro)
 	0301  iMac Mouse [Mitsumi/Logitech]
 	0302  Apple Optical Mouse [Fujitsu]
 	1001  Apple Keyboard Hub [ALPS]
 	1002  Apple Extended Keyboard Hub [Mitsumi]
 	1101  Speakers
 	1201  3G iPod
+	120a  1G iPod Nano
 	1300  iPod Shuffle
 	8202  HCF V.90 Data/Fax Modem
 	8203  Bluetooth HCI
+	8205  Bluetooth HCI (MacBook Pro)
+	8240  IR Receiver (MacBook Pro)
+	8501  Built-in iSight (MacBook Pro) [Micron]
 05ad  Y.C. Cable U.S.A., Inc.
 05ae  Synopsys, Inc.
 05af  Jing-Mold Enterprise Co., Ltd
@@ -2181,6 +2386,7 @@
 	0003  ADB to USB convertor
 0717  ZNK Corp.
 0718  Imation Corp.
+	0084  1GB USB Flash Drive
 0719  Tremon Enterprises Co., Ltd
 071b  Domain Technologies, Inc.
 	0002  DTI-56362-USB Digital Interface Unit
@@ -2370,6 +2576,7 @@
 	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560 Zoom Camera
 	0112  MAUSB-100 xD Card Reader
 	0114  C-350Z Camera
+	0118  µ-mini Camera
 	0203  Digital Voice Recorder DW-90
 	0206  Digital Voice Recorder DS-330
 	0207  Digital Voice Recorder & Camera W-10
@@ -2691,6 +2898,7 @@
 	0100  Fast Flicks Digital Camera
 091e  Garmin International
 	0003  GPSmap (various models)
+	0004  iQue 3600
 0920  Echelon Co.
 0921  GoHubs, Inc.
 0922  Dymo-CoStar Corp.
@@ -2710,6 +2918,7 @@
 092a  Toshiba Information & Industrial Sys. And Services
 092b  Sena Technologies, Inc.
 0930  Toshiba Corp.
+	0508  Integrated Bluetooth HCI
 	6519  Kingston DataTraveler 2.0 USB Stick
 	6533  512M USB Stick
 0931  Harmonic Data Systems, Ltd
@@ -2904,8 +3113,10 @@
 0a5a  Electronics For Imaging, Inc.
 0a5b  EAsics NV
 0a5c  Broadcom Corp.
+	200a  BCM2035 Bluetooth
 	2033  BCM2033 Bluetooth
 	2035  BCM2035 Bluetooth
+	2121  BCM2210 Bluetooth
 0a5d  Diatrend Corp.
 0a5f  Zebra
 	0009  LP2844 Printer
@@ -3656,6 +3867,7 @@
 0f60  NTK, Ltd
 0f61  Varian, Inc.
 0f62  Acrox Technologies Co., Ltd
+	1001  Targus Mini Trackball Optical Mouse
 0f68  Kobe Steel, Ltd
 0f69  Dionex Corp.
 0f6a  Vibren Technologies, Inc.
@@ -3697,6 +3909,7 @@
 	0001  Blackberry Handheld
 0fce  Sony Ericsson Mobile Communications AB
 	d017  K608i Phone
+	d016  K750i Phone
 0fcf  Dynastream Innovations, Inc.
 0fd0  Tulip Computers B.V.
 0fd4  Tenovis GmbH & Co., KG
@@ -3861,6 +4074,8 @@
 1108  Brightcom Technologies, Ltd
 1110  Analog Devices Canada, Ltd (Allied Telesyn)
 	900f  AT-AR215 DSL Modem
+	9010  AT-AR215 DSL Modem
+	9021  Sagem F@st 800 ADSL modem
 1112  YM ELECTRIC CO., Ltd
 1113  Medion AG
 111e  VSO Electric Co., Ltd
@@ -3953,8 +4168,12 @@
 1293  Belkin Components [hex]
 	0002  F5U002 Parallel Port [uss720]
 	2101  104-key keyboard
+12f7  Memorex
+	1a00  TD Classic 003B
 12fd  AIN Comm. Technology Co., Ltd
 	1001  AWU2000b 802.11b Stick
+1307  Dikom
+	0163  512MB USB Flash Drive
 1310  Roper
 	0001  Class 1 Bluetooth Dongle
 1312  ICS Electronics
@@ -4010,6 +4229,7 @@
 	0001  Avermedia AverTV DVBT USB1.1 (cold)
 	0002  Avermedia AverTV DVBT USB1.1 (warm)
 	0201  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (cold)
+	0221  AVermedia DVBT Tuner Dongle
 	0301  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (warm)
 14c2  Gemlight Computer, Ltd
 1518  Cheshire Engineering Corp.
@@ -4021,6 +4241,8 @@
 1546  U-Blox AG
 1554  Prolink Microsystems Corp.
 1568  Sunf Pu Technology Co., Ltd
+1582  Unknown
+	6003  ZyXEL zd1211b 802.11b+g Adapter
 15c2  SoundGraph Inc.
 	ffdc  iMON PAD Remote Controller
 15c6  Laboratoires MXM
@@ -4067,6 +4289,8 @@
 	0408  Prism2.5 802.11b Adapter
 	0421  Prism2.5 802.11b Adapter
 	0500  BTM200B BlueTooth Adapter
+1686  Zoom Corp.
+	0045  H4 Digital Recorder
 1690  Askey Computer Corp. [hex]
 	0101  Creative Modem Blaster DE5670
 	0103  Askey 1456 VQE-R3 Modem [conexant]
@@ -4076,6 +4300,8 @@
 1706  BlueView Technologies, Inc.
 1733  Cellink Technology Co., Ltd
 	0101  RF Wireless Optical Mouse OP-701
+17b3  Grey Innovation
+	0004  Linux-USB Midi Gadget
 17eb  Cornice, Inc.
 1822  Twinhan
 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
@@ -4088,6 +4314,9 @@
 	5641  TSAM-004 Presentation Remote
 1977  T-Logic
 	0111  TL203 MP3 Player and Voice Recorder
+1995  Trillium Technology Pty. Ltd.
+	3202  REC-ADPT-USB (recorder)
+	3203  REC-A-ADPT-USB (recorder)
 1ebb  NuCORE Technology, Inc.
 2001  D-Link Corp. [hex]
 	3200  DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]
@@ -4137,6 +4366,7 @@
 	0210  Pinnacle Studio PCTV USB (PAL) with FM radio
 	0212  Pinnacle Studio PCTV USB (NTSC)
 	0214  Pinnacle Studio PCTV USB (PAL) with FM radio
+	0227  Pinnacle Studio PCTV HD pro stick
 	0300  Pinnacle Studio Linx Video input cable (NTSC)
 	0301  Pinnacle Studio Linx Video input cable (PAL)
 	0419  Pinnacle PCTV Bungee USB (PAL) with FM radio
@@ -4177,6 +4407,7 @@
 	1007  iFP-700 series mp3/ogg vorbis player
 	1008  iFP-800 series mp3/ogg vorbis player
 	100A  iFP-1000 series mp3/ogg vorbis player
+	1014  T20 series mp3/ogg vorbis player (ums firmware)
 	1101  iFP-100 series mp3 player (ums firmware)
 	1103  iFP-300 series mp3 player (ums firmware)
 	1105  iFP-500 series mp3 player (ums firmware)
@@ -4200,6 +4431,8 @@
 4146  USBest Technology
 	9281  Iomega Micro Mini 128MB Flash Drive
 	ba01  Intuix Flash Drive
+4348  W.ch
+	5523  CH341SWDM Serial Port
 4572  Shuttle, Inc.
 	4572  Shuttle PN31 Remote
 4586  Panram
@@ -4227,6 +4460,8 @@
 6993  Freshtel
 	b001  FT-102 VoIP USB Phone
 6a75  Shanghai Jujo Electronics Co., Ltd
+7104  CME (Central Music Co.)
+	2202  UF5/UF6/UF7/UF8 MIDI Master Keyboard
 8086  Intel Corp.
 	0110  Easy PC Camera
 	0431  Intel Pro Video PC Camera
@@ -4322,9 +4557,10 @@
 		50  Bulk (Zip)
 C 09  Hub
 	00  Unused
+		00  Full speed (or root) hub
 		01  Single TT
 		02  TT per port
-C 0a  Data
+C 0a  CDC Data
 	00  Unused
 		30  I.430 ISDN BRI
 		31  HDLC
@@ -4353,18 +4589,26 @@
 	01  Radio Frequency
 		01  Bluetooth
 		02  Ultra WideBand Radio Control
+		03  RNDIS
 	02  Wireless USB Wire Adapter
 		01  Host Wire Adapter Control/Data Streaming
 		02  Device Wire Adapter Control/Data Streaming
 		03  Device Wire Adapter Isochronous Streaming
 C ef  Miscellaneous Device
+	01  ?
+		01  Microsoft ActiveSync
+		02  Palm Sync
 	02  Common Class
 		01  Interface Association
 		02  Wire Adapter Multifunction Peripheral
+	03  ?
+		01  Cable Based Association
 C fe  Application Specific Interface
 	01  Device Firmware Update
 	02  IRDA Bridge
 	03  Test and Measurement
+		01  TMC
+		02  USB488
 C ff  Vendor Specific Class
 	ff  Vendor Specific Subclass
 		ff  Vendor Specific Protocol