merge with modules.usbmap

1 files changed, 76 insertions, 32 deletions

diff --git a/lst/usbtable b/lst/usbtable
index f137d8cb..8118893b 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -1,5 +1,5 @@
-0x0000	0x0000	"usbmouse"	"Virtual|Hub"
-0x03e8	0x0008	"unknown"	"AOX Inc.|101 Ethernet [klsi]"
+0x0000	0x0000	"unknown"	"Virtual|Hub"
+0x03e8	0x0008	"kaweth"	"AOX Inc.|101 Ethernet [klsi]"
 0x03ee	0x0000	"unknown"	"Mitsumi|CD-R/RW Drive"
 0x03f0	0x0101	"scanner"	"Hewlett-Packard|ScanJet 4100c"
 0x03f0	0x0102	"scanner"	"Hewlett-Packard|PhotoSmart S20"
@@ -15,10 +15,11 @@
 0x03f0	0x0404	"unknown"	"Hewlett-Packard|DeskJet 830c/832"
 0x03f0	0x0601	"scanner"	"Hewlett-Packard|ScanJet 6300c "
 0x03f0	0x0604	"unknown"	"Hewlett-Packard|DeskJet 840c"
-0x03f0	0x0701	"scanner"	""
+0x03f0	0x0701	"hp5300"	""
 0x03f0	0x1004	"unknown"	"Hewlett-Packard|DeskJet 970Cse"
 0x03f0	0x3102	"unknown"	"Hewlett-Packard|PhotoSmart P1100"
 0x0400	0x1000	"scanner"	""
+0x0400	0x1001	"scanner"	""
 0x0403	0x0000	"unknown"	"Future Technology Devices|H4SMK 7 Port Multifunction Hub"
 0x0403	0x6001	"ftdi_sio"	""
 0x0403	0x8371	"unknown"	"Future Technology Devices|PS/2 Keyboard And Mouse"
@@ -120,6 +121,7 @@
 0x047e	0xf101	"unknown"	"Lucent Microelectronics|Atlas Modem"
 0x0483	0x7554	"unknown"	"SGS Thomson Microelectronics|56k SoftModem"
 0x049c	0x0002	"unknown"	"Acer Advanced Labs, Inc.|Keyboard (???)"
+0x049f	0x505a	"usbnet"	""
 0x04a5	0x0001	"unknown"	"Acer Peripherals Inc.|Keyboard"
 0x04a5	0x12a6	"unknown"	"Acer Peripherals Inc.|AcerScan C310U"
 0x04a5	0x2022	"scanner"	""
@@ -153,7 +155,11 @@
 0x04b8	0x0101	"scanner"	"Seiko Epson Corp.|Perfection 636"
 0x04b8	0x0103	"scanner"	"Seiko Epson Corp.|Perfection 610"
 0x04b8	0x0104	"scanner"	"Seiko Epson Corp.|Perfection 1200U"
+0x04b8	0x0106	"scanner"	""
 0x04b8	0x0107	"scanner"	""
+0x04b8	0x010a	"scanner"	""
+0x04b8	0x010b	"scanner"	""
+0x04b8	0x010c	"scanner"	""
 0x04bb	0x0904	"pegasus"	"I-O Data Device, Inc.|ET/TX Ethernet [pegasus]"
 0x04bf	0x0100	"unknown"	"TDK Corp.|MediaReader CF"
 0x04c1	0x0082	"unknown"	"U.S. Robotics (3Com)|OfficeConnect Analog Modem"
@@ -173,11 +179,12 @@
 0x04f2	0x0002	"unknown"	"Chicony Electronics Co., Ltd.|NT68P81 Keyboard"
 0x04f9	0x0002	"unknown"	"Brother Industries, Ltd.|HL-1050 Laser Printer"
 0x04fa	0x4201	"unknown"	"Dallas Semiconductor|DS4201 Audio DAC"
-0x0506	0x03e8	"unknown"	"3Com Corp.|3C19250 Ethernet [klsi]"
+0x0506	0x03e8	"kaweth"	"3Com Corp.|3C19250 Ethernet [klsi]"
+0x050d	0x0004	"usbnet"	""
 0x050d	0x0103	"belkin_sa"	""
 0x050f	0x0003	"unknown"	"KC Technology Inc.|KC82C160S Hub"
 0x051d	0x0002	"unknown"	"American Power Conversion|Back-UPS Pro 500"
-0x0525	0x1080	"net1080"	"Netchip Technology Inc.|NET1080 USB-USB Bridge"
+0x0525	0x1080	"usbnet"	"Netchip Technology Inc.|NET1080 USB-USB Bridge"
 0x0529	0x0001	"unknown"	"Aladdin Knowledge Systems|USB-HASP 0.06"
 0x0531	0x0010	"Tablet:wacom"	"Wacom Technology Corp.|Graphire"
 0x0531	0x0021	"Tablet:wacom"	"Wacom Technology Corp.|Intuos A5"
@@ -185,26 +192,26 @@
 0x0543	0x00fe	"unknown"	"ViewSonic Corp.|G773 Monitor Hub"
 0x0543	0x00ff	"unknown"	"ViewSonic Corp.|P815 Monitor Hub"
 0x0543	0x4153	"unknown"	"ViewSonic Corp.|ViewSonic G773 Control (?)"
-0x0545	0x8080	0x0002	0x0002	"ibmcam"	""
-0x0545	0x8080	0x030a	0x030a	"ibmcam"	""
 0x0545	0x8080	"unknown"	"Xirlink, Inc.|C-It WebCam"
 0x0547	0x2131	"dabusb"	"Anchor Chips Inc.|AN2131 EZUSB Microcontroller"
+0x0547	0x2720	"usbnet"	""
 0x0547	0x9999	"dabusb"	"Anchor Chips Inc.|AN2131 uninitialized (???)"
 0x054c	0x0010	"unknown"	"Sony Corp.|DSC-F505 Cybershot Digital Camera"
 0x0553	0x0002	"cpia_usb"	"VLSI Vision Ltd.|CPiA WebCam"
 0x0557	0x2001	"uss720"	"ATEN International Co. Ltd.|UC-1284 Printer Port"
-0x0557	0x2002	"unknown"	"ATEN International Co. Ltd.|10Mbps Ethernet [klsi]"
+0x0557	0x2002	"kaweth"	"ATEN International Co. Ltd.|10Mbps Ethernet [klsi]"
 0x0557	0x2006	"unknown"	"ATEN International Co. Ltd.|UC-1284B Printer Port"
-0x0557	0x4000	"unknown"	"ATEN International Co. Ltd.|DSB-650 10Mbps Ethernet [klsi]"
+0x0557	0x4000	"kaweth"	"ATEN International Co. Ltd.|DSB-650 10Mbps Ethernet [klsi]"
 0x055f	0x0001	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 CU"
 0x055f	0x0002	"scanner"	""
 0x055f	0x0003	"scanner"	""
 0x055f	0x0006	"scanner"	""
+0x055f	0x0008	"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"
-0x0565	0x0002	"unknown"	"Peracom Networks, Inc.|Enet Ethernet [klsi]"
-0x0565	0x0005	"unknown"	"Peracom Networks, Inc.|Enet2 Ethernet [klsi]"
+0x0565	0x0002	"kaweth"	"Peracom Networks, Inc.|Enet Ethernet [klsi]"
+0x0565	0x0005	"kaweth"	"Peracom Networks, Inc.|Enet2 Ethernet [klsi]"
 0x056a	0x0000	"Tablet:wacom"	"Wacom Co., Ltd.|PenPartner"
 0x056a	0x0010	"Tablet:wacom"	"Wacom Co., Ltd.|Graphire"
 0x056a	0x0020	"Tablet:wacom"	"Wacom Co., Ltd.|Intuos 4x5"
@@ -212,7 +219,9 @@
 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	0x0031	"wacom"	""
 0x056c	0x8007	"belkin_sa"	"eTEK Labs|Kwik232 Serial Port"
+0x056c	0x8100	"usbnet"	""
 0x056c	0x8101	"unknown"	"eTEK Labs|KwikLink USB-USB Bridge"
 0x056d	0x0000	"unknown"	"EIZO Corp.|Eizo T68 Hub"
 0x056d	0x0001	"unknown"	"EIZO Corp.|Monitor"
@@ -255,15 +264,15 @@
 0x05cc	0x2219	"unknown"	"ELSA AG|MicroLink ISDN"
 0x05cc	0x2265	"unknown"	"ELSA AG|MicroLink 56k"
 0x05da	0x0093	"unknown"	"Microtek International Inc.|ScanMaker V6USL"
-0x05da	0x0094	"scanner"	"Microtek International Inc.|Phantom 336CX/C3"
-0x05da	0x0099	"scanner"	"Microtek International Inc.|ScanMaker X6/X6U"
-0x05da	0x009a	"scanner"	"Microtek International Inc.|Phantom C6"
-0x05da	0x00a0	"scanner"	"Microtek International Inc.|Phantom 336CX/C3 (#2)"
-0x05da	0x00a3	"scanner"	""
-0x05da	0x80a3	"scanner"	"Microtek International Inc.|ScanMaker V6USL (#2)"
-0x05da	0x80ac	"scanner"	"Microtek International Inc.|ScanMaker V6UL/SpicyU"
-0x05e9	0x0008	"unknown"	"Kawasaki LSI|KL5KUSB101B Ethernet [klsi]"
-0x05e9	0x0009	"unknown"	"Kawasaki LSI|Sony 10Mbps Ethernet [pegasus]"
+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"	""
+0x05da	0x80a3	"microtek"	"Microtek International Inc.|ScanMaker V6USL (#2)"
+0x05da	0x80ac	"microtek"	"Microtek International Inc.|ScanMaker V6UL/SpicyU"
+0x05e9	0x0008	"kaweth"	"Kawasaki LSI|KL5KUSB101B Ethernet [klsi]"
+0x05e9	0x0009	"kaweth"	"Kawasaki LSI|Sony 10Mbps Ethernet [pegasus]"
 0x05f0	0x0101	"unknown"	"Canopus Co., Ltd.|DA-Port DAC"
 0x05f3	0x020b	"unknown"	"PI Engineering, Inc.|PS2 Adapter"
 0x05fd	0x0253	"unknown"	"InterAct, Inc.|ProPad 8 Digital"
@@ -282,8 +291,8 @@
 0x066b	0x2206	"pegasus"	"Linksys Inc.|USB Ethernet [pegasus]"
 0x0672	0x1041	"unknown"	"Labtec Inc.|LCS1040 Speaker System"
 0x0675	0x0110	"unknown"	"Draytech|Vigor 128 ISDN TA"
-0x067b	0x0000	"unknown"	"Prolific Technology, Inc.|PL2301 USB-USB Bridge"
-0x067b	0x0001	"unknown"	"Prolific Technology, Inc.|PL2302 USB-USB Bridge"
+0x067b	0x0000	"usbnet"	"Prolific Technology, Inc.|PL2301 USB-USB Bridge"
+0x067b	0x0001	"usbnet"	"Prolific Technology, Inc.|PL2302 USB-USB Bridge"
 0x067c	0x4060	"unknown"	"Efficient Networks, Inc.|Alcatel Speedstream 4060 ADSL Modem"
 0x068e	0x0500	"unknown"	"CH Products, Inc.|GameStick 3D"
 0x068e	0x0504	"unknown"	"CH Products, Inc.|F-16 Combat Stick"
@@ -292,6 +301,7 @@
 0x0698	0x9999	"unknown"	"Chuntex (CTX)|VL710S Monitor+Hub"
 0x069a	0x0001	"unknown"	"Askey Computer Corp.|WebCam"
 0x06bd	0x0001	"scanner"	"AGFA-Gevaert NV|SnapScan 1212U"
+0x06bd	0x0002	"scanner"	""
 0x06bd	0x0100	"scanner"	"AGFA-Gevaert NV|SnapScan Touch"
 0x06bd	0x2061	"scanner"	"AGFA-Gevaert NV|SnapScan 1212U (???)"
 0x06cd	0x0101	"keyspan"	""
@@ -302,17 +312,22 @@
 0x06cd	0x0106	"keyspan"	""
 0x06cd	0x0107	"keyspan"	""
 0x06cd	0x0108	"keyspan"	""
+0x06cd	0x0109	"keyspan"	""
+0x06cd	0x010a	"keyspan"	""
 0x06cd	0x010f	"keyspan"	""
 0x06cd	0x0110	"keyspan"	""
 0x06cd	0x0112	"keyspan"	""
 0x06e0	0xf104	"unknown"	"Multi-Tech Systems, Inc.|MT5634ZBA MultiModem 56k "
-0x06e1	0x0008	"unknown"	"ADS Technologies, Inc.|UBS-10BT Ethernet [klsi]"
+0x06e1	0x0008	"kaweth"	"ADS Technologies, Inc.|UBS-10BT Ethernet [klsi]"
+0x06e1	0x0009	"kaweth"	""
 0x06ea	0x0001	"unknown"	"Sirius Technologies|NetCom Roadster II 56k"
-0x0707	0x0100	"unknown"	"Standard Microsystems Corp|2202 Ethernet [klsi]"
+0x0707	0x0100	"kaweth"	"Standard Microsystems Corp|2202 Ethernet [klsi]"
 0x0707	0x0200	"pegasus"	"Standard Microsystems Corp|2202 Ethernet [pegasus]"
 0x0710	0x0001	"whiteheat"	"Connect Tech Inc.|WhiteHeat (fake ID)"
 0x0710	0x8001	"whiteheat"	"Connect Tech Inc.|WhiteHeat"
-0x0711	0x0210	"unknown"	"Magic Control Technology Corp.|MCT1S Serial Port"
+0x0711	0x0200	"mct_u232"	""
+0x0711	0x0210	"mct_u232"	"Magic Control Technology Corp.|MCT1S Serial Port"
+0x0711	0x0230	"mct_u232"	""
 0x0729	0x1284	"uss720"	""
 0x072f	0x0001	"unknown"	"ACS, Ltd.|ACR20U SmartCard Reader"
 0x0733	0x0401	"unknown"	"ViewQuest Technologies, Inc.|CS330 WebCam"
@@ -326,12 +341,13 @@
 0x0785	0x0001	"unknown"	"NTT-ME|MN128mini-V ISDN TA"
 0x07a6	0x0986	"pegasus"	"ADMtek Incorporated|AN986 Pegasus Ethernet"
 0x07a6	0x8511	"pegasus"	""
-0x07aa	0x0001	"unknown"	"Correga K.K.|Ether USB-T Ethernet [klsi]"
+0x07aa	0x0001	"kaweth"	"Correga K.K.|Ether USB-T Ethernet [klsi]"
 0x07aa	0x0004	"pegasus"	"Correga K.K.|FEther USB-TX Ethernet [pegasus]"
 0x07ab	0xfc01	"unknown"	"Memorex|BBQ Series 100 CD-R/RW"
 0x07af	0x0004	"unknown"	"Microtech|SCSI-DB25 SCSI Bridge [shuttle]"
 0x07af	0x0005	"unknown"	"Microtech|SCSI-HD50 SCSI Bridge [shuttle]"
 0x07af	0x0006	"unknown"	"Microtech|CameraMate"
+0x07b8	0x4000	"kaweth"	""
 0x07b8	0x4002	"pegasus"	"D-Link, Inc.|DU-E100 Ethernet [pegasus]"
 0x07b8	0xabc1	"pegasus"	"D-Link, Inc.|DU-E10 Ethernet [pegasus]"
 0x07c4	0xa000	"unknown"	"Datafab Systems Inc.|Simple Technologies Flash Card Reader"
@@ -339,52 +355,80 @@
 0x07cf	0x1001	"unknown"	"Casio Computer Co., Ltd.|QV-8000SX Digicam"
 0x07e1	0x5201	"unknown"	"Ambient Technologies, Inc.|V.90 Modem"
 0x0803	0x9700	"unknown"	"Zoom Telephonics, Inc.|2986L FaxModem"
+0x0813	0x0001	"cpia_usb"	""
 0x0813	0x0002	"ov511"	""
 0x082d	0x0100	"visor"	"Handspring|Visor"
 0x083a	0x1046	"pegasus"	"Accton Technology Corp.|10/100 Ethernet [pegasus]"
 0x0841	0x0001	"rio500"	"Rioport.com Inc.|Rio 500"
-0x0846	0x1001	"unknown"	"NetGear, Inc.|EA101 Ethernet [klsi]"
+0x0846	0x1001	"kaweth"	"NetGear, Inc.|EA101 Ethernet [klsi]"
+0x0846	0x1002	"kaweth"	""
 0x084f	0x0001	"empeg"	""
 0x0854	0x0100	"unknown"	"ActiveWire Inc.|I/O Board"
 0x0854	0x0101	"unknown"	"ActiveWire Inc.|I/O Board, rev1"
+0x085a	0x0008	"kaweth"	""
+0x085a	0x0009	"kaweth"	""
 0x0871	0x0001	"unknown"	"SanDisk, Inc.|SDDR-01 Compact Flash Reader"
 0x0871	0x0002	"unknown"	"SanDisk, Inc.|SDDR-31 Compact Flash Reader"
 0x0871	0x0005	"unknown"	"SanDisk, Inc.|SDDR-05 Compact Flash Reader"
+0x087d	0x5704	"kaweth"	""
 0x08b8	0x01f4	"unknown"	"J. Gordon Electronic Design, Inc.|USBSIMM1"
 0x08d1	0x0001	"unknown"	"smartBridges Pte Ltd.|smartNIC PnP Network Adapter"
 0x08dd	0x0986	"pegasus"	"Billionton Systems, Inc.|USB100N Ethernet [pegasus]"
 0x08dd	0x0987	"pegasus"	""
 0x08dd	0x0988	"pegasus"	""
 0x08dd	0x8511	"pegasus"	""
+0x0921	0x0100	"belkin_sa"	""
+0x0951	0x0008	"kaweth"	""
+0x095a	0x3003	"kaweth"	""
+0x0ff5	0x0010	"scanner"	""
 0x1046	0x9967	"unknown"	"Creative Labs (?)|WebCam Go"
 0x1063	0x1555	"unknown"	"Motorola|MC141555 Hub"
 0x10b5	0x9060	"unknown"	"PLX|Test Board"
+0x10bd	0x1427	"kaweth"	""
 0x1132	0x4331	"unknown"	"Toshiba|PDR-M4 Digital Camera"
 0x1183	0x4008	"unknown"	"Compaq|56k FaxModem"
 0x1293	0x2101	"unknown"	"Belkin (???)|104-key keyboard"
-0x13d2	0x0400	"unknown"	"Shark Multimedia|Pocket Ethernet [klsi]"
+0x1342	0x0204	"kaweth"	""
+0x13d2	0x0400	"kaweth"	"Shark Multimedia|Pocket Ethernet [klsi]"
 0x1484	0x1746	"unknown"	"Elsa monitor (?)|Ecomo 19H99 Monitor"
 0x1484	0x7616	"unknown"	"Elsa monitor (?)|Elsa Hub"
 0x15e8	0x9100	"pegasus"	""
-0x1606	0x0002	"scanner"	"Umax|Astra 1236U"
+0x1606	0x0002	"unknown"	"Umax|Astra 1236U"
 0x1606	0x0010	"scanner"	"Umax|Astra 1220U"
 0x1606	0x0030	"scanner"	"Umax|Astra 2000U"
 0x1606	0x0230	"scanner"	""
 0x1606	0x2020	"unknown"	"Umax|AstraCam 1000"
-0x1608	0x0001	"unknown"	"Inside Out Networks|EdgePort/4 Serial Port"
+0x1608	0x0001	"io_edgeport"	"Inside Out Networks|EdgePort/4 Serial Port"
+0x1608	0x0003	"io_edgeport"	""
+0x1608	0x0004	"io_edgeport"	""
+0x1608	0x0005	"io_edgeport"	""
+0x1608	0x0006	"io_edgeport"	""
+0x1608	0x0007	"io_edgeport"	""
+0x1608	0x000b	"io_edgeport"	""
+0x1608	0x000c	"io_edgeport"	""
+0x1608	0x000d	"io_edgeport"	""
+0x1608	0x000e	"io_edgeport"	""
+0x1608	0x000f	"io_edgeport"	""
+0x1608	0x0010	"io_edgeport"	""
+0x1608	0x0011	"io_edgeport"	""
+0x1608	0x0012	"io_edgeport"	""
+0x1608	0x0013	"io_edgeport"	""
+0x1608	0x0014	"io_edgeport"	""
 0x1645	0x0001	"unknown"	"Entrega|1S Serial Port"
 0x1645	0x0002	"unknown"	"Entrega|2S Serial Port"
 0x1645	0x0003	"unknown"	"Entrega|1S25 Serial Port"
 0x1645	0x0004	"unknown"	"Entrega|4S Serial Port"
-0x1645	0x0005	"unknown"	"Entrega|E45 Ethernet [klsi]"
+0x1645	0x0005	"kaweth"	"Entrega|E45 Ethernet [klsi]"
 0x1645	0x0006	"unknown"	"Entrega (???)|Parallel Port"
 0x1645	0x0007	"unknown"	"Entrega|U1-SC25 SCSI"
+0x1645	0x0008	"kaweth"	""
 0x1645	0x0093	"unknown"	"Entrega|1S9 Serial Port"
 0x1645	0x8000	"unknown"	"Entrega|EZ-USB"
 0x1645	0x8002	"unknown"	"Entrega (???)|2x Serial Port"
+0x1645	0x8005	"kaweth"	""
 0x1645	0x8093	"unknown"	"Entrega|PortGear Serial Port"
 0x1690	0x0101	"unknown"	"Creative Labs|Modem Blaster DE5670"
-0x2001	0x4000	"unknown"	"D-Link Corp|DSB-650C Ethernet [klsi]"
+0x2001	0x4000	"kaweth"	"D-Link Corp|DSB-650C Ethernet [klsi]"
 0x2001	0x4001	"pegasus"	"D-Link Corp|DSB-650TX Ethernet (?) [pegasus]"
 0x2001	0x4002	"pegasus"	"D-Link Corp|DSB-650TX Ethernet [pegasus]"
 0x2001	0x4003	"pegasus"	"D-Link Corp|DSB-650TX-PNA Ethernet [pegasus]"