merge with 2.4.6-5mdk pcitable and usbtable

3 files changed, 119 insertions, 26 deletions

diff --git a/ldetect-lst.spec b/ldetect-lst.spec
index 3467848e..9bdc5d4b 100644
--- a/ldetect-lst.spec
+++ b/ldetect-lst.spec
@@ -1,6 +1,6 @@
 %define name ldetect-lst
 %define version 0.1.2
-%define release 15mdk
+%define release 16mdk
 
 Name: %{name}
 Version: %{version}
@@ -48,10 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
-
-- fixed support for SiS 300.
+* Tue Jul 31 2001 Guillaume Cottenceau <gc@mandrakesoft.com> 0.1.2-16mdk
+- merge with 2.4.6-5mdk pcitable and usbtable
 
 * Wed Jul  4 2001 François Pons <fpons@mandrakesoft.com> 0.1.2-15mdk
+- fixed support for SiS 300.
 - synced pcitable and Cards+ with XFree86 4.1.0.
 - another people do the following:
 - es1370 doesn't work for "Ensoniq|ES1370 [AudioPCI]" (ID 0x12745000)
diff --git a/lst/pcitable b/lst/pcitable
index fce48ad3..e07f0176 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -4,8 +4,8 @@
 0x0003	0x1002	"bttv"	"ATI|TV Wonder/VE"
 0x0003	0x1461	"bttv"	"AVerMedia|TVPhone98"
 0x0004	0x1461	"bttv"	"AVerMedia|TVPhone98"
-0x003d	0x00d1	"unknown"	"Real 3D|i740 (PCI)"
 0x0012	0x11bd	"bttv"	"Pinnacle PCTV"
+0x003d	0x00d1	"unknown"	"Real 3D|i740 (PCI)"
 0x0101	0x15cb	"bttv"	"AG GMV1"
 0x0675	0x1700	"ISDN:hisax,type=12"	"Dynalink|IS64PH ISDN Adapter"
 0x0675	0x1702	"ISDN:hisax,type=12"	"Dynalink|IS64PH ISDN Adapter"
@@ -48,6 +48,7 @@
 0x0e11	0xb060	"cciss"	"Compaq|Smart Array 5300 Controller"
 0x0e11	0xb0c6	"unknown"	"Compaq|10/100TX Embedded WOL UTP Controller"
 0x0e11	0xb0d7	"unknown"	"Compaq|NC3121 (Rev A & B)"
+0x0e11	0xb178	"cciss"	""
 0x0e11	0xf130	"tlan"	"Compaq|NetFlex-3/P ThunderLAN 1.0"
 0x0e11	0xf150	"tlan"	"Compaq|NetFlex-3/P ThunderLAN 2.3"
 0x1000	0x0001	"53c7,8xx"	"Symbios|53c810"
@@ -236,6 +237,7 @@
 0x1011	0x0046	0x9005	0x1365	"aacraid"	"DEC|Dell PowerEdge RAID Controller 2"
 0x1011	0x0046	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
 0x1011	0x1065	0x1244	0x0800	"c4"	""
+0x1011	0x1065	0x1244	0x1100	"c4"	""
 0x1011	0x1065	"DAC960"	"DEC|RAID Controller"
 0x1013	0x0038	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7548"
 0x1013	0x0040	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD7555 Flat Panel GUI Accelerator"
@@ -271,7 +273,7 @@
 0x1014	0x0007	"unknown"	"IBM|Alta MP"
 0x1014	0x000a	"unknown"	"IBM|Fire Coral"
 0x1014	0x0017	"unknown"	"IBM|CPU to PCI Bridge"
-0x1014	0x0018	"unknown"	"IBM|TR Auto LANstreamer"
+0x1014	0x0018	"lanstreamer"	"IBM|TR Auto LANstreamer"
 0x1014	0x001b	"unknown"	"IBM|GXT-150P"
 0x1014	0x001d	"unknown"	"IBM|82G2675"
 0x1014	0x0020	"unknown"	"IBM|MCA"
@@ -749,6 +751,7 @@
 0x106b	0x0017	"unknown"	"Apple Computer Inc.|Paddington Mac I/O"
 0x106b	0x0019	"usb-ohci"	"Apple|Keylargo USB"
 0x106b	0x0020	"unknown"	"Apple|Uni-North AGP"
+0x106b	0x0021	"sungem"	""
 0x106b	0x0022	"unknown"	"Apple|Keylargo I/O"
 0x106c	0x8801	"unknown"	"Hyundai Electronics America|Dual Pentium ISA/PCI Motherboard"
 0x106c	0x8802	"unknown"	"Hyundai Electronics America|PowerPC ISA/PCI Motherboard"
@@ -825,6 +828,8 @@
 0x108e	0x0001	"unknown"	"Sun|EBUS"
 0x108e	0x1000	"unknown"	"Sun|EBUS"
 0x108e	0x1001	"sunhme"	"Sun|Happy Meal"
+0x108e	0x1101	"sungem"	""
+0x108e	0x2bad	"sungem"	""
 0x108e	0x5000	"unknown"	"Sun|Simba Advanced PCI Bridge"
 0x108e	0x5043	"unknown"	"Sun|SunPCI Co-processor"
 0x108e	0x8000	"unknown"	"Sun|PCI Bus Module"
@@ -1178,6 +1183,7 @@
 0x10ee	0x3fc1	"snd-card-rme96"	"Xilinx, Inc.|RME Digi96/8"
 0x10ee	0x3fc2	"snd-card-rme96"	"Xilinx, Inc.|RME Digi96/8 Pro"
 0x10ee	0x3fc3	"snd-card-rme96"	"Xilinx, Inc.|RME Digi96/8 Pad"
+0x10ee	0x4020	"tpam"	""
 0x10ef	0x8154	"unknown"	"Racore Computer Products, Inc.|M815x Token Ring Adapter"
 0x10f1	0x1566	"unknown"	"Tyan Computer|IDE/SCSI"
 0x10f1	0x1677	"unknown"	"Tyan Computer|Multimedia"
@@ -1371,8 +1377,8 @@
 0x1119	0x0211	"gdth"	"ICP Vortex|GDT 6x29RD"
 0x1119	0x0260	"gdth"	"ICP Vortex|GDT 7x19RN"
 0x1119	0x0261	"gdth"	"ICP Vortex|GDT 7x29RN"
-0x111a	0x0000	"unknown"	"Efficient Networks, Inc|155P-MF1 (FPGA)"
-0x111a	0x0002	"unknown"	"Efficient Networks, Inc|155P-MF1 (ASIC)"
+0x111a	0x0000	"eni"	"Efficient Networks, Inc|155P-MF1 (FPGA)"
+0x111a	0x0002	"eni"	"Efficient Networks, Inc|155P-MF1 (ASIC)"
 0x111a	0x0003	"unknown"	"Efficient Networks, Inc|ENI-25P ATM Adapter"
 0x111a	0x0005	"unknown"	"Efficient Networks, Inc|ENI-25P ATM Adapter"
 0x111a	0x0007	"unknown"	"Efficient Networks, Inc|SpeedStream ADSL"
@@ -1439,7 +1445,7 @@
 0x1142	0x6426	"unknown"	"Alliance Semiconductor|GUI Accelerator"
 0x1142	0x643d	"Card:AT3D"	"Alliance|ProMotion AT3D"
 0x1144	0x0001	"unknown"	"Cincinnati Milacron|Noservo controller"
-0x1148	0x4000	"unknown"	"Syskonnect (Schneider & Koch)|FDDI Adapter"
+0x1148	0x4000	"skfp"	"Syskonnect (Schneider & Koch)|FDDI Adapter"
 0x1148	0x4200	"sktr"	"Syskonnect (Schneider & Koch)|Token ring adaptor"
 0x1148	0x4300	"sk98lin"	"Syskonnect (Schneider & Koch)|Gigabit Ethernet"
 0x114a	0x7587	"unknown"	"VMIC|VMIVME-7587"
@@ -1523,7 +1529,7 @@
 0x1179	0x0617	"unknown"	"Toshiba|ToPIC95 PCI to Cardbus Bridge with ZV Support"
 0x1179	0x0618	"unknown"	"Toshiba|CPU to PCI and PCI to ISA bridge"
 0x1179	0x0701	"toshoboe"	"Toshiba|FIR Port"
-0x1179	0x0d01	"unknown"	"Toshiba|FIR Port Type-DO"
+0x1179	0x0d01	"toshoboe"	"Toshiba|FIR Port Type-DO"
 0x117e	0x0001	"unknown"	"T/R Systems|Printer Host"
 0x1180	0x0465	"i82365"	"Ricoh Co Ltd|RL5c465"
 0x1180	0x0466	"i82365"	"Ricoh Co Ltd|RL5c466"
@@ -1536,6 +1542,7 @@
 0x1186	0x1002	"sundance"	"D-Link Inc|DFE 550 TX"
 0x1186	0x1100	"tulip"	"D-Link Inc|Fast Ethernet Adapter"
 0x1186	0x1300	"8139too"	"D-Link Inc|DFE 538 TX"
+0x1186	0x4000	"dl2k"	""
 0x1189	0x1592	"unknown"	"Matsushita Electronics Co|VL/PCI Bridge"
 0x118c	0x0014	"unknown"	"Corollary, Inc|PCIB [C-bus II to PCI bus host bridge chip]"
 0x118d	0x0001	"unknown"	"BitFlow Inc|Raptor-PCI framegrabber"
@@ -1581,7 +1588,7 @@
 0x11ab	0xf003	"unknown"	"Galileo Technology Ltd.|GT-64010 Primary Image Piranha Image Generator"
 0x11ad	0x0002	"tulip"	"Lite-On|LNE100TX"
 0x11ad	0xc115	"tulip"	"Lite-On|LC82C115 PNIC-II"
-0x11b0	0x0002	"unknown"	"V3 Semiconductor Inc.|V300PSC"
+0x11b0	0x0002	"sdladrv"	"V3 Semiconductor Inc.|V300PSC"
 0x11b0	0x0292	"unknown"	"V3 Semiconductor Inc.|V292PBC [Am29030/40 Bridge]"
 0x11b0	0x0960	"unknown"	"V3 Semiconductor Inc.|V96xPBC"
 0x11b0	0xc960	"unknown"	"V3 Semiconductor Inc.|V96DPC"
@@ -1767,6 +1774,7 @@
 0x127a	0x4321	"unknown"	"Rockwell Semiconductor Systems|HCF 56k Data Fax PCI Modem"
 0x127a	0x4322	"unknown"	"Rockwell Semiconductor Systems|Riptide PCI Game Controller"
 0x127a	0x8234	"unknown"	"Rockwell International|RapidFire 616X ATM155 Adapter"
+0x1282	0x9009	"dmfe"	""
 0x1282	0x9100	"tulip"	"Davicom|DM9100"
 0x1282	0x9102	"tulip"	"Davicom|Ethernet 100/10 MBit DM9102"
 0x1282	0x9132	"dmfe"	""
@@ -1916,6 +1924,7 @@
 0x135e	0x7801	"unknown"	"Sealevel Systems Inc|Eight Port RS-232 Interface"
 0x135e	0x8001	"unknown"	"Sealevel Systems Inc|8001 Digital I/O Adapter"
 0x1365	0x9050	"hysdn"	""
+0x136b	0xff01	"meye"	""
 0x1385	0x620a	"acenic"	"Netgear|GA620"
 0x1385	0x630a	"acenic"	""
 0x1389	0x0001	"unknown"	"Applicom International|PCI1500PFB [Intelligent fieldbus adaptor]"
@@ -1964,9 +1973,22 @@
 0x14b3	0x0000	"unknown"	"XPEED Inc|DSL NIC"
 0x14b7	0x0001	"unknown"	"PROXIM Inc|Symphony 4110"
 0x14b9	0x0001	"aironet4500_card"	"AIRONET Wireless Communications|PC4800"
+0x14b9	0x0340	"airo"	""
+0x14b9	0x0350	"airo"	""
 0x14b9	0x4500	"aironet4500_card"	""
 0x14b9	0x4800	"aironet4500_card"	""
+0x14d2	0x8011	"parport_serial"	""
+0x14d2	0x8021	"parport_serial"	""
+0x14db	0x2110	"parport_serial"	""
+0x14db	0x2111	"parport_serial"	""
+0x14db	0x2112	"parport_serial"	""
 0x14db	0x2120	"unknown"	"AFAVLAB Technology Inc|TK9902"
+0x14db	0x2140	"parport_serial"	""
+0x14db	0x2141	"parport_serial"	""
+0x14db	0x2142	"parport_serial"	""
+0x14db	0x2160	"parport_serial"	""
+0x14db	0x2161	"parport_serial"	""
+0x14db	0x2162	"parport_serial"	""
 0x14dc	0x0000	"unknown"	"Amplicon Liveline Ltd|PCI230"
 0x14dc	0x0001	"unknown"	"Amplicon Liveline Ltd|PCI242"
 0x14dc	0x0002	"unknown"	"Amplicon Liveline Ltd|PCI244"
@@ -1999,6 +2021,9 @@
 0x1507	0x4802	"unknown"	"Motorola|Falcon"
 0x1507	0x4803	"unknown"	"Motorola|Hawk"
 0x1507	0x4806	"unknown"	"Motorola|CPX8216"
+0x1516	0x0800	"fealnx"	""
+0x1516	0x0803	"fealnx"	""
+0x1516	0x0891	"fealnx"	""
 0x151a	0x1002	"unknown"	"Globetek|PCI-1002"
 0x151a	0x1004	"unknown"	"Globetek|PCI-1004"
 0x151a	0x1008	"unknown"	"Globetek|PCI-1008"
@@ -2034,6 +2059,8 @@
 0x15ad	0x0710	"Card:VMware virtual video card"	"VMWare Inc|Virtual SVGA"
 0x15b0	0x2bd0	"ISDN:hisax,type=35"	"Zoltrix|2BD0 ISDN Adapter"
 0x15dc	0x0001	"unknown"	"Litronic Inc|Argus 300 PCI Cryptography Module"
+0x1619	0x0400	"farsync"	""
+0x1619	0x0440	"farsync"	""
 0x1813	0x4000	"unknown"	"Modem Silicon Operation|MD563X Host Acceletrated Modem"
 0x1850	0x1851	"bttv"	"Chronos|Video Shuttle II"
 0x1851	0x1851	"bttv"	"CyberMail AV"
@@ -2092,7 +2119,7 @@
 0x4033	0x1360	"8139too"	"Addtron Technology|8139 10/100BaseTX"
 0x4050	0x10fc	"bttv"	"I-O Data Co. GV-BCV4/PCI"
 0x4500	0x0070	"bttv"	"Hauppauge WinTV/PVR"
-0x4916	0x1960	"unknown"	"RedCreek Communications Inc|RedCreek PCI adapter"
+0x4916	0x1960	"rcpci"	"RedCreek Communications Inc|RedCreek PCI adapter"
 0x494f	0x22c0	"wdt_pci"	""
 0x4a14	0x5000	"ne2k-pci"	"NetVin|NV5000SC"
 0x4b10	0x3080	"unknown"	"Buslogic Inc|SCSI Host Adapter"
@@ -2207,8 +2234,14 @@
 0x8086	0x0960	"unknown"	"Intel Corporation|80960RP [i960 RP Microprocessor/Bridge]"
 0x8086	0x1000	"e1000"	"Intel Corporation|82542 Gigabit Ethernet Adapter"
 0x8086	0x1001	"e1000"	"Intel Corporation|82543 Gigabit Ethernet Adapter"
+0x8086	0x1004	"e1000"	""
 0x8086	0x1029	"eepro100"	""
 0x8086	0x1030	"eepro100"	"Intel Corporation|82559 InBusiness 10/100"
+0x8086	0x1031	"e100"	""
+0x8086	0x1032	"e100"	""
+0x8086	0x1033	"e100"	""
+0x8086	0x1034	"e100"	""
+0x8086	0x1038	"e100"	""
 0x8086	0x1130	"agpgart"	"Intel Corporation|82815 815 Chipset Host Bridge and Memory Controller Hub"
 0x8086	0x1132	"Card:Intel 815"	"Intel Corporation|82815 CGC [Chipset Graphics Controller]"
 0x8086	0x1161	"unknown"	"Intel Corporation|82806AA PCI64 Hub Advanced Programmable Interrupt Controller"
@@ -2241,28 +2274,30 @@
 0x8086	0x1a21	"agpgart"	"Intel Corporation|82840 840 (Carmel) Chipset Host Bridge (Hub A)"
 0x8086	0x1a23	"unknown"	"Intel Corporation|82840 840 (Carmel) Chipset AGP Bridge"
 0x8086	0x1a24	"unknown"	"Intel Corporation|82840 840 (Carmel) Chipset PCI Bridge (Hub B)"
-0x8086	0x2410	"unknown"	"Intel Corporation|82801AA 810 Chipset LPC Interface Bridge"
+0x8086	0x2410	"i810-tco"	"Intel Corporation|82801AA 810 Chipset LPC Interface Bridge"
 0x8086	0x2411	"unknown"	"Intel Corporation|82801AA 810 Chipset IDE Controller"
 0x8086	0x2412	"usb-uhci"	"Intel Corporation|82801AA 810 Chipset USB Controller"
 0x8086	0x2413	"unknown"	"Intel Corporation|82801AA 810 Chipset SMBus Controller"
 0x8086	0x2415	"i810_audio"	"Intel Corporation|82801AA 810 Chipset AC'97 Audio Controller"
 0x8086	0x2416	"unknown"	"Intel Corporation|82801AA 810 Chipset AC'97 PCI Modem"
 0x8086	0x2418	"i810_rng"	"Intel Corporation|82801AA 810 Chipset Hub to PCI Bridge"
-0x8086	0x2420	"unknown"	"Intel Corporation|82801AB 810 Chipset LPC Interface Bridge"
+0x8086	0x2420	"i810-tco"	"Intel Corporation|82801AB 810 Chipset LPC Interface Bridge"
 0x8086	0x2421	"unknown"	"Intel Corporation|82801AB 810 Chipset IDE Controller"
 0x8086	0x2422	"usb-uhci"	"Intel Corporation|82801AB 810 Chipset USB Controller"
 0x8086	0x2423	"unknown"	"Intel Corporation|82801AB 810 Chipset SMBus Controller"
 0x8086	0x2425	"i810_audio"	"Intel Corporation|82901 810 Chipset AC'97 Audio Controller"
 0x8086	0x2426	"unknown"	"Intel Corporation|82801AB 810 Chipset AC'97 PCI Modem"
 0x8086	0x2428	"i810_rng"	"Intel Corporation|82801AB 810 Chipset Hub to PCI Bridge"
-0x8086	0x2440	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
+0x8086	0x2440	"i810-tco"	"Intel Corporation|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
 0x8086	0x2442	"usb-uhci"	"Intel Corporation|82820 815e (Camino 2) Chipset USB (Hub A)"
 0x8086	0x2443	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset SMBus"
 0x8086	0x2444	"usb-uhci"	"Intel Corporation|82820 815e (Camino 2) Chipset USB (Hub B)"
 0x8086	0x2445	"i810_audio"	"Intel Corporation|ICH2 810 Chipset AC'97 Audio Controller"
 0x8086	0x2449	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
 0x8086	0x244b	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset IDE U100"
+0x8086	0x244c	"sonypi"	""
 0x8086	0x244e	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset PCI"
+0x8086	0x2485	"i810_audio"	""
 0x8086	0x2500	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x2501	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x250b	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge"
@@ -2282,7 +2317,7 @@
 0x8086	0x7110	"unknown"	"Intel Corporation|82371AB PIIX4 ISA"
 0x8086	0x7111	"unknown"	"Intel Corporation|82371AB PIIX4 IDE"
 0x8086	0x7112	"usb-uhci"	"Intel Corporation|82371AB PIIX4 USB"
-0x8086	0x7113	"unknown"	"Intel Corporation|82371AB PIIX4 ACPI - Bus Master IDE Controller"
+0x8086	0x7113	"sonypi"	"Intel Corporation|82371AB PIIX4 ACPI - Bus Master IDE Controller"
 0x8086	0x7120	"agpgart"	"Intel Corporation|82810 GMCH [Graphics Memory Controller Hub]"
 0x8086	0x7121	"Card:Intel 810"	"Intel Corporation|82810 CGC [Chipset Graphics Controller]"
 0x8086	0x7122	"agpgart"	"Intel Corporation|82810-DC100 GMCH [Graphics Memory Controller Hub]"
@@ -2399,6 +2434,7 @@
 0x9004	0x8878	"aic7xxx"	"Adaptec|7888"
 0x9004	0x8b78	"aic7xxx"	"Adaptec|ABA-1030"
 0x9004	0xec78	"aic7xxx"	"Adaptec|AHA-4944W/UW"
+0x9004	0xffff	"aic7xxx"	""
 0x9005	0x0010	"aic7xxx"	"Adaptec|AHA-2940U2/W"
 0x9005	0x0011	"aic7xxx"	"Adaptec|2930U2"
 0x9005	0x0013	"aic7xxx"	"Adaptec|78902"
@@ -2422,9 +2458,12 @@
 0x9005	0x00cf	"aic7xxx"	"Adaptec|7899P"
 0x9005	0x1364	"aacraid"	"Adaptec|Dell PowerEdge RAID Controller 2"
 0x9005	0x1365	"aacraid"	"Adaptec|Dell PowerEdge RAID Controller 2"
+0x9005	0xffff	"aic7xxx"	""
 0x907f	0x2015	"unknown"	"Atronics|IDE-2015PL"
 0x9412	0x6565	"unknown"	"Holtek|6565"
 0x9699	0x6565	"unknown"	"Omni Media Technology Inc|6565"
+0x9710	0x9735	"parport_serial"	""
+0x9710	0x9835	"parport_serial"	""
 0xd4d4	0x0601	"unknown"	"Dy4 Systems Inc|PCI Mezzanine Card"
 0xe000	0xe000	"unknown"	"Winbond|W89C940"
 0xe159	0x0001	"ISDN:hisax,type=20"	"Tiger Jet Network Inc.|NETjet PCI"
diff --git a/lst/usbtable b/lst/usbtable
index 9618d1e0..aa71620d 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -1,4 +1,5 @@
 0x0000	0x0000	"unknown"	"Virtual|Hub"
+0x03e8	0x0004	"se401"	""
 0x03e8	0x0008	"kaweth"	"AOX Inc.|101 Ethernet [klsi]"
 0x03ee	0x0000	"unknown"	"Mitsumi|CD-R/RW Drive"
 0x03f0	0x0101	"scanner"	"Hewlett-Packard|ScanJet 4100c"
@@ -39,6 +40,8 @@
 0x040a	0x0131	"dc2xx"	"Kodak Co.|DC-5000"
 0x040a	0x0132	"dc2xx"	"Kodak Co.|DC-3400"
 0x0411	0x0001	"pegasus"	"Melco, Inc.|LUA-TX Ethernet [pegasus]"
+0x0411	0x0005	"pegasus"	""
+0x0411	0x0009	"pegasus"	""
 0x0416	0x26ef	"unknown"	"Winbond Electronics Corp.|WC9967CF WebCam IC"
 0x0416	0x5518	"unknown"	"Winbond Electronics Corp.|Hub"
 0x0416	0x551a	"unknown"	"Winbond Electronics Corp.|PC Sync Keypad"
@@ -49,8 +52,8 @@
 0x0416	0x551f	"unknown"	"Winbond Electronics Corp.|Keyboard w/ Sys and Media"
 0x0416	0x5521	"unknown"	"Winbond Electronics Corp.|Keyboard"
 0x0416	0x6481	"unknown"	"Winbond Electronics Corp.|16-bit Scanner"
-0x0423	0x000a	"unknown"	"Computer Access Technology Corp.|NetMate Ethernet"
-0x0423	0x000c	"unknown"	"Computer Access Technology Corp.|EL1210A Ethernet"
+0x0423	0x000a	"catc"	"Computer Access Technology Corp.|NetMate Ethernet"
+0x0423	0x000c	"catc"	"Computer Access Technology Corp.|EL1210A Ethernet"
 0x0423	0x000d	"unknown"	"Computer Access Technology Corp.|USB Chief Analyzer"
 0x0423	0x1237	"unknown"	"Computer Access Technology Corp.|Andromeda Hub"
 0x0428	0x4001	"unknown"	"Advanced Gravis Computer Tech. Ltd.|GamePad Pro"
@@ -105,19 +108,30 @@
 0x046d	0xc00c	"Mouse:USB|Wheel"	"Logitech Inc.|Mouse"
 0x046d	0xc208	"unknown"	"Logitech Inc.|WingMan GamePad Extreme"
 0x046d	0xc281	"iforce"	"Logitech Inc.|WingMan Force Joystick"
+0x046d	0xc283	"iforce"	""
+0x046d	0xc285	"iforce"	""
+0x046d	0xc291	"iforce"	""
 0x046e	0x6782	"unknown"	"Behavior Tech. Computer|BTC 7932 keyboard"
 0x0471	0x0101	"unknown"	"Philips|DSS350 Digital Speaker System"
 0x0471	0x0104	"unknown"	"Philips|UDA1321 Digital Speaker System"
 0x0471	0x0201	"unknown"	"Philips|LCD+Hub"
-0x0471	0x0302	"unknown"	"Philips|PCA645VC WebCam"
-0x0471	0x0303	"unknown"	"Philips|PCA646VC WebCam"
-0x0471	0x0307	"unknown"	"Philips|PCVC675K WebCam"
-0x0471	0x0308	"unknown"	"Philips|PCVC680K WebCam"
+0x0471	0x0302	"pwc"	"Philips|PCA645VC WebCam"
+0x0471	0x0303	"pwc"	"Philips|PCA646VC WebCam"
+0x0471	0x0304	"pwc"	""
+0x0471	0x0307	"pwc"	"Philips|PCVC675K WebCam"
+0x0471	0x0308	"pwc"	"Philips|PCVC680K WebCam"
+0x0471	0x030b	"se401"	""
+0x0471	0x030c	"pwc"	""
+0x0471	0x0310	"pwc"	""
+0x0471	0x0311	"pwc"	""
 0x0471	0x0471	"unknown"	"Philips|Digital Speaker System"
 0x0478	0x0001	"unknown"	"Connectix Corp.|QuickCam VC WebCam"
 0x047b	0x0002	"unknown"	"Silitek Corp.|Joystick (?)"
 0x047d	0x1003	"unknown"	"Kensington|Orbit TrackBall"
 0x047d	0x1005	"unknown"	"Kensington|TurboBall"
+0x047d	0x5001	"se401"	""
+0x047d	0x5002	"se401"	""
+0x047d	0x5003	"se401"	""
 0x047e	0x1001	"uss720"	"Lucent Microelectronics|USS720 Parallel Port"
 0x047e	0xf101	"unknown"	"Lucent Microelectronics|Atlas Modem"
 0x0483	0x7554	"unknown"	"SGS Thomson Microelectronics|56k SoftModem"
@@ -161,6 +175,7 @@
 0x04b8	0x010a	"scanner"	"Seiko Epson Corp.|Perfection 1640SU / 1640SU Photo"
 0x04b8	0x010b	"scanner"	"Seiko Epson Corp.|Perfection 1240U"
 0x04b8	0x010c	"scanner"	"Seiko Epson Corp.|Perfection 640U"
+0x04bb	0x0901	"kaweth"	""
 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"
@@ -181,9 +196,12 @@
 0x04f9	0x0002	"unknown"	"Brother Industries, Ltd.|HL-1050 Laser Printer"
 0x04fa	0x4201	"unknown"	"Dallas Semiconductor|DS4201 Audio DAC"
 0x0506	0x03e8	"kaweth"	"3Com Corp.|3C19250 Ethernet [klsi]"
+0x0506	0x4601	"pegasus"	""
 0x050d	0x0004	"usbnet"	""
 0x050d	0x0103	"belkin_sa"	""
+0x050d	0x0208	"usbvision"	""
 0x050f	0x0003	"unknown"	"KC Technology Inc.|KC82C160S Hub"
+0x050f	0x0180	"irda-usb"	""
 0x051d	0x0002	"unknown"	"American Power Conversion|Back-UPS Pro 500"
 0x0525	0x1080	"usbnet"	"Netchip Technology Inc.|NET1080 USB-USB Bridge"
 0x0529	0x0001	"unknown"	"Aladdin Knowledge Systems|USB-HASP 0.06"
@@ -202,6 +220,7 @@
 0x0557	0x2001	"uss720"	"ATEN International Co. Ltd.|UC-1284 Printer Port"
 0x0557	0x2002	"kaweth"	"ATEN International Co. Ltd.|10Mbps Ethernet [klsi]"
 0x0557	0x2006	"unknown"	"ATEN International Co. Ltd.|UC-1284B Printer Port"
+0x0557	0x2008	"pl2303"	""
 0x0557	0x4000	"kaweth"	"ATEN International Co. Ltd.|DSB-650 10Mbps Ethernet [klsi]"
 0x055f	0x0001	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 CU"
 0x055f	0x0002	"scanner"	"Mustek Systems Inc.|ScanExpress 600 CU"
@@ -227,10 +246,17 @@
 0x056d	0x0000	"unknown"	"EIZO Corp.|Eizo T68 Hub"
 0x056d	0x0001	"unknown"	"EIZO Corp.|Monitor"
 0x056e	0x0002	"unknown"	"Elecom Co., Ltd.|29UO Mouse"
+0x056e	0x200c	"pegasus"	""
 0x056e	0x4002	"pegasus"	"Elecom Co., Ltd.|Laneed 100Mbps Ethernet LD-USB/TX [pegasus]"
+0x056e	0x400b	"pegasus"	""
+0x056e	0xabc1	"pegasus"	""
 0x0572	0x1232	"unknown"	"Conexant Systems (Rockwell), Inc.|V.90 modem"
-0x0573	0x4d02	"unknown"	"Nogatech Ltd.|NT1003 Frame Grabber"
-0x0573	0x4d11	"unknown"	"Nogatech Ltd.|NT1003 Frame Grabber"
+0x0573	0x2000	"usbvision"	""
+0x0573	0x4d00	"usbvision"	""
+0x0573	0x4d01	"usbvision"	""
+0x0573	0x4d02	"usbvision"	"Nogatech Ltd.|NT1003 Frame Grabber"
+0x0573	0x4d03	"usbvision"	""
+0x0573	0x4d11	"usbvision"	"Nogatech Ltd.|NT1003 Frame Grabber"
 0x057b	0x0000	"unknown"	"Y-E Data, Inc.|FlashBuster-U"
 0x0583	0x2030	"unknown"	"Padix (Rockfire) Co. Ltd.|RM-203 USB Nest [mode 1]"
 0x0583	0x2031	"unknown"	"Padix (Rockfire) Co. Ltd.|RM-203 USB Nest [mode 2]"
@@ -264,6 +290,7 @@
 0x05ca	0x0101	"unknown"	"Ricoh Company Ltd.|RDC-5300 Digital Camera"
 0x05cc	0x2219	"unknown"	"ELSA AG|MicroLink ISDN"
 0x05cc	0x2265	"unknown"	"ELSA AG|MicroLink 56k"
+0x05cc	0x3000	"pegasus"	""
 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"
@@ -274,6 +301,8 @@
 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]"
+0x05ef	0x020a	"iforce"	""
+0x05ef	0x8884	"iforce"	""
 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"
@@ -286,21 +315,24 @@
 0x0638	0x0268	"scanner"	"Avision, Inc.|iVina 1200U Scanner"
 0x0644	0x0000	"Floppy:normal"	"TEAC|Floppy drive-05PUB"
 0x066b	0x0105	"unknown"	"Linksys Inc.|SCM eUSB SmartMedia Card Reader"
+0x066b	0x200c	"pegasus"	""
 0x066b	0x2202	"pegasus"	"Linksys Inc.|USB10T Ethernet [klsi]"
 0x066b	0x2203	"pegasus"	"Linksys Inc.|USB100TX Ethernet [pegasus]"
 0x066b	0x2204	"pegasus"	"Linksys Inc.|USB100TX Ethernet [pegasus]"
 0x066b	0x2206	"pegasus"	"Linksys Inc.|USB Ethernet [pegasus]"
+0x066b	0x400b	"pegasus"	""
 0x0672	0x1041	"unknown"	"Labtec Inc.|LCS1040 Speaker System"
 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	0x2303	"pl2303"	""
 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"
 0x0693	0x0002	"unknown"	"Hagiwara Sys-Com|FlashGate SmartMedia Card Reader"
 0x0693	0x0003	"unknown"	"Hagiwara Sys-Com|FlasgGate CompactFlash Card Reader"
 0x0698	0x9999	"unknown"	"Chuntex (CTX)|VL710S Monitor+Hub"
-0x069a	0x0001	"unknown"	"Askey Computer Corp.|WebCam"
+0x069a	0x0001	"pwc"	"Askey Computer Corp.|WebCam"
 0x06bd	0x0001	"scanner"	"AGFA-Gevaert NV|SnapScan 1212U"
 0x06bd	0x0002	"scanner"	"AGFA-Gevaert NV|SnapScan 1236U"
 0x06bd	0x0100	"scanner"	"AGFA-Gevaert NV|SnapScan Touch"
@@ -322,6 +354,7 @@
 0x06e1	0x0008	"kaweth"	"ADS Technologies, Inc.|UBS-10BT Ethernet [klsi]"
 0x06e1	0x0009	"kaweth"	"ADS Technologies, Inc.|UBS-10BT Ethernet [klsi]"
 0x06ea	0x0001	"unknown"	"Sirius Technologies|NetCom Roadster II 56k"
+0x06f8	0x0001	"iforce"	""
 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)"
@@ -348,8 +381,16 @@
 0x07af	0x0004	"unknown"	"Microtech|SCSI-DB25 SCSI Bridge [shuttle]"
 0x07af	0x0005	"unknown"	"Microtech|SCSI-HD50 SCSI Bridge [shuttle]"
 0x07af	0x0006	"unknown"	"Microtech|CameraMate"
+0x07b8	0x110c	"pegasus"	""
+0x07b8	0x200c	"pegasus"	""
 0x07b8	0x4000	"kaweth"	"D-Link, Inc.|DU-E10 Ethernet"
 0x07b8	0x4002	"pegasus"	"D-Link, Inc.|DU-E100 Ethernet [pegasus]"
+0x07b8	0x4004	"pegasus"	""
+0x07b8	0x4007	"pegasus"	""
+0x07b8	0x400b	"pegasus"	""
+0x07b8	0x400c	"pegasus"	""
+0x07b8	0x4102	"pegasus"	""
+0x07b8	0x4104	"pegasus"	""
 0x07b8	0xabc1	"pegasus"	"D-Link, Inc.|DU-E10 Ethernet [pegasus]"
 0x07c4	0xa000	"unknown"	"Datafab Systems Inc.|Simple Technologies Flash Card Reader"
 0x07cc	0x0004	"unknown"	"SIIG|DigiFilm-Combo Reader"
@@ -359,6 +400,8 @@
 0x0813	0x0001	"cpia_usb"	""
 0x0813	0x0002	"ov511"	""
 0x082d	0x0100	"visor"	"Handspring|Visor"
+0x0830	0x0001	"visor"	""
+0x0830	0x0002	"visor"	""
 0x083a	0x1046	"pegasus"	"Accton Technology Corp.|10/100 Ethernet [pegasus]"
 0x0841	0x0001	"rio500"	"Rioport.com Inc.|Rio 500"
 0x0846	0x1001	"kaweth"	"NetGear, Inc.|EA101 Ethernet [klsi]"
@@ -373,14 +416,19 @@
 0x0871	0x0005	"unknown"	"SanDisk, Inc.|SDDR-05 Compact Flash Reader"
 0x087d	0x5704	"kaweth"	"Jaton|USB Ethernet Device Adapter"
 0x08b8	0x01f4	"unknown"	"J. Gordon Electronic Design, Inc.|USBSIMM1"
-0x08d1	0x0001	"unknown"	"smartBridges Pte Ltd.|smartNIC PnP Network Adapter"
+0x08d1	0x0001	"catc"	"smartBridges Pte Ltd.|smartNIC PnP Network Adapter"
+0x08d1	0x0003	"pegasus"	""
 0x08dd	0x0986	"pegasus"	"Billionton Systems, Inc.|USB100N Ethernet [pegasus]"
 0x08dd	0x0987	"pegasus"	""
 0x08dd	0x0988	"pegasus"	""
 0x08dd	0x8511	"pegasus"	""
+0x08e9	0x0100	"irda-usb"	""
 0x0921	0x0100	"belkin_sa"	""
+0x0921	0x1000	"belkin_sa"	""
 0x0951	0x0008	"kaweth"	"Kingston Technology|USB Ethernet Adapter"
 0x095a	0x3003	"kaweth"	"Portsmith|Express Ethernet Adapter"
+0x09c4	0x0011	"irda-usb"	""
+0x0c4b	0x0100	"cyberjack"	""
 0x0ff5	0x0010	"scanner"	"Mustek Systems Inc.|BearPaw 1200F"
 0x1046	0x9967	"unknown"	"Creative Labs (?)|WebCam Go"
 0x1063	0x1555	"unknown"	"Motorola|MC141555 Hub"
@@ -388,11 +436,13 @@
 0x10bd	0x1427	"kaweth"	"ASANTE|USB To Ethernet Adapter"
 0x1132	0x4331	"unknown"	"Toshiba|PDR-M4 Digital Camera"
 0x1183	0x4008	"unknown"	"Compaq|56k FaxModem"
+0x1293	0x0002	"uss720"	""
 0x1293	0x2101	"unknown"	"Belkin (???)|104-key keyboard"
 0x1342	0x0204	"kaweth"	"Mobility|USB-Ethernet Adapter"
 0x13d2	0x0400	"kaweth"	"Shark Multimedia|Pocket Ethernet [klsi]"
 0x1484	0x1746	"unknown"	"Elsa monitor (?)|Ecomo 19H99 Monitor"
 0x1484	0x7616	"unknown"	"Elsa monitor (?)|Elsa Hub"
+0x1485	0x0001	"kaweth"	""
 0x15e8	0x9100	"pegasus"	""
 0x1606	0x0002	"unknown"	"Umax|Astra 1236U"
 0x1606	0x0010	"scanner"	"Umax|Astra 1220U"
@@ -429,12 +479,15 @@
 0x1645	0x8005	"kaweth"	""
 0x1645	0x8093	"unknown"	"Entrega|PortGear Serial Port"
 0x1690	0x0101	"unknown"	"Creative Labs|Modem Blaster DE5670"
+0x2001	0x200c	"pegasus"	""
 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]"
+0x2001	0x400b	"pegasus"	""
+0x2001	0x4102	"pegasus"	""
 0x2001	0xabc1	"pegasus"	""
-0x2304	0x0111	"unknown"	"Pinnacle Systems, Inc.|Studio PCTV (Pal) Frame Grabber"
+0x2304	0x0111	"usbvision"	"Pinnacle Systems, Inc.|Studio PCTV (Pal) Frame Grabber"
 0x55aa	0x1234	"unknown"	"OnSpec Electronic Inc.|ATAPI Bridge"
 0x6666	0x0667	"unknown"	"Eclectic VG|SmartJoy PSX"
 0x8086	0x9890	"unknown"	"Intel Corp.|82930 Test Board"