fix merge kernel usbmap

1 files changed, 95 insertions, 238 deletions

diff --git a/lst/usbtable b/lst/usbtable
index ad6e13d6..67003a05 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -1,222 +1,4 @@
 0x0000	0x0000	"unknown"	"Virtual|Hub"
-0x0003	0x03e8	0x0004	0x0000	"se401"	""
-0x0003	0x03e8	0x0008	0x0000	"kaweth"	""
-0x0003	0x03f0	0x0101	0x0000	"scanner"	""
-0x0003	0x03f0	0x0102	0x0000	"scanner"	""
-0x0003	0x03f0	0x0105	0x0000	"scanner"	""
-0x0003	0x03f0	0x0201	0x0000	"scanner"	""
-0x0003	0x03f0	0x0205	0x0000	"scanner"	""
-0x0003	0x03f0	0x0305	0x0000	"scanner"	""
-0x0003	0x03f0	0x0401	0x0000	"scanner"	""
-0x0003	0x03f0	0x0405	0x0000	"scanner"	""
-0x0003	0x03f0	0x0601	0x0000	"scanner"	""
-0x0003	0x03f0	0x0605	0x0000	"scanner"	""
-0x0003	0x03f0	0x0701	0x0000	"hpusbscsi"	""
-0x0003	0x03f0	0x0801	0x0000	"hpusbscsi"	""
-0x0003	0x03f0	0x4102	0x0000	"dc2xx"	""
-0x0003	0x0400	"scanner"	""
-0x0003	0x0403	"ftdi_sio"	""
-0x0003	0x040a	"dc2xx"	""
-0x0003	0x0411	"pegasus"	""
-0x0003	0x0423	"catc"	""
-0x0003	0x0458	"scanner"	""
-0x0003	0x0461	"scanner"	""
-0x0003	0x046d	0x0840	0x0000	"mod_quickcam"	""
-0x0003	0x046d	0x08b0	0x0000	"pwc"	""
-0x0003	0x046d	0xc281	0x0000	"iforce"	""
-0x0003	0x046d	0xc283	0x0000	"iforce"	""
-0x0003	0x046d	0xc285	0x0000	"iforce"	""
-0x0003	0x046d	0xc291	0x0000	"iforce"	""
-0x0003	0x0471	0x0302	0x0000	"pwc"	""
-0x0003	0x0471	0x0303	0x0000	"pwc"	""
-0x0003	0x0471	0x0304	0x0000	"pwc"	""
-0x0003	0x0471	0x0307	0x0000	"pwc"	""
-0x0003	0x0471	0x0308	0x0000	"pwc"	""
-0x0003	0x0471	0x030b	0x0000	"se401"	""
-0x0003	0x0471	0x030c	0x0000	"pwc"	""
-0x0003	0x0471	0x0310	0x0000	"pwc"	""
-0x0003	0x0471	0x0311	0x0000	"pwc"	""
-0x0003	0x0471	0x0312	0x0000	"pwc"	""
-0x0003	0x047d	"se401"	""
-0x0003	0x047e	0x1001	0x0000	"uss720"	""
-0x0003	0x0483	"hisax_st5481"	""
-0x0003	0x049f	0x505a	0x0000	"usbnet"	""
-0x0003	0x04a5	"scanner"	""
-0x0003	0x04a7	"scanner"	""
-0x0003	0x04a9	"scanner"	""
-0x0003	0x04b4	0x1002	0x0000	"dsbr100"	""
-0x0003	0x04b8	"scanner"	""
-0x0003	0x04bb	0x0901	0x0000	"kaweth"	""
-0x0003	0x04bb	0x0904	0x0000	"pegasus"	""
-0x0003	0x04bb	0x0a03	0x0000	"pl2303"	""
-0x0003	0x04ce	0x0300	0x0000	"microtek"	""
-0x0003	0x0506	0x03e8	0x0000	"kaweth"	""
-0x0003	0x0506	0x4601	0x0000	"pegasus"	""
-0x0003	0x050d	0x0004	0x0000	"usbnet"	""
-0x0003	0x050d	0x0103	0x0000	"belkin_sa"	""
-0x0003	0x050d	0x0109	0x0000	"mct_u232"	""
-0x0003	0x050d	0x0121	0x0000	"pegasus"	""
-0x0003	0x050d	0x0208	0x0000	"usbvision"	""
-0x0003	0x050d	0x1203	0x0000	"belkin_sa"	""
-0x0003	0x050f	0x0180	0x0000	"ir-usb"	""
-0x0003	0x0525	"usbnet"	""
-0x0003	0x0547	0x2131	0x0000	"dabusb"	""
-0x0003	0x0547	0x2720	0x0000	"usbnet"	""
-0x0003	0x0547	0x2727	0x0000	"usbnet"	""
-0x0003	0x0547	0x9999	0x0000	"dabusb"	""
-0x0003	0x054c	"visor"	""
-0x0003	0x0553	0x0002	0x0000	"cpia_usb"	""
-0x0003	0x0557	0x2001	0x0000	"uss720"	""
-0x0003	0x0557	0x2002	0x0000	"kaweth"	""
-0x0003	0x0557	0x2008	0x0000	"pl2303"	""
-0x0003	0x0557	0x4000	0x0000	"kaweth"	""
-0x0003	0x055d	"pwc"	""
-0x0003	0x055f	0x0001	0x0000	"scanner"	""
-0x0003	0x055f	0x0002	0x0000	"scanner"	""
-0x0003	0x055f	0x0003	0x0000	"scanner"	""
-0x0003	0x055f	0x0006	0x0000	"scanner"	""
-0x0003	0x055f	0x0008	0x0000	"scanner"	""
-0x0003	0x055f	0x0873	0x0000	"scanner"	""
-0x0003	0x055f	0xa800	0x0000	"mdc800"	""
-0x0003	0x0565	0x0001	0x0000	"belkin_sa"	""
-0x0003	0x0565	0x0002	0x0000	"kaweth"	""
-0x0003	0x0565	0x0005	0x0000	"kaweth"	""
-0x0003	0x056a	"wacom"	""
-0x0003	0x056c	0x8007	0x0000	"belkin_sa"	""
-0x0003	0x056c	0x8100	0x0000	"usbnet"	""
-0x0003	0x056e	"pegasus"	""
-0x0003	0x0573	"usbvision"	""
-0x0003	0x0586	0x1000	0x0000	"omninet"	""
-0x0003	0x05a9	"ov511"	""
-0x0003	0x05c5	"digi_acceleport"	""
-0x0003	0x05cc	0x3000	0x0000	"pegasus"	""
-0x0003	0x05d8	0x4002	0x0000	"scanner"	""
-0x0003	0x05da	"microtek"	""
-0x0003	0x05e3	0x0502	0x0000	"usbnet"	""
-0x0003	0x05e9	"kaweth"	""
-0x0003	0x05ef	"iforce"	""
-0x0003	0x0638	0x0268	0x0000	"scanner"	""
-0x0003	0x0638	0x026a	0x0000	"hpusbscsi"	""
-0x0003	0x066b	"pegasus"	""
-0x0003	0x067b	0x0001	0x0000	"usbnet"	""
-0x0003	0x067b	0x04bb	0x0000	"pl2303"	""
-0x0003	0x067b	0x2303	0x0000	"pl2303"	""
-0x0003	0x067b	"usbnet"	""
-0x0003	0x069a	0x0001	0x0000	"pwc"	""
-0x0003	0x06bd	"scanner"	""
-0x0003	0x06cd	0x0101	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0102	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0103	0x0000	"keyspan_pda"	""
-0x0003	0x06cd	0x0104	0x0000	"keyspan_pda"	""
-0x0003	0x06cd	0x0105	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0106	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0107	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0108	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0109	0x0000	"keyspan"	""
-0x0003	0x06cd	0x010a	0x0000	"keyspan"	""
-0x0003	0x06cd	0x010f	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0110	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0112	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0113	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0114	0x0000	"keyspan"	""
-0x0003	0x06cd	0x0115	0x0000	"keyspan"	""
-0x0003	0x06d0	0x0622	0x0000	"usbnet"	""
-0x0003	0x06e1	"kaweth"	""
-0x0003	0x06f8	0x0001	0x0000	"iforce"	""
-0x0003	0x0707	0x0100	0x0000	"kaweth"	""
-0x0003	0x0707	0x0200	0x0000	"pegasus"	""
-0x0003	0x0710	"whiteheat"	""
-0x0003	0x0711	"mct_u232"	""
-0x0003	0x0729	0x1284	0x0000	"uss720"	""
-0x0003	0x07a6	"pegasus"	""
-0x0003	0x07aa	0x0001	0x0000	"kaweth"	""
-0x0003	0x07aa	0x0004	0x0000	"pegasus"	""
-0x0003	0x07b3	"scanner"	""
-0x0003	0x07b8	0x110c	0x0000	"pegasus"	""
-0x0003	0x07b8	0x200c	0x0000	"pegasus"	""
-0x0003	0x07b8	0x4000	0x0000	"kaweth"	""
-0x0003	0x07b8	0x4002	0x0000	"pegasus"	""
-0x0003	0x07b8	0x4004	0x0000	"pegasus"	""
-0x0003	0x07b8	0x4007	0x0000	"pegasus"	""
-0x0003	0x07b8	0x400b	0x0000	"pegasus"	""
-0x0003	0x07b8	0x400c	0x0000	"pegasus"	""
-0x0003	0x07b8	0x4102	0x0000	"pegasus"	""
-0x0003	0x07b8	0x4104	0x0000	"pegasus"	""
-0x0003	0x07b8	0xabc1	0x0000	"pegasus"	""
-0x0003	0x07c9	0xb100	0x0000	"pegasus"	""
-0x0003	0x0813	0x0001	0x0000	"cpia_usb"	""
-0x0003	0x0813	0x0002	0x0000	"ov511"	""
-0x0003	0x082d	0x0100	0x0000	"visor"	""
-0x0003	0x0830	"visor"	""
-0x0003	0x083a	0x1046	0x0000	"pegasus"	""
-0x0003	0x0841	0x0001	0x0000	"rio500"	""
-0x0003	0x0846	"kaweth"	""
-0x0003	0x084f	0x0001	0x0000	"empeg"	""
-0x0003	0x085a	0x0008	0x0000	"kaweth"	""
-0x0003	0x085a	0x0009	0x0000	"kaweth"	""
-0x0003	0x085a	0x8027	0x0000	"keyspan_pda"	""
-0x0003	0x087d	0x5704	0x0000	"kaweth"	""
-0x0003	0x08d1	0x0001	0x0000	"catc"	""
-0x0003	0x08d1	0x0003	0x0000	"pegasus"	""
-0x0003	0x08dd	"pegasus"	""
-0x0003	0x08e9	0x0100	0x0000	"ir-usb"	""
-0x0003	0x0921	0x1000	0x0000	"belkin_sa"	""
-0x0003	0x0951	0x0008	0x0000	"kaweth"	""
-0x0003	0x0951	0x000a	0x0000	"pegasus"	""
-0x0003	0x095a	0x3003	0x0000	"kaweth"	""
-0x0003	0x09c4	0x0011	0x0000	"ir-usb"	""
-0x0003	0x0a17	0x1001	0x0000	"dc2xx"	""
-0x0003	0x0c4b	0x0100	0x0000	"cyberjack"	""
-0x0003	0x0ff5	0x0010	0x0000	"scanner"	""
-0x0003	0x10bd	0x1427	0x0000	"kaweth"	""
-0x0003	0x1293	0x0002	0x0000	"uss720"	""
-0x0003	0x1342	0x0204	0x0000	"kaweth"	""
-0x0003	0x13d2	0x0400	0x0000	"kaweth"	""
-0x0003	0x1485	0x0001	0x0000	"kaweth"	""
-0x0003	0x15e8	0x9100	0x0000	"pegasus"	""
-0x0003	0x1606	"scanner"	""
-0x0003	0x1608	"io_edgeport"	""
-0x0003	0x1645	0x0005	0x0000	"kaweth"	""
-0x0003	0x1645	0x0008	0x0000	"kaweth"	""
-0x0003	0x1645	0x8005	0x0000	"kaweth"	""
-0x0003	0x1645	0x8093	0x0000	"keyspan_pda"	""
-0x0003	0x2001	0x200c	0x0000	"pegasus"	""
-0x0003	0x2001	0x4000	0x0000	"kaweth"	""
-0x0003	0x2001	0x4001	0x0000	"pegasus"	""
-0x0003	0x2001	0x4002	0x0000	"pegasus"	""
-0x0003	0x2001	0x4003	0x0000	"pegasus"	""
-0x0003	0x2001	0x400b	0x0000	"pegasus"	""
-0x0003	0x2001	0x4102	0x0000	"pegasus"	""
-0x0003	0x2001	0xabc1	0x0000	"pegasus"	""
-0x0003	0x2304	0x0111	0x0000	"usbvision"	""
-0x0003	0xf003	0x6002	0x0000	"dc2xx"	""
-0x000f	0x03ee	"usb-storage"	""
-0x000f	0x03f0	"usb-storage"	""
-0x000f	0x0436	0x0005	0x0100	"usb-storage"	""
-0x000f	0x0451	0x5409	0x0001	"usb-storage"	""
-0x000f	0x04a4	0x0004	0x0001	"usb-storage"	""
-0x000f	0x04cb	0x0100	0x0000	"usb-storage"	""
-0x000f	0x04e6	"usb-storage"	""
-0x000f	0x050d	0x0115	0x0133	"usb-storage"	""
-0x000f	0x054c	"usb-storage"	""
-0x000f	0x057b	"usb-storage"	""
-0x000f	0x059f	0xa601	0x0200	"usb-storage"	""
-0x000f	0x05ab	"usb-storage"	""
-0x000f	0x05dc	0x0001	0x0000	"usb-storage"	""
-0x000f	0x0644	0x0000	0x0100	"usb-storage"	""
-0x000f	0x066b	0x0105	0x0100	"usb-storage"	""
-0x000f	0x0693	"usb-storage"	""
-0x000f	0x0781	"usb-storage"	""
-0x000f	0x07ab	0xfc01	0x0000	"usb-storage"	""
-0x000f	0x07af	"usb-storage"	""
-0x000f	0x07c4	"usb-storage"	""
-0x000f	0x07cf	0x1001	0x9009	"usb-storage"	""
-0x000f	0x097a	0x0001	0x0000	"usb-storage"	""
-0x000f	0x0bf6	0xa001	0x0100	"usb-storage"	""
-0x0070	0x0000	"printer"	""
-0x0080	0x0000	"usbcore"	""
-0x0180	0x0000	"audio"	""
-0x0380	0x0000	"usbmouse"	""
 0x03e8	0x0004	"se401"	"AOX Inc.|USB Camera"
 0x03e8	0x0008	"kaweth"	"AOX Inc.|101 Ethernet [klsi]"
 0x03eb	0x7603	"unknown"	"Atmel Corp.|AT76c503a D-Link DWL-120"
@@ -236,20 +18,23 @@
 0x03f0	0x0207	"unknown"	"Hewlett-Packard|CD-Writer Plus Mesa"
 0x03f0	0x020c	"unknown"	"Hewlett-Packard|Multimedia Keyboard Hub"
 0x03f0	0x0304	"unknown"	"Hewlett-Packard|DeskJet 812c"
+0x03f0	0x0305	"scanner"	""
 0x03f0	0x0311	"unknown"	"Hewlett-Packard|OfficeJet G85xi"
 0x03f0	0x0317	"unknown"	"Hewlett-Packard|LaserJet 1200"
 0x03f0	0x0401	"scanner"	"Hewlett-Packard|ScanJet 5200c"
 0x03f0	0x0404	"unknown"	"Hewlett-Packard|DeskJet 830c/832"
-0x03f0	0x0405	"unknown"	"Hewlett-Packard|ScanJet 3400cse"
+0x03f0	0x0405	"scanner"	"Hewlett-Packard|ScanJet 3400cse"
 0x03f0	0x0601	"scanner"	"Hewlett-Packard|ScanJet 6300c"
 0x03f0	0x0604	"unknown"	"Hewlett-Packard|DeskJet 840c"
+0x03f0	0x0605	"scanner"	""
 0x03f0	0x0701	"hp5300"	"Hewlett-Packard|ScanJet 5300""
+0x03f0	0x0801	"hpusbscsi"	""
 0x03f0	0x1004	"unknown"	"Hewlett-Packard|DeskJet 970Cse"
 0x03f0	0x1204	"unknown"	"Hewlett-Packard|DeskJet 930c"
 0x03f0	0x2002	"unknown"	"Hewlett-Packard|Usb Hub"
 0x03f0	0x2004	"unknown"	"Hewlett-Packard|DeskJet 640c"
 0x03f0	0x3102	"unknown"	"Hewlett-Packard|PhotoSmart P1100"
-0x03f0	0x4102	"unknown"	"Hewlett-Packard|PhotoSmart 618 Camera"
+0x03f0	0x4102	"dc2xx"	"Hewlett-Packard|PhotoSmart 618 Camera"
 0x03f0	0x6202	"unknown"	"Hewlett-Packard|PhotoSmart 215 Camera"
 0x0400	0x1000	"scanner"	"Mustek Systems Inc.|BearPaw 1200"
 0x0400	0x1001	"scanner"	"Mustek Systems Inc.|BearPaw 2400"
@@ -328,6 +113,12 @@
 0x0458	0x0101	"unknown"	"KYE Systems Corp.(Mouse Systems)|CueCat"
 0x0458	0x1004	"unknown"	"KYE Systems Corp.(Mouse Systems)|Flight2000 F-23 Joystick"
 0x0458	0x2001	"scanner"	"KYE Systems Corp.(Mouse Systems)|ColorPage-Vivid Pro Scanner"
+0x0458	0x2007	"scanner"	""
+0x0458	0x2008	"scanner"	""
+0x0458	0x2009	"scanner"	""
+0x0458	0x2013	"scanner"	""
+0x0458	0x2015	"scanner"	""
+0x0458	0x2016	"scanner"	""
 0x045a	0x0b4a	"unknown"	"Diamond Multimedia Systems|SupraMax 2890 56K Modem [Lucent Atlas]"
 0x045a	0x0b68	"unknown"	"Diamond Multimedia Systems|SupraMax 56K Modem"
 0x045e	0x0008	"unknown"	"Microsoft Corp.|SideWinder Precision Pro"
@@ -355,7 +146,7 @@
 0x0461	0x0303	"scanner"	"Primax Electronics|G2E-300 #2 Scanner"
 0x0461	0x0340	"scanner"	"Primax Electronics|Colorado 9600 Scanner"
 0x0461	0x0341	"scanner"	"Primax Electronics|Colorado 600u Scanner"
-0x0461	0x0346	"unknown"	"Primax Electronics|Memorex Maxx 6136u Scanner"
+0x0461	0x0346	"scanner"	"Primax Electronics|Memorex Maxx 6136u Scanner"
 0x0461	0x0347	"unknown"	"Primax Electronics|Visioneer 4400 Scanner"
 0x0461	0x0360	"scanner"	"Primax Electronics|Colorado 19200 Scanner"
 0x0461	0x0361	"scanner"	"Primax Electronics|Colorado 1200u Scanner"
@@ -379,6 +170,7 @@
 0x046d	0x0810	"unknown"	"Logitech Inc.|QuickCam Pro"
 0x046d	0x0840	"Flag:TV"	"Logitech Inc.|QuickCam Express"
 0x046d	0x0850	"unknown"	"Logitech Inc.|QuickCam Web"
+0x046d	0x08b0	"pwc"	""
 0x046d	0xc000	"unknown"	"Logitech Inc.|N43 [Pilot Mouse]"
 0x046d	0xc001	"Mouse:USB|Wheel"	"Logitech Inc.|N48 / M-BB48 [FirstMouse Plus]"
 0x046d	0xc002	"Mouse:USB|Wheel"	"Logitech Inc.|M-BA47 [MouseMan Plus]"
@@ -432,6 +224,22 @@
 0x047d	0x5003	"se401"	"Kensington|USB Camera"
 0x047e	0x1001	"uss720"	"Lucent Microelectronics|USS720 Parallel Port"
 0x047e	0xf101	"unknown"	"Lucent Microelectronics|Atlas Modem"
+0x0483	0x4810	"hisax_st5481"	""
+0x0483	0x4811	"hisax_st5481"	""
+0x0483	0x4812	"hisax_st5481"	""
+0x0483	0x4813	"hisax_st5481"	""
+0x0483	0x4814	"hisax_st5481"	""
+0x0483	0x4815	"hisax_st5481"	""
+0x0483	0x4816	"hisax_st5481"	""
+0x0483	0x4817	"hisax_st5481"	""
+0x0483	0x4818	"hisax_st5481"	""
+0x0483	0x4819	"hisax_st5481"	""
+0x0483	0x481a	"hisax_st5481"	""
+0x0483	0x481b	"hisax_st5481"	""
+0x0483	0x481c	"hisax_st5481"	""
+0x0483	0x481d	"hisax_st5481"	""
+0x0483	0x481e	"hisax_st5481"	""
+0x0483	0x481f	"hisax_st5481"	""
 0x0483	0x7554	"unknown"	"SGS Thomson Microelectronics|56k SoftModem"
 0x0489	0x0502	"unknown"	"Foxconn / Hon Hai|SmartMedia Card Reader Firmware Loader"
 0x0489	0x0503	"unknown"	"Foxconn / Hon Hai|SmartMedia Card Reader"
@@ -441,16 +249,17 @@
 0x049f	0x505a	"usbnet"	"Compaq Computer Corp.|Netowrk Interface"
 0x04a5	0x0001	"unknown"	"Acer Peripherals Inc.|Keyboard"
 0x04a5	0x12a6	"unknown"	"Acer Peripherals Inc.|AcerScan C310U"
-0x04a5	0x1a20	"unknown"	"Acer Peripherals Inc.|Prisa 310U"
-0x04a5	0x1a2a	"unknown"	"Acer Peripherals Inc.|Prisa 620U"
+0x04a5	0x1a20	"scanner"	"Acer Peripherals Inc.|Prisa 310U"
+0x04a5	0x1a2a	"scanner"	"Acer Peripherals Inc.|Prisa 620U"
 0x04a5	0x2022	"scanner"	"Acer Peripherals Inc.|Vuego Scan Brisa 340U"
 0x04a5	0x2040	"scanner"	"Acer Peripherals Inc.|Prisa AcerScan 620U"
 0x04a5	0x2060	"scanner"	"Acer Peripherals Inc.|Prisa AcerScan 620U & 640U"
-0x04a5	0x207e	"unknown"	"Acer Peripherals Inc.|Prisa 640BU"
-0x04a5	0x20b0	"unknown"	"Acer Peripherals Inc.|S2W 3300U/4300U"
-0x04a5	0x20be	"unknown"	"Acer Peripherals Inc.|Prisa 640BT"
-0x04a5	0x20c0	"unknown"	"Acer Peripherals Inc.|Prisa 1240UT"
-0x04a5	0x20de	"unknown"	"Acer Peripherals Inc.|S2W 4300U+"
+0x04a5	0x207e	"scanner"	"Acer Peripherals Inc.|Prisa 640BU"
+0x04a5	0x20b0	"scanner"	"Acer Peripherals Inc.|S2W 3300U/4300U"
+0x04a5	0x20be	"scanner"	"Acer Peripherals Inc.|Prisa 640BT"
+0x04a5	0x20c0	"scanner"	"Acer Peripherals Inc.|Prisa 1240UT"
+0x04a5	0x20de	"scanner"	"Acer Peripherals Inc.|S2W 4300U+"
+0x04a5	0x20fe	"scanner"	""
 0x04a5	0x9213	"unknown"	"Acer Peripherals Inc.|Kbd Hub"
 0x04a7	0x0211	"scanner"	"Visioneer|OneTouch 7600 USB"
 0x04a7	0x0221	"scanner"	"Visioneer|OneTouch 5300 Scanner"
@@ -462,10 +271,12 @@
 0x04a9	0x1051	"unknown"	"Canon Inc.|BJC-3000 Color Printer"
 0x04a9	0x1056	"unknown"	"Canon Inc.|BJC-2110 Color Printer"
 0x04a9	0x105d	"unknown"	"Canon Inc.|S450 Printer"
+0x04a9	0x2202	"scanner"	""
 0x04a9	0x2204	"unknown"	"Canon Inc.|CanoScan FB630U"
 0x04a9	0x2206	"unknown"	"Canon Inc.|CanoScan N650U"
-0x04a9	0x2207	"unknown"	"Canon Inc.|CanoScan 1220U"
+0x04a9	0x2207	"scanner"	"Canon Inc.|CanoScan 1220U"
 0x04a9	0x2208	"unknown"	"Canon Inc.|CanoScan D660U"
+0x04a9	0x220b	"scanner"	""
 0x04a9	0x3041	"unknown"	"Canon Inc.|PowerShot S10"
 0x04a9	0x3043	"unknown"	"Canon Inc.|PowerShot S20"
 0x04a9	0x3045	"unknown"	"Canon Inc.|PowerShot S100"
@@ -503,7 +314,9 @@
 0x04b8	0x010a	"scanner"	"Seiko Epson Corp.|Perfection 1640SU / 1640SU Photo"
 0x04b8	0x010b	"scanner"	"Seiko Epson Corp.|Perfection 1240U / 1240U Photo"
 0x04b8	0x010c	"scanner"	"Seiko Epson Corp.|Perfection 640U"
+0x04b8	0x010e	"scanner"	""
 0x04b8	0x0110	"scanner"	"Seiko Epson Corp.|Perfection 1650 Photo"
+0x04b8	0x0112	"scanner"	""
 0x04b8	0x0601	"unknown"	"Seiko Epson Corp.|Stylus Photo 875DC Card Reader"
 0x04b9	0x1000	"unknown"	"Rainbow Technologies, Inc.|iKey 1000 Token"
 0x04b9	0x1001	"unknown"	"Rainbow Technologies, Inc.|iKey 1200 Token"
@@ -512,6 +325,7 @@
 0x04b9	0x1300	"unknown"	"Rainbow Technologies, Inc.|iKey 3000 Token"
 0x04bb	0x0901	"kaweth"	"Rainbow Technologies, Inc.|"
 0x04bb	0x0904	"pegasus"	"I-O Data Device, Inc.|ET/TX Ethernet [pegasus]"
+0x04bb	0x0a03	"pl2303"	""
 0x04bf	0x0100	"unknown"	"TDK Corp.|MediaReader CF"
 0x04c1	0x0082	"unknown"	"U.S. Robotics (3Com)|OfficeConnect Analog Modem"
 0x04c1	0x008f	"unknown"	"U.S. Robotics (3Com)|Pro ISDN TA"
@@ -547,14 +361,16 @@
 0x0506	0x4601	"pegasus"	"3Com Corp.|USB Network Adapter"
 0x050d	0x0004	"usbnet"	"Belkin Components|"
 0x050d	0x0103	"belkin_sa"	"Belkin Components|"
-0x050d	0x0109	"unknown"	"Belkin Components|PDA Adapter"
+0x050d	0x0109	"mct_u232"	"Belkin Components|PDA Adapter"
 0x050d	0x0115	"unknown"	"Belkin Components|SCSI Adapter"
+0x050d	0x0121	"pegasus"	""
 0x050d	0x0208	"usbvision"	"Belkin Components|"
-0x050d	0x1203	"unknown"	"Belkin Components|F5U120-PC Serial Port"
+0x050d	0x1203	"belkin_sa"	"Belkin Components|F5U120-PC Serial Port"
 0x050f	0x0003	"unknown"	"KC Technology Inc.|KC82C160S Hub"
 0x050f	0x0180	"irda-usb"	"KC Technology Inc.|"
 0x051d	0x0002	"unknown"	"American Power Conversion|Back-UPS Pro 500"
 0x0525	0x1080	"usbnet"	"Netchip Technology Inc.|NET1080 USB-USB Bridge"
+0x0525	0x9901	"usbnet"	""
 0x0528	0x7561	"unknown"	"ATI Technologies, Inc.|TV Wonder"
 0x0529	0x0001	"unknown"	"Aladdin Knowledge Systems|USB-HASP 0.06"
 0x0529	0x030b	"unknown"	"Aladdin Knowledge Systems|eToken R1 v3.1.3.x"
@@ -582,6 +398,7 @@
 0x0547	0x2131	"dabusb"	"Anchor Chips Inc.|AN2131 EZUSB Microcontroller"
 0x0547	0x2235	"unknown"	"Anchor Chips Inc.|AN2235 EZUSB-FX Microcontroller"
 0x0547	0x2720	"usbnet"	"Anchor Chips Inc.|Network Interface"
+0x0547	0x2727	"usbnet"	""
 0x0547	0x2810	"unknown"	"Anchor Chips Inc.|Cypress USB ATAPI Bridge"
 0x0547	0x9999	"dabusb"	"Anchor Chips Inc.|AN2131 uninitialized (???)"
 0x054c	0x0010	"unknown"	"Sony Corp.|DSC-F505 Cybershot Digital Camera"
@@ -591,7 +408,8 @@
 0x054c	0x002d	"unknown"	"Sony Corp.|MSAC-US1 MemoryStick Reader"
 0x054c	0x002e	"unknown"	"Sony Corp.|Sony HandyCam MemoryStick Reader"
 0x054c	0x0032	"unknown"	"Sony Corp.|MemoryStick MSC-U01 Reader"
-0x054c	0x0038	"unknown"	"Sony Corp.|CLIE PEG-S300/D PalmOS PDA"
+0x054c	0x0038	"visor"	"Sony Corp.|CLIE PEG-S300/D PalmOS PDA"
+0x054c	0x0066	"visor"	""
 0x0553	0x0002	"cpia_usb"	"VLSI Vision Ltd.|CPiA WebCam"
 0x0553	0x0202	"unknown"	"VLSI Vision Ltd.|Aiptek PenCam 1"
 0x0557	0x2001	"uss720"	"ATEN International Co. Ltd.|UC-1284 Printer Port"
@@ -600,12 +418,14 @@
 0x0557	0x2008	"pl2303"	"ATEN International Co. Ltd.|"
 0x0557	0x2600	"unknown"	"ATEN International Co. Ltd.|IDE Bridge"
 0x0557	0x4000	"kaweth"	"ATEN International Co. Ltd.|DSB-650 10Mbps Ethernet [klsi]"
+0x055d	0x9000	"pwc"	""
 0x055d	0x9001	"pwc"	"Samsung Electro-Mechanics Co.|MPC-C31 AnyCam Premium for Notebooks"
 0x055f	0x0001	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 CU"
 0x055f	0x0002	"scanner"	"Mustek Systems Inc.|ScanExpress 600 CU"
 0x055f	0x0003	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 USB"
 0x055f	0x0006	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 UB"
 0x055f	0x0008	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 CU Plus"
+0x055f	0x0873	"scanner"	""
 0x055f	0xa800	"mdc800"	"Mustek Systems Inc.|MDC 800 Camera"
 0x0562	0x0001	"unknown"	"Telex Communications Inc.|Enhanced Microphone"
 0x0565	0x0001	"belkin_sa"	"Peracom Networks, Inc.|Serial Port"
@@ -614,12 +434,23 @@
 0x056a	0x0000	"Tablet:wacom"	"Wacom Co., Ltd.|PenPartner"
 0x056a	0x0010	"Tablet:wacom"	"Wacom Co., Ltd.|Graphire"
 0x056a	0x0011	"Tablet:wacom"	"Wacom Co., Ltd.|Graphire2"
+0x056a	0x0012	"wacom"	""
 0x056a	0x0020	"Tablet:wacom"	"Wacom Co., Ltd.|Intuos 4x5"
 0x056a	0x0021	"Tablet:wacom"	"Wacom Co., Ltd.|Intuos 6x8"
 0x056a	0x0022	"Tablet:wacom"	"Wacom Co., Ltd.|Intuos 9x12"
 0x056a	0x0023	"Tablet:wacom"	"Wacom Co., Ltd.|Intuos 12x12"
 0x056a	0x0024	"Tablet:wacom"	"Wacom Co., Ltd.|Intuos 12x18"
+0x056a	0x0030	"wacom"	""
 0x056a	0x0031	"Tablet:wacom"	"Wacom Co., Ltd.|PL500"
+0x056a	0x0032	"wacom"	""
+0x056a	0x0033	"wacom"	""
+0x056a	0x0034	"wacom"	""
+0x056a	0x0035	"wacom"	""
+0x056a	0x0041	"wacom"	""
+0x056a	0x0042	"wacom"	""
+0x056a	0x0043	"wacom"	""
+0x056a	0x0044	"wacom"	""
+0x056a	0x0045	"wacom"	""
 0x056c	0x8007	"belkin_sa"	"eTEK Labs|Kwik232 Serial Port"
 0x056c	0x8100	"usbnet"	"eTEK Labs|Network Interface"
 0x056c	0x8101	"unknown"	"eTEK Labs|KwikLink USB-USB Bridge"
@@ -692,18 +523,20 @@
 0x05cc	0x2280	"unknown"	"ELSA AG|MicroLink 56k Fun"
 0x05cc	0x3000	"pegasus"	"ELSA AG|USB Network Adapter"
 0x05d7	0x0099	"unknown"	"Thomas & Betts Corp.|10Mbps Ethernet [klsi]"
+0x05d8	0x4002	"scanner"	""
 0x05da	0x0093	"unknown"	"Microtek International Inc.|ScanMaker V6USL"
 0x05da	0x0094	"microtek"	"Microtek International Inc.|Phantom 336CX/C3"
 0x05da	0x0099	"microtek"	"Microtek International Inc.|ScanMaker X6/X6U"
 0x05da	0x009a	"microtek"	"Microtek International Inc.|Phantom C6"
 0x05da	0x00a0	"microtek"	"Microtek International Inc.|Phantom 336CX/C3 (#2)"
 0x05da	0x00a3	"microtek"	"Microtek International Inc.|"
-0x05da	0x00b6	"unknown"	"Microtek International Inc.|ScanMaker V6UPL"
+0x05da	0x00b6	"microtek"	"Microtek International Inc.|ScanMaker V6UPL"
 0x05da	0x40ca	"unknown"	"Microtek International Inc.|ScanMaker 3600"
 0x05da	0x80a3	"microtek"	"Microtek International Inc.|ScanMaker V6USL (#2)"
 0x05da	0x80ac	"microtek"	"Microtek International Inc.|ScanMaker V6UL/SpicyU"
 0x05e3	0x000b	"unknown"	"Genesys Logic, Inc.|Karna Razor BoomSlang 2000 Mouse"
 0x05e3	0x0300	"unknown"	"Genesys Logic, Inc.|GLUSB98PT Parallel Port"
+0x05e3	0x0502	"usbnet"	""
 0x05e9	0x0008	"kaweth"	"Kawasaki LSI|KL5KUSB101B Ethernet [klsi]"
 0x05e9	0x0009	"kaweth"	"Kawasaki LSI|Sony 10Mbps Ethernet [pegasus]"
 0x05ef	0x020a	"iforce"	"AVB, Inc. [anko?]|"
@@ -722,7 +555,7 @@
 0x060b	0x2101	"unknown"	"Solid Year (?)|Solid Year Keyboard"
 0x0618	0x0101	"unknown"	"MacAlly|Mouse"
 0x0638	0x0268	"scanner"	"Avision, Inc.|iVina 1200U Scanner"
-0x0638	0x026a	"unknown"	"Avision, Inc.|Minolta Dimage Scan Dual II"
+0x0638	0x026a	"hpusbscsi"	"Avision, Inc.|Minolta Dimage Scan Dual II"
 0x0644	0x0000	"Floppy:normal"	"TEAC|Floppy drive-05PUB"
 0x0667	0x0fa1	"unknown"	"AIWA|TD-U8000 Tape Drive"
 0x066b	0x0105	"unknown"	"Linksys Inc.|SCM eUSB SmartMedia Card Reader"
@@ -739,6 +572,7 @@
 0x0675	0x0110	"unknown"	"Draytech|Vigor 128 ISDN TA"
 0x067b	0x0000	"usbnet"	"Prolific Technology, Inc.|PL2301 USB-USB Bridge"
 0x067b	0x0001	"usbnet"	"Prolific Technology, Inc.|PL2302 USB-USB Bridge"
+0x067b	0x04bb	"pl2303"	""
 0x067b	0x2303	"pl2303"	"Prolific Technology, Inc.|"
 0x067b	0x2307	"unknown"	"Prolific Technology, Inc.|PL2307 USB-ATAPI4 Bridge"
 0x067c	0x4060	"unknown"	"Efficient Networks, Inc.|Alcatel Speedstream 4060 ADSL Modem"
@@ -766,7 +600,11 @@
 0x06bd	0x0403	"unknown"	"AGFA-Gevaert NV|ePhoto CL18 Camera"
 0x06bd	0x0404	"unknown"	"AGFA-Gevaert NV|ePhoto CL20 Camera"
 0x06bd	0x2061	"scanner"	"AGFA-Gevaert NV|SnapScan 1212U (???)"
+0x06bd	0x208d	"scanner"	""
 0x06bd	0x208f	"unknown"	"AGFA-Gevaert NV|SnapScan e50"
+0x06bd	0x2091	"scanner"	""
+0x06bd	0x2095	"scanner"	""
+0x06bd	0x2097	"scanner"	""
 0x06cd	0x0101	"keyspan"	""
 0x06cd	0x0102	"keyspan"	""
 0x06cd	0x0103	"keyspan_pda"	"Keyspan|Keyspan PDA"
@@ -780,9 +618,12 @@
 0x06cd	0x010f	"keyspan"	""
 0x06cd	0x0110	"keyspan"	""
 0x06cd	0x0112	"keyspan"	""
-0x06cd	0x0114	"unknown"	"Keyspan|USA-28X PDA"
+0x06cd	0x0113	"keyspan"	""
+0x06cd	0x0114	"keyspan"	"Keyspan|USA-28X PDA"
+0x06cd	0x0115	"keyspan"	""
 0x06cf	0x1010	"unknown"	"SpheronVR AG|PanoCam 10"
 0x06cf	0x1012	"unknown"	"SpheronVR AG|PanoCam 12/12X"
+0x06d0	0x0622	"usbnet"	""
 0x06d5	0x4000	"unknown"	"Toshiba|Japanese Keyboard"
 0x06e0	0xf101	"unknown"	"Multi-Tech Systems, Inc.|MT5634ZBA MultiModem 56k Intl."
 0x06e0	0xf104	"unknown"	"Multi-Tech Systems, Inc.|MT5634ZBA MultiModem 56k "
@@ -837,6 +678,17 @@
 0x07b0	0x0001	"unknown"	"Trust Technologies|ISDN TA"
 0x07b2	0x4100	"unknown"	"Motorola ING|SB4100 Cable Modem"
 0x07b3	0x0001	"unknown"	"Plustek, Inc.|OpticPro 1212U Scanner"
+0x07b3	0x0005	"scanner"	""
+0x07b3	0x0007	"scanner"	""
+0x07b3	0x000f	"scanner"	""
+0x07b3	0x0010	"scanner"	""
+0x07b3	0x0011	"scanner"	""
+0x07b3	0x0012	"scanner"	""
+0x07b3	0x0013	"scanner"	""
+0x07b3	0x0014	"scanner"	""
+0x07b3	0x0015	"scanner"	""
+0x07b3	0x0016	"scanner"	""
+0x07b3	0x0017	"scanner"	""
 0x07b4	0x0100	"unknown"	"Olympus Optical Co., Ltd.|C-2100 Ultra Zoom Camera"
 0x07b5	0x9902	"unknown"	"Mega World International Ltd.|GamePad"
 0x07b8	0x110c	"pegasus"	"D-Link, Inc.|USB Network Adapter"
@@ -856,6 +708,7 @@
 0x07c4	0xa005	"unknown"	"DataFab Systems, Inc.|CompactFlash & SmartMedia Card Reader"
 0x07c4	0xa006	"unknown"	"DataFab Systems, Inc.|SmartMedia Card Reader"
 0x07c4	0xa109	"unknown"	"DataFab Systems, Inc.|LC1 CompactFlash & SmartMedia Card Reader"
+0x07c9	0xb100	"pegasus"	""
 0x07cc	0x0004	"unknown"	"SIIG|DigiFilm-Combo Reader"
 0x07cc	0x0006	"unknown"	"Carry Inc.|SM/CF/PCMCIA Card Reader"
 0x07cf	0x1001	"unknown"	"Casio Computer Co., Ltd.|QV-8000SX Digicam"
@@ -869,6 +722,7 @@
 0x082d	0x0100	"visor"	"Handspring|Visor"
 0x0830	0x0001	"visor"	"Palm Computing, Inc|"
 0x0830	0x0002	"visor"	"Palm Computing, Inc|Palm m505 Cradle"
+0x0830	0x0040	"visor"	""
 0x0830	0x0080	"visor"	"Palm Computing, Inc|Palm Cradle"
 0x083a	0x1046	"pegasus"	"Accton Technology Corp.|10/100 Ethernet [pegasus]"
 0x083f	0xb100	"unknown"	"Global Village|TelePort V.90 Fax/Modem"
@@ -883,6 +737,7 @@
 0x085a	0x0001	"unknown"	"Xircom|Portstation Dual Serial Port"
 0x085a	0x0008	"kaweth"	"PortGear|Ethernet Adapter"
 0x085a	0x0009	"kaweth"	"PortGear|Ethernet Adapter"
+0x085a	0x8027	"keyspan_pda"	""
 0x086c	0x1001	"unknown"	"DeTeWe - Deutsche Telephonwerke AG & Co.|Eumex 504PC ISDN TA"
 0x0871	0x0001	"unknown"	"SanDisk, Inc.|SDDR-01 Compact Flash Reader"
 0x0871	0x0002	"unknown"	"SanDisk, Inc.|SDDR-31 Compact Flash Reader"
@@ -903,7 +758,7 @@
 0x0921	0x0100	"belkin_sa"	"GoHubs, Inc.|"
 0x0921	0x1000	"belkin_sa"	"GoHubs, Inc.|"
 0x0951	0x0008	"kaweth"	"Kingston Technology|USB Ethernet Adapter"
-0x0951	0x000a	"unknown"	"Kingston Technology|KNU101TX 100baseTX Ethernet"
+0x0951	0x000a	"pegasus"	"Kingston Technology|KNU101TX 100baseTX Ethernet"
 0x095a	0x3003	"kaweth"	"Portsmith|Express Ethernet Adapter"
 0x0985	0x00a3	"unknown"	"cab Produkttechnik GmbH & Co KG|A3/200 or A3/300 Label Printer"
 0x09b2	0x0001	"unknown"	"Franklin Electronic Publishers|eBookman Palm Computer"
@@ -912,6 +767,7 @@
 0x09bf	0x00db	"unknown"	"Auerswald GmbH & Co. KG|COMpact 4410/2206 ISDN ISDN"
 0x09bf	0x00f1	"unknown"	"Auerswald GmbH & Co. KG|COMfort System Telephones"
 0x09c4	0x0011	"irda-usb"	""
+0x0a17	0x1001	"dc2xx"	""
 0x0a5f	0x0009	"unknown"	"Zebra|LP2844 Printer"
 0x0a6b	0x0001	"unknown"	"Green House|Compact Flash R/W with MP3 player"
 0x0abe	0x0101	"unknown"	"Stereo-Link|SL1200 DAC"
@@ -942,6 +798,7 @@
 0x1606	0x0002	"unknown"	"Umax|Astra 1236U"
 0x1606	0x0010	"scanner"	"Umax|Astra 1220U"
 0x1606	0x0030	"scanner"	"Umax|Astra 2000U"
+0x1606	0x0130	"scanner"	""
 0x1606	0x0230	"scanner"	"Umax|Astra 2200U"
 0x1606	0x2020	"unknown"	"Umax|AstraCam 1000"
 0x1608	0x0001	"io_edgeport"	"Inside Out Networks|EdgePort/4 Serial Port"
@@ -960,7 +817,7 @@
 0x1608	0x0012	"io_edgeport"	"Inside Out Networks|"
 0x1608	0x0013	"io_edgeport"	"Inside Out Networks|"
 0x1608	0x0014	"io_edgeport"	"Inside Out Networks|"
-0x1608	0x1403	"unknown"	"Inside Out Networks [hex]|MultiTech Systems MT4X56 Modem"
+0x1608	0x1403	"io_edgeport"	"Inside Out Networks [hex]|MultiTech Systems MT4X56 Modem"
 0x1645	0x0001	"unknown"	"Entrega|1S Serial Port"
 0x1645	0x0002	"unknown"	"Entrega|2S Serial Port"
 0x1645	0x0003	"unknown"	"Entrega|1S25 Serial Port"
@@ -973,7 +830,7 @@
 0x1645	0x8000	"unknown"	"Entrega|EZ-USB"
 0x1645	0x8002	"unknown"	"Entrega (???)|2x Serial Port"
 0x1645	0x8005	"kaweth"	""
-0x1645	0x8093	"unknown"	"Entrega|PortGear Serial Port"
+0x1645	0x8093	"keyspan_pda"	"Entrega|PortGear Serial Port"
 0x1668	0x0333	"unknown"	"Actiontec Electronics, Inc.|Modem"
 0x1668	0x0408	"unknown"	"Actiontec Electronics, Inc.|USB Wireless Adapter"
 0x1690	0x0101	"unknown"	"Creative Labs|Modem Blaster DE5670"