sync to netbsd

1 files changed, 384 insertions, 100 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 6cf0aa0946c..b1cca958ecb 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,6 +1,4 @@
-$OpenBSD: pcidevs,v 1.17 1997/04/10 16:33:11 pefo Exp $
-/*	$NetBSD: pcidevs,v 1.20 1996/10/19 13:01:49 jonathan Exp $	*/
-
+$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -34,11 +32,18 @@ $OpenBSD: pcidevs,v 1.17 1997/04/10 16:33:11 pefo Exp $
  */
 
 /*
+ * NOTE: a fairly complete list of PCI codes can be found at:
+ *
+ *	http://www.halcyon.com/scripts/jboemler/pci/pcicode
+ */
+
+/*
  * List of known PCI vendors
  */
 
-vendor OLDCOMPAQ	0x0e11	Compaq  # Old ID.  see "COMPAQ" below.
-vendor OLDNCR		0x1000	NCR	# Old ID.  see "NCR" below.
+vendor MARTINMARIETTA	0x003d	Martin-Marietta Corporation 
+vendor COMPAQ		0x0e11	Compaq
+vendor SYMBIOS		0x1000	Symbios Logic
 vendor ATI		0x1002	ATI Technologies
 vendor ULSI		0x1003	ULSI Systems
 vendor VLSI		0x1004	VLSI Technology
@@ -51,28 +56,29 @@ vendor NS		0x100b	National Semiconductor
 vendor TSENG		0x100c	Tseng Labs
 vendor AST		0x100d	AST Research
 vendor WEITEK		0x100e	Weitek
-vendor VIDEOLOGIC	0x1010	Video Logic, Ltd.
+vendor VIDEOLOGIC	0x1010	Video Logic
 vendor DEC		0x1011	Digital Equipment
 vendor MICRONICS	0x1012	Micronics Computers
 vendor CIRRUS		0x1013	Cirrus Logic
 vendor IBM		0x1014	IBM
+vendor LSIL		0x1015	LSI Logic Corp of Canada
 vendor ICLPERSONAL	0x1016	ICL Personal Systems
 vendor SPEA		0x1017	SPEA Software
 vendor UNISYS		0x1018	Unisys Systems
 vendor ELITEGROUP	0x1019	Elitegroup Computer Systems
-vendor NCR		0x101a	NCR
+vendor NCR		0x101a	AT&T Global Information Systems
 vendor VITESSE		0x101b	Vitesse Semiconductor
 vendor WD		0x101c	Western Digital
 vendor AMI		0x101e	American Megatrends
 vendor PICTURETEL	0x101f	PictureTel
 vendor HITACHICOMP	0x1020	Hitachi Computer Products
 vendor OKI		0x1021	OKI Electric Industry
-vendor AMD		0x1022	AMD
+vendor AMD		0x1022	Advanced Micro Devices
 vendor TRIDENT		0x1023	Trident Microsystems
 vendor ZENITH		0x1024	Zenith Data Systems
 vendor ACER		0x1025	Acer
 vendor DELL		0x1028	Dell Computer
-vendor SIEMENS		0x1029	Siemens Nixdorf IS
+vendor SNI		0x1029	Siemens Nixdorf AG
 vendor LSILOGIC		0x102a	LSI Logic, Headland div.
 vendor MATROX		0x102b	Matrox
 vendor CHIPS		0x102c	Chips and Technologies
@@ -81,7 +87,7 @@ vendor OLIVETTI		0x102e	Olivetti Advanced Technology
 vendor TOSHIBA		0x102f	Toshiba America
 vendor TMCRESEARCH	0x1030	TMC Research
 vendor MIRO		0x1031	Miro Computer Products
-vendor COMPAQ		0x1032	Compaq
+vendor COMPAQ2		0x1032	Compaq (2nd PCI Vendor ID)
 vendor NEC		0x1033	NEC
 vendor BURNDY		0x1034	Burndy
 vendor COMPCOMM		0x1035	Comp. & Comm. Research Lab
@@ -91,7 +97,7 @@ vendor AMP		0x1038	AMP
 vendor SIS		0x1039	Silicon Integrated System
 vendor SEIKOEPSON	0x103a	Seiko Epson
 vendor TATUNGAMERICA	0x103b	Tatung Co. of America
-vendor HP		0x103C	Hewlett-Packard
+vendor HP		0x103c	Hewlett-Packard
 vendor SOLLIDAY		0x103e	Solliday Engineering
 vendor LOGICMODELLING	0x103f	Logic Modeling
 vendor KPC		0x1040	Kubota Pacific
@@ -106,8 +112,8 @@ vendor ELSA		0x1048	Elsa
 vendor FOUNTAINTECH	0x1049	Fountain Technology
 vendor SGSTHOMSON	0x104a	SGS Thomson Microelectric
 vendor BUSLOGIC		0x104b	BusLogic
-vendor TI		0x104C	Texas Instruments
-vendor SONY		0x104D	Sony
+vendor TI		0x104c	Texas Instruments
+vendor SONY		0x104d	Sony
 vendor OAKTECH		0x104e	Oak Technology
 vendor COTIME		0x104f	Co-time Computer
 vendor WINBOND		0x1050	Winbond Electronics
@@ -126,17 +132,17 @@ vendor NUMBER9		0x105d	Number 9 Computer Company
 vendor VTECH		0x105e	Vtech Computers
 vendor INFOTRONIC	0x105f	Infotronic America
 vendor UMC		0x1060	United Microelectronics
-vendor ITT		0x1061	I. T. T.  (or X technology?)
-vendor MASPAR		0x1062	Maspar Computer
+vendor ITT		0x1061	I. T. T.
+vendor MASPAR		0x1062	MasPar Computer
 vendor OCEANOA		0x1063	Ocean Office Automation
 vendor ALCATEL		0x1064	Alcatel CIT
 vendor TEXASMICRO	0x1065	Texas Microsystems
 vendor PICOPOWER	0x1066	Picopower Technology
-vendor MITSUBISHI	0x1067	Mitsubishi
+vendor MITSUBISHI	0x1067	Mitsubishi Electronics
 vendor DIVERSIFIED	0x1068	Diversified Technology
 vendor MYLEX		0x1069	Mylex
 vendor ATEN		0x106a	Aten Research
-vendor APPLE		0x106B	Apple
+vendor APPLE		0x106b	Apple Computer
 vendor HYUNDAI		0x106c	Hyundai Electronics America
 vendor SEQUENT		0x106d	Sequent
 vendor DFI		0x106e	DFI
@@ -167,9 +173,10 @@ vendor JBOND		0x1086	J. Bond Computer Systems
 vendor CACHECOMP	0x1087	Cache Computer
 vendor MICROCOMP	0x1088	Microcomputer Systems
 vendor DG		0x1089	Data General Corporation
-vendor BIT3		0x108A	Bit3 Computer Corp.
-vendor OAKLEIGH		0x108c	Oakleigh Systems
+vendor BIT3		0x108a	Bit3 Computer Corp.
+vendor ELONEX		0x108c	Elonex PLC c/o Oakleigh Systems
 vendor OLICOM		0x108d	Olicom
+vendor SUN		0x108e	Sun Microsystems
 vendor SYSTEMSOFT	0x108f	Systemsoft
 vendor ENCORE		0x1090	Encore Computer
 vendor INTERGRAPH	0x1091	Intergraph
@@ -179,7 +186,7 @@ vendor FICOMP		0x1094	First Int'l Computers
 vendor CMDTECH		0x1095	CMD Technology
 vendor ALACRON		0x1096	Alacron
 vendor APPIAN		0x1097	Appian Technology
-vendor QUANTUMDESIGNS	0x1098	Quantum Designs (or Vision?)
+vendor QUANTUMDESIGNS	0x1098	Quantum Designs
 vendor SAMSUNGELEC	0x1099	Samsung Electronics
 vendor PACKARDBELL	0x109a	Packard Bell
 vendor GEMLIGHT		0x109b	Gemlight Computer
@@ -200,6 +207,7 @@ vendor SGI		0x10a9	Silicon Graphics
 vendor ACC		0x10aa	ACC Microelectronics
 vendor DIGICOM		0x10ab	Digicom
 vendor HONEYWELL	0x10ac	Honeywell IASD
+vendor SYMPHONY		0x10ad	Symphony Labs
 vendor CORNERSTONE	0x10ae	Cornerstone Technology
 vendor MICROCOMPSON	0x10af	Micro Computer Sysytems (M) SON
 vendor CARDEXPER	0x10b0	CardExpert Technology
@@ -209,7 +217,7 @@ vendor DATABOOK		0x10b3	Databook
 vendor STB		0x10b4	STB Systems
 vendor PLX		0x10b5	PLX Technology
 vendor MADGE		0x10b6	Madge Networks
-vendor 3COM		0x10b7	3Com
+vendor 3COM		0x10B7	3Com
 vendor SMC		0x10b8	Standard Microsystems
 vendor ALI		0x10b9	Acer Labs
 vendor MITSUBISHIELEC	0x10ba	Mitsubishi Electronics
@@ -234,7 +242,7 @@ vendor MENTOR		0x10cc	Mentor ARC
 vendor ADVSYSPROD	0x10cd	Advanced System Products
 vendor RADIUS		0x10ce	Radius
 vendor CITICORP		0x10cf	Citicorp TTI
-vendor FUJUTSU		0x10d0	Fujitsu Limited
+vendor FUJITSU2		0x10d0	Fujitsu Limited (2nd PCI Vendor ID)
 vendor FUTUREPLUS	0x10d1	Future+ Systems
 vendor MOLEX		0x10d2	Molex
 vendor JABIL		0x10d3	Jabil Circuit
@@ -251,6 +259,7 @@ vendor ES		0x10dd	Evans & Sutherland
 vendor NVIDIA		0x10de	Nvidia Corporation
 vendor EMULEX		0x10df	Emulex
 vendor IMS		0x10e0	Integrated Micro Solutions
+vendor TEKRAM		0x10e1	Tekram Technology (1st PCI Vendor ID)
 vendor APTIX		0x10e2	Aptix Corporation
 vendor NEWBRIDGE	0x10e3	Newbridge Microsystems
 vendor TANDEM		0x10e4	Tandem Computers
@@ -270,7 +279,7 @@ vendor TYAN		0x10f1	Tyan Computer
 vendor ACHME		0x10f2	Achme Computer
 vendor ALARIS		0x10f3	Alaris
 vendor SMOS		0x10f4	S-MOS Systems
-vendor MKK		0x10f5	NKK Corporation
+vendor NKK		0x10f5	NKK Corporation
 vendor CREATIVE		0x10f6	Creative Electronic Systems
 vendor MATSUSHITA	0x10f7	Matsushita
 vendor ALTOS		0x10f8	Altos India
@@ -291,6 +300,7 @@ vendor VIATECH		0x1106	VIA Technologies
 vendor STRATIS		0x1107	Stratus Computer
 vendor PROTEON		0x1108	Proteon
 vendor COGENT		0x1109	Cogent Data Technologies
+vendor SIEMENS 		0x110a	Siemens AG / Siemens Nixdorf AG
 vendor XENON		0x110b	Xenon Microsystems
 vendor MINIMAX		0x110c	Mini-Max Technology
 vendor ZNYX		0x110d	Znyx Advanced Systems
@@ -298,10 +308,10 @@ vendor CPUTECH		0x110e	CPU Technology
 vendor ROSS		0x110f	Ross Technology
 vendor POWERHOUSE	0x1110	Powerhouse Systems
 vendor SCO		0x1111	Santa Cruz Operation
-vendor ROCKWELL		0x1112	Rockwell Network Systems
+vendor RNS		0x1112	RNS
 vendor ACCTON		0x1113	Accton Technology
 vendor ATMEL		0x1114	Atmel
-vendor 3DLABS		0x1115	3D Labs
+vendor DUPONT		0x1115	DuPont Pixel Systems
 vendor DATATRANSLATION	0x1116	Data Translation
 vendor DATACUBE		0x1117	Datacube
 vendor BERG		0x1118	Berg Electronics
@@ -316,8 +326,8 @@ vendor EMC		0x1120	Emc
 vendor ZILOG		0x1121	Zilog
 vendor MULTITECH	0x1122	Multi-tech Systems
 vendor LEUTRON		0x1124	Leutron Vision
-vendor EUROCORE		0x1125	Eurocore
-vendor VIGRA		0x1125	Vigra
+vendor EUROCORE		0x1125	Eurocore/Vigra
+vendor VIGRA		0x1126	Vigra
 vendor FORE		0x1127	FORE Systems
 vendor FIRMWORKS	0x1129	Firmworks
 vendor HERMES		0x112a	Hermes Electronics
@@ -383,22 +393,117 @@ vendor THINE		0x1168	Thine Electronics
 vendor CDAC		0x1169	Centre for Dev. of Advanced Computing
 vendor POLARIS		0x116a	Polaris Communications
 vendor CONNECTWARE	0x116b	Connectware
-vendor MARTINMARIETTA	0x116d	Martin-Marietta
 vendor WSTECH		0x116f	Workstation Technology
 vendor INVENTEC		0x1170	Inventec
-vendor ZEITNET		0x1193	ZeitNet
-vendor SPECIALIX	0x11cb	Specialix
-vendor CYCLADES		0x120e	Cyclades
+vendor LOUGHSOUND	0x1171	Loughborough Sound Images
+vendor ALTERA		0x1172	Altera Corperation
+vendor ADOBE		0x1173	Adobe Systems
+vendor BRIDGEPORT	0x1174	Bridgeport Machines
+vendor MIRTRON		0x1175	Mitron Computer
+vendor SBE		0x1176	SBE
+vendor SILICONENG	0x1177	Silicon Engineering
+vendor ALFA		0x1178	Alfa
+vendor TOSHIBA2		0x1179	Toshiba Info Systems (2nd PCI Vendor ID)
+vendor ATREND		0x117a	A-Trend Technology
+vendor ATTO		0x117c	Atto Technology
+vendor TR		0x117e	T/R Systems
+vendor RICOH		0x1180	Ricoh
+vendor TELEMATICS	0x1181	Telematics International
+vendor FUJIKURA		0x1183	Fujikura
+vendor FORKS		0x1184	Forks
+vendor DATAWORLD	0x1185	Dataworld
+vendor DLINK		0x1186	D-Link Systems
+vendor ATL		0x1187	Advanced Techonoloy Labratories
+vendor SHIMA		0x1188	Shima Seiki Manufacturing
+vendor MATSUSHITA2	0x1189	Matsushita Electronics (2nd PCI Vendor ID)
+vendor HILEVEL		0x118a	HiLevel Technology
+vendor COROLLARY	0x118c	Corrollary
+vendor BITFLOW		0x118d	BitFlow
+vendor HERMSTEDT	0x118e	Hermstedt
+vendor ARTOP		0x1191	Artop Electric
+vendor DENSAN		0x1192	Densan
 vendor ZEINET		0x1193	Zeinet
-vendor SYMPHONY		0x1c1c	Symphony Labs
-vendor TEKRAM		0x1de1	Tekram Technology
-vendor AVANCE2		0x4005	Avance Logic (mistyped? see 0x1005)
+vendor TOUCAN		0x1194	Toucan Technology
+vendor RATOC		0x1195	Ratoc System
+vendor HYTEC		0x1196	Hytec Electronic
+vendor GAGE		0x1197	Gage Applied Sciences
+vendor LAMBDA		0x1198	Lambda Systems
+vendor DCA		0x1199	Digital Communications Associates
+vendor MINDSHARE	0x119a	Mind Share
+vendor OMEGA		0x119b	Omega Micro
+vendor ITI		0x119c	Information Technology Institute
+vendor BUG		0x119d	Bug Sapporo
+vendor FUJITSU3		0x119e	Fujitsu (3th PCI Vendor ID)
+vendor BULL		0x119f	Bull Hn Information Systems
+vendor CONVEX		0x11a0	Convex Computer
+vendor HAMAMATSU	0x11a1	Hamamatsu Photonics
+vendor SIERRA2		0x11a2	Sierra Research & Technology (2nd PCI Vendor ID)
+vendor BARCO		0x11a4	Barco
+vendor MICROUNITY	0x11a5	MicroUnity Systems Engineering
+vendor PUREDATA		0x11a6 	Pure Data
+vendor POWERCC		0x11a7	Power Computing
+vendor INNOSYS		0x11a9	InnoSys
+vendor ACTEL		0x11aa	Actel
+vendor GALILEO		0x11ab	Galileo Technology
+vendor CANNON		0x11ac	Cannon IS
+vendor LITEON		0x11ad	Lite-On Communications
+vendor SCITEX		0x11ae	Scitex Corporation
+vendor PROLOG		0x11af	Pro-Log Corporation
+vendor V3		0x11b0	V3 Semiconductor
+vendor APRICOT		0x11b1	Apricot Computer
+vendor KODAK		0x11b2	Eastman Kodak
+vendor BARR		0x11b3	Barr Systems
+vendor LEITECH		0x11b4	Leitch Technology
+vendor RADSTONE		0x11b5	Radstone Technology
+vendor UNITEDVIDEO	0x11b6	United Video
+vendor MOT2		0x11b7	Motorola (2nd PCI Vendor ID)
+vendor XPOINT		0x11b8	Xpoint Technologies
+vendor PATHLIGHT	0x11b9	Pathlight Technology
+vendor VIDEOTRON	0x11ba	VideoTron
+vendor PYRAMID		0x11bb	Pyramid Technologies
+vendor NETPERIPH	0x11bc	Network Peripherals
+vendor PINNACLE		0x11bd	Pinnacle Systems
+vendor IMI		0x11be	International Microcircuts
+vendor NEC2		0x11c3	NEC (2nd PCI Vendor ID)
+vendor DOCTECH		0x11c4	Document Technologies
+vendor SHIVA		0x11c5	Shiva
+vendor DCMDATA		0x11c7	DCM Data Systems
+vendor DOLPHIN		0x11c8	Dolphin Interconnect Solutions
+vendor MRTMAGMA		0x11c9	Mesa Ridge Technologies (MAGMA)
+vendor LSISYS		0x11ca	LSI Systems
+vendor SPECIALIX	0x11cb	Specialix Research
+vendor MKC		0x11cc	Michels & Kleberhoff Computer
+vendor HAL		0x11cd 	HAL Computer Systems
+vendor ZORAN		0x11de	Zoran Corporation
+vendor PMCSIERRA	0x11f8	PMC-Sierra
+vendor CYCLADES		0x120e	Cyclades
+vendor ESSENTIAL	0x120f	Essential Communications
+vendor ARIEL		0x1220	Ariel
+vendor AZTECH		0x122d	Aztech
+vendor 3DO		0x1239	The 3D0 Company
+vendor STALLION		0x124d	Stallion Technologies
+vendor LINEARSYS	0x1254	Linear Systems
+vendor AURORA		0x125c	Aurora Technologies
+vendor NETAPP		0x1275	Network Appliance
+vendor ROCKWELL		0x127a	Rockwell Semiconductor Systems
+vendor KOFAX		0x1296	Kofax Image Products
+vendor PICTUREEL	0x12c5	Picture Elements
+vendor SYMPHONY2	0x1c1c	Symphony Labs (2nd PCI Vendor ID)
+vendor TEKRAM2		0x1de1	Tekram Technology (2nd PCI Vendor ID)
+vendor 3DLABS		0x3d3d	3D Labs
+vendor AVANCE2		0x4005	Avance Logic (2nd PCI Vendor ID)
+vendor BUSLOGIC2	0x4b10	Buslogic (2nd PCI Vendor ID)
 vendor S3		0x5333	S3
+vendor NETPOWER2	0x5700	NetPower (2nd PCI Vendor ID)
+vendor C4T		0x6374	c't Magazin
+vendor QUANCM		0x8008	Quancm Electronic GmbH
 vendor INTEL		0x8086	Intel
+vendor TRIGEM2		0x8800	Trigem Computer (2nd PCI Vendor ID)
+vendor COMPUTONE	0x8e0e	Computone Corperation
 vendor ADP		0x9004	Adaptec
 vendor ATRONICS		0x907f	Atronics
-vendor NETPOWERNEW	0xdead	NetPower
-vendor ARK		0xedd8	Ark Logic (or Arc? or Hercules?)
+vendor ARC		0xedd8	ARC Logic
+vendor BAD		0xffff	ILLEGITIMATE VENDOR ID
 
 /*
  * List of known products.  Grouped by vendor.
@@ -414,10 +519,20 @@ product	3COM 3C900COMBO	0x9001	3c900 10Mbps-Combo
 product	3COM 3C905TX	0x9050	3c905 100Base-TX
 product	3COM 3C905T4	0x9051	3c905 100Base-T4
 
+/* 3D Labs products */
+product 3DLABS 300SX	0x0001	300SX (\"Glint\")
+
+/* ACC Products */
+product ACC 2188	0x0000	ACCM 2188 VL-PCI Bridge
+
+/* Acer products */
+product ACER M1435	0x1435	M1435 VL-PCI Bridge
+
 /* Acer Labs products */
-product ALI M1445	0x1445	M1445
-product ALI M1449	0x1449	M1449
-product ALI M1451	0x1451	M1451
+product	ALI M1445	0x1445	M1445 VL-PCI Bridge
+product	ALI M1449	0x1449	M1449 PCI-ISA Bridge
+product ALI M1451	0x1451	M1451 Host-PCI Bridge
+product ALI M1461	0x1461	M1461 Host-PCI Bridge
 product ALI M4803	0x5215	M4803
 
 /* Adaptec products */
@@ -430,6 +545,7 @@ product ADP 2940AU	0x6178	AHA-2940A Ultra
 product ADP AIC7870	0x7078	AIC-7870
 product ADP 2940	0x7178	AHA-2940
 product ADP 3940	0x7278	AHA-3940
+product ADP 3985	0x7378	AHA-3985
 product ADP 2944	0x7478	AHA-2944
 product ADP AIC7880	0x8078	AIC-7880 Ultra
 product ADP 2940U	0x8178	AHA-2940 Ultra
@@ -439,10 +555,12 @@ product ADP 2944U	0x8478	AHA-2944 Ultra
 /* AMD products */
 product AMD PCNET_PCI	0x2000	79c970 PCnet-PCI LANCE Ethernet
 product AMD PCSCSI_PCI	0x2020	53c974 PCscsi-PCI SCSI
+product AMD PCNETS_PCI	0x2040	79C974 PCnet-PCI Ethernet & SCSI
 
-/* ARK Logic products */
-product ARK 1000PV	0xa091	1000PV
-product ARK 2000PV	0xa099	2000PV
+/* ARC Logic products */
+product ARC 1000PV	0xa091	1000PV
+product ARC 2000PV	0xa099	2000PV
+product ARC 2000MT	0xa0a1	2000MT
 
 /* ATI products */
 product ATI MACH32	0x4158	Mach32
@@ -453,32 +571,75 @@ product ATI MACH64_VT	0x4654	Mach64 VT
 product ATI MACH64_GT	0x4754	Mach64 GT
 product ATI MACH64_GX	0x4758	Mach64 GX
 
+/* Applied Micro Circuts products */
+product AMCIRCUITS S5933	0x4750	S5933 PCI Matchmaker
+product AMCIRCUITS LANAI	0x8043	Myrinet LANai Interface
+
 /* Atronics products */
 product ATRONICS IDE_2015PL	0x2015	IDE-2015PL
 
 /* Avance Logic products */
-product AVANCE ALG2301	0x2301	ALG2301
+product AVANCE AVL2301	0x2301	AVL2301
+product AVANCE AVG2302	0x2302	AVG2302
+product AVANCE2 ALG2301	0x2301	ALG2301
+product AVANCE2 ALG2302	0x2302	ALG2302
 
 /* BusLogic products */
-product BUSLOGIC OLD946C	0x0140	946C 01
-product BUSLOGIC 946C		0x1040	946C 10
+product BUSLOGIC MULTIMASTER_NC	0x0140	MultiMaster NC
+product BUSLOGIC MULTIMASTER	0x1040	MultiMaster
+product BUSLOGIC FLASHPOINT	0x8130	FlashPoint
+
+/* c't Magazin products */
+product C4T GPPCI		0x6773	GPPCI
 
 /* Chips and Technologies products */
-product CHIPS 65545	0x00d8	65545
+product CHIPS 64310		0x00b8	64310
+product CHIPS 65545		0x00d8	65545
+product CHIPS 65548		0x00dc	65548
+product CHIPS 65550		0x00e0	65550
 
 /* Cirrus Logic products */
-product CIRRUS GD_5430		0x00a0	GD 5430
-product CIRRUS GD_5434_4	0x00a4	GD 5434-4
-product CIRRUS GD_5434_8	0x00a8	GD 5434-8
-product CIRRUS GD_5436		0x00ac	GD 5436
-product CIRRUS CL_6729		0x1100	CL 6729
-product CIRRUS CL_7542		0x1200	CL 7542
+product CIRRUS CL_GD7548	0x0038	CL-GD7548
+product CIRRUS CL_GD5430	0x00a0	CL-GD5430
+product CIRRUS CL_GD5434_4	0x00a4	CL-GD5434-4
+product CIRRUS CL_GD5434_8	0x00a8	CL-GD5434-8
+product CIRRUS CL_GD5436	0x00ac	CL-GD5436
+product CIRRUS CL_GD5446	0x00b8	CL-GD5446
+product CIRRUS CL_GD6729	0x1100	CL-GD6729
+product CIRRUS CL_GD7542	0x1200	CL-GD7542
+product CIRRUS CL_GD7543	0x1202	CL-GD7543
+product CIRRUS CL_GD7541	0x1204	CL-GD7541
 
 /* CMD Technology products */
 product CMDTECH 640A		0x0640	640A
+product	CMDTECH 642		0x0642	642
+product CMDTECH 646		0x0646	646
+product CMDTECH 650A		0x0650	650A
+	
+/* Cogent Data Technologies products */
+product COGENT EM110TX		0x1400 EX110TX PCI Fast Ethernet Adapter
+
+/* Compaq products */
+product	COMPAQ PCI_EISA_BRIDGE	0x0001	PCI-EISA Bridge
+product COMPAQ PCI_ISA_BRIDGE	0x0002	PCI-ISA Bridge
+product COMPAQ TRIFLEX1		0x1000	Triflex Host-PCI Bridge
+product COMPAQ TRIFLEX2		0x2000	Triflex Host-PCI Bridge
+product	COMPAQ QVISION_V0	0x3032	QVision
+product	COMPAQ QVISION_1280P	0x3033	QVision 1280/p
+product	COMPAQ QVISION_V2	0x3034	QVision
+product COMPAQ TRIFLEX4		0x4000	Triflex Host-PCI Bridge
 
 /* Contaq Microsystems products */
-product CONTAQ 82C599		0x0600	82C599
+product CONTAQ 82C599		0x0600	82C599 PCI-VLB Bridge
+
+/* Corollary Products */
+product COROLLARY CBUSII_PCIB	0x0014	\"C-Bus II\"-PCI Bridge
+
+/* Cyclades products */
+product CYCLADES CYCLOMY_1	0x0100	Cyclom-Y below 1M
+product CYCLADES CYCLOMY_2	0x0101	Cyclom-Y above 1M
+product CYCLADES CYCLOMZ_1	0x0200	Cyclom-Z below 1M
+product CYCLADES CYCLOMZ_2	0x0201	Cyclom-Z above 1M
 
 /* DEC products */
 product DEC 21050	0x0001	DECchip 21050 PCI-PCI Bridge
@@ -492,13 +653,29 @@ product DEC DEFPA	0x000f	DEFPA
 /* product DEC ???	0x0010	??? VME Interface */
 product DEC 21041	0x0014  DECchip 21041 (\"Tulip Pass 3\")
 product DEC DGLPB	0x0016	DGLPB (\"OPPO\")
+product DEC 21142	0x0019	DECchip 21142/3
+product DEC 21052	0x0021	DECchip 21052 PCI-PCI Bridge
+product DEC 21150	0x0022	DECchip 21150 PCI-PCI Bridge
+product DEC 21152	0x0024	DECchip 21152 PCI-PCI Bridge
+product DEC 21153	0x0025	DECchip 21153 PCI-PCI Bridge
+product DEC 21154	0x0026	DECchip 21154 PCI-PCI Bridge
 
 /* Diamond products */
-product DIAMOND vIPER	0x9001	Viper/PCI
+product DIAMOND VIPER	0x9001	Viper/PCI
 
 /* Distributed Processing Technology products */
 product DPT SC_RAID	0xa400	SmartCache/Raid
 
+/* Emulex products */
+product EMULEX LPPFC	0x10df	\"Light Pulse\" FibreChannel adapter
+
+/* Essential Communications products */
+product ESSENTIAL RR_HIPPI	0x0001	RoadRunner HIPPI Interface
+product ESSENTIAL RR_GIGE	0x0005	RoadRunner Gig-E Interface
+
+/* Evans & Sutherland products */
+product ES FREEDOM	0x0001	Freedom PCI-GBus Interface
+
 /* FORE products */
 product FORE PCA200	0x0210	ATM PCA-200
 product FORE PCA200E	0x0300	ATM PCA-200e
@@ -507,67 +684,102 @@ product FORE PCA200E	0x0300	ATM PCA-200e
 product FUTUREDOMAIN TMC_18C30	0x0000	TMC-18C30 (36C70)
 
 /* Efficient Networks products */
-product EFFICIENTNETS ENI155PF  0x0000  155P-MF1 ATM (FPGA)
-product EFFICIENTNETS ENI155PA  0x0002  155P-MF1 ATM (ASIC)
+product EFFICIENTNETS ENI155PF	0x0000	155P-MF1 ATM (FPGA)
+product EFFICIENTNETS ENI155PA	0x0002	155P-MF1 ATM (ASIC)
 
 /* Hewlett-Packard products */
 product HP J2585A	0x1030	J2585A
 
 /* IBM products */
+product IBM 0x0002 	0x0002	MCA Bridge
+product IBM 0x0005 	0x0005	CPU Bridge - Alta Lite
+product IBM 0x0007 	0x0007	CPU Bridge - Alta MP
+product IBM 0x000a 	0x000a	ISA Bridge w/PnP
+product IBM 0x0017 	0x0017	CPU Bridge
+product IBM 0x0018 	0x0018	Auto LANStreamer
+product IBM GXT150P	0x001B	GXT-150P 2D Accelerator
+product IBM 0x0020	0x0020	MCA Bridge
 product IBM 82351	0x0022	82351 PCI-PCI Bridge
+product IBM 0x0036	0x0036	Miami/PCI
 
 /* Integrated Micro Solutions products */
 product IMS 8849	0x8849	8849
 
 /* Intel products */
 product INTEL PCEB	0x0482	82375EB PCI-EISA Bridge
-product INTEL CDC	0x0483	82424ZX Cache and DRAM controller
+product INTEL CDC	0x0483	82424ZX (Saturn) Cache and DRAM controller
 product INTEL SIO	0x0484	82378IB PCI-ISA Bridge (System I/O)
 product INTEL PCIB	0x0486	82426EX PCI-ISA Bridge
-product INTEL PCMC	0x04a3	82434LX PCI, Cache, and Memory Controller
+product INTEL PCMC	0x04a3	82434LX/NX (Mercury/Neptune) PCI, Cache, and DRAM Controller
+product INTEL 82092AA	0x1222	82092AA IDE controller
 product INTEL SAA7116	0x1223	SAA7116
-product INTEL 82437	0x122d	82437 Triton
-product INTEL 82471	0x122e	82471 Triton
-product INTEL 82438	0x1230	82438
-product INTEL 82440FX	0x1237  82440FX Natoma, PCI and memory controller
-product INTEL 82371SBa	0x7000  82371SB PCI-ISA bridge
-product INTEL 82371SBb	0x7010  82371SB IDE interface
-product INTEL 82450KX	0x84c4	82450KX Orion, PCI memory controller
-product INTEL 82454GX	0x84c5	82454GX Orion, host to PCI bridge
+product INTEL 82596	0x1226	82596 LAN Controller
+product INTEL EEPRO100	0x1227	EE Pro 100 10/100 Fast Ethernet
+product INTEL EEPRO100S	0x1228	EE Pro 100 Smart 10/100 Fast Ethernet
+product INTEL 82557	0x1229	82557 Fast Ethernet LAN Controller
+product INTEL 82437	0x122d	82437FX (Triton) PCI, Cache, and DRAM Controller
+product INTEL 82471	0x122e	82471FB (Triton) PCI-ISA Bridge
+product INTEL 82438	0x1230	82438 (Triton) IDE controller
+product INTEL 82371MX	0x1234	82371 (Triton MX) PCI-ISA Bridge and IDE Controller
+product INTEL 82437MX	0x1235	82437 (Triton MX) PCI, Cache, and DRAM Controller
+product INTEL 82440FX	0x1237	82440FX (Natoma) PCI and Memory Controller
+product INTEL 82439	0x1250	82439 (Triton II) TXC Host Bridge
+product INTEL 82371SB	0x7000	82371SB (Triton II) PCI-ISA Bridge
+product INTEL 82371IDE	0x7010	82371SB (Triton II) IDE controller
+product INTEL 82371USB	0x7020	82371SB (Triton II) USB Interface
+product INTEL 82430VX	0x7030	82430VX (Triton VX) Host Bridge
+product INTEL 82371AB	0x7110	82371AB PIIX4 ISA Bridge
+product INTEL PCI450_PB	0x84c4	450 PCIset (Orion) Host-PCI bridge
+product INTEL PCI450_MC	0x84c5	450 PCIset (Orion) Memory Controller
 
 /* I. T. T. products */
 product ITT AGX016	0x0001	AGX016
+product ITT ITT3204	0x0002	ITT3204 MPEG Decoder
 
 /* LeadTek Research */
 product LEADTEK S3_805	0x0000	S3 805
 
+/* Madge Networks products */
+product MADGE COLLAGE25		0x1000	Collage 25 ATM adapter
+product MADGE COLLAGE155	0x1001	Collage 155 ATM adapter
+
 /* Matrox products */
-product MATROX ATLAS		0x0518	MGA-2 Atlas PX2085
-product MATROX MILLENIUM	0x0519	MGA-2064 Millenium
-product MATROX MYSTIQUE		0x051a	MGA-1064 Mystique
 product MATROX IMPRESSION	0x0d10	MGA Impression
+product MATROX ATLAS		0x0518	MGA PX2085 (\"Atlas\")
+product MATROX MILLENIUM	0x0519	MGA Millenium 2064W (\"Storm\")
+product MATROX MYSTIQUE		0x102B	MGA 1064SG
 
 /* Mylex products */
-product MYLEX 960P	0x0001	RAID controller
+product MYLEX 960P	0x0001	DAC960P RAID controller
 
 /* Mutech products */
 product MUTECH MV1000	0x0001	MV1000
 
 /* National Semiconductor products */
-product NS 87410	0xd001	87410
+product NS DP83810	0x0001	DP83810 10/100 Ethernet
+product NS NS87410	0xd001	NS87410
 
 /* NCR/Symbios Logic products */
-product OLDNCR 810	0x0001	53c810
-product OLDNCR 820	0x0002	53c820
-product OLDNCR 825	0x0003	53c825
-product OLDNCR 815	0x0004	53c815
-product OLDNCR 810AP	0x0005	53c810AP
-product OLDNCR 860	0x0006	53c860
-product OLDNCR 875	0x000f	53c875
-/* do the NCR chips use the new ID, as well? */
+product SYMBIOS 810	0x0001	53c810
+product SYMBIOS 820	0x0002	53c820
+product SYMBIOS 825	0x0003	53c825
+product SYMBIOS 815	0x0004	53c815
+product SYMBIOS 810AP	0x0005	53c810AP
+product SYMBIOS 860	0x0006	53c860
+product SYMBIOS 875	0x000f	53c875
+
+/* NexGen products */
+product NEXGEN NX82C501	0x4e78	NX82C501 Host-PCI Bridge
+
+/* NKK products */
+product NKK NDR4600	0xA001	NDR4600 Host-PCI Bridge
 
 /* Number Nine products */
-product NUMBER9 IMAG128	0x2309	Imagine-128
+product NUMBER9 I128	0x2309	Imagine-128
+product NUMBER9 I128_2	0x2339	Imagine-128 II
+
+/* Oak Technologies products */
+product OAKTECH OTI1007	0x0107	OTI107
 
 /* Opti products */
 product OPTI 82C557	0xc557	82C557
@@ -575,6 +787,9 @@ product OPTI 82C558	0xc558	82C558
 product OPTI 82C621	0xc621	82C621
 product OPTI 82C822	0xc822	82C822
 
+/* PC Tech products */
+product PCTECH RZ1000	0x1000	RZ1000
+
 /* Promise products */
 product PROMISE DC5030	0x5300	DC5030
 
@@ -590,14 +805,30 @@ product QUANTUMDESIGNS 8580	0x0002	8580
 product	REALTEK	RT8029	0x8029	Ethernet
 
 /* S3 products */
+product S3 VIRGE	0x5631	ViRGE
+product S3 TRIO32	0x8810	Trio32
 product S3 TRIO64	0x8811	Trio32/64
+product S3 AURORA64P	0x8812	Aurora64V+
+product S3 TRIO64UVP	0x8814	Trio64UV+
 product S3 868		0x8880	868
-product S3 928		0x88b0	928
-product S3 864_0	0x88c0	864-0
-product S3 864_1	0x88c1	864-1
-product S3 964_0	0x88d0	964-0
-product S3 964_1	0x88d1	964-1
-product S3 968		0x88f0	968
+product S3 VIRGE_VX	0x883d	ViRGE/VX
+product S3 928		0x88b0	86C928
+product S3 864_0	0x88c0	86C864-0 (\"Vision864\")
+product S3 864_1	0x88c1	86C864-1 (\"Vision864\")
+product S3 864_2	0x88c2	86C864-2 (\"Vision864\")
+product S3 864_3	0x88c3	86C864-3 (\"Vision864\")
+product S3 964_0	0x88d0	86C964-0 (\"Vision964\")
+product S3 964_1	0x88d1	86C964-1 (\"Vision964\")
+product S3 964_2	0x88d2	86C964-2 (\"Vision964\")
+product S3 964_3	0x88d1	86C964-3 (\"Vision964\")
+product S3 968_0	0x88f0	86C968-0 (\"Vision968\")
+product S3 968_1	0x88f1	86C968-1 (\"Vision968\")
+product S3 968_2	0x88f2	86C968-2 (\"Vision968\")
+product S3 968_3	0x88f3	86C968-3 (\"Vision968\")
+
+/* SGS Thomson products */
+product SGSTHOMSON 2000	0x0008	STG 2000X
+product SGSTHOMSON 1764	0x1746	STG 1764X
 
 /* Silicon Integrated System products */
 product SIS 86C201	0x0001	86C201
@@ -610,15 +841,30 @@ product SIS 85C601	0x0601	85C601
 
 /* SMC products */
 product SMC 37C665	0x1000	FDC 37C665
+product SMC 37C922	0x1001	FDC 37C922
 
 /* Symphony Labs products */
 product SYMPHONY 82C101	0x0001	82C101
+product SYMPHONY 82C103	0x0103	82C103
+product SYMPHONY 82C105	0x0105	82C105
+product SYMPHONY2 82C101	0x0001	82C101
+
+/* Tekram Technology products (1st PCI Vendor ID)*/
+product TEKRAM 	DC290	0xdc29	DC-290(M)
 
-/* Tekram Technology products */
-product TEKRAM DC290	0xdc29	DC290
+/* Tekram Technology products (2nd PCI Vendor ID) */
+product TEKRAM2	DC690C 0x690c	DC-690C
+
+/* Texas Instruments products */
+product TI	CT1130		0xac12	CT1130
+  
+/* Toshiba products */
+product TOSHIBA R4X00	0x102f	R4x00 Host-PCI Bridge
 
 /* Trident products */
 product TRIDENT	TGUI_9320	0x9320	TGUI 9320
+product TRIDENT	TGUI_9350	0x9350	TGUI 9350
+product TRIDENT	TGUI_9360	0x9360	TGUI 9360
 product TRIDENT	TGUI_9420	0x9420	TGUI 9420
 product TRIDENT	TGUI_9440	0x9440	TGUI 9440
 product TRIDENT	TGUI_9660	0x9660	TGUI 9660
@@ -633,38 +879,76 @@ product TSENG ET4000_W32P_D	0x3207	ET4000w32p rev D
 product TSENG ET6000		0x3208	ET6000
 
 /* UMC products */
-product UMC UM8673F	0x0101	UM8673F
+product UMC UM82C881	0x0001	UM82C881 486 Chipset
+product UMC UM82C886	0x0002	UM82C886 ISA Bridge
+product UMC UM8673F	0x0101	UM8673F EIDE Controller
+product UMC UM8881	0x0881	UM8881 HB4 486 PCI Chipset
+product UMC UM82C891	0x0891	UM82C891
+product UMC UM886A	0x1001	UM886A
+product UMC UM8886BF	0x673a	UM8886BF
+product UMC UM8710	0x8710	UM8710
+product UMC UM8886	0x886a	UM8886
 product UMC UM8881F	0x8881	UM8881F PCI-Host bridge
 product UMC UM8886F	0x8886	UM8886F PCI-ISA bridge
 product UMC UM8886A	0x888a	UM8886A
 product UMC UM8891A	0x8891	UM8891A
+product UMC UM9017F	0x9017	UM9017F
+product UMC UM8886N	0xe88a	UM8886N
+product UMC UM8891N	0xe891	UM8891N
+
+/* ULSI Systems products */
+product ULSI US201	0x0201	US201
+
+/* V3 Semiconductor products */
+product V3 V292PBC	0x0292	V292PBC AMD290x0 Host-PCI Bridge
+product V3 V960PBC	0x0960	V960PBC	i960 Host-PCI Bridge
+product V3 V96DPC	0xC960	V96DPC	i960 (Dual) Host-PCI Bridge
 
 /* VIA Technologies products */
-product VIATECH 82C505		0x0505	82C505
-product VIATECH ALT_82C505	0x0561	82C505
-product VIATECH 82C576		0x0505	82C576 3V
+product VIATECH VT82C505	0x0505	VT82C505 (\"Pluto\") 
+product VIATECH VT82C561	0x0561	VT82C561
+product VIATECH VT82C576	0x0576	VT82C576 3V
+product VIATECH	VT82C570M	0x1000	VT82C570M (\"Apollo\") Host-PCI Bridge
+product VIATECH VT82C570MV	0x1006	VT82C570M (\"Apollo\") PCI-ISA Bridge
+product VIATECH VT82C416MV	0x1571	VT82C416MV
 
 /* Vortex Computer Systems products */
 product VORTEX GDT_6000B	0x0001	GDT 6000b
 
 /* VLSI products */
-product VLSI 82C592_FC1	0x0005	82C592-FC1
-product VLSI 82C593_FC1	0x0006	82C593-FC1
+product VLSI 82C592	0x0005	82C592 CPU Bridge
+product VLSI 82C593	0x0006	82C593 ISA Bridge
+product VLSI 82C594	0x0007	82C594 Wildcat System Controller
+product VLSI 82C596597	0x0008	82C596/597 Wildcat ISA Bridge
+product VLSI 82C541	0x000c	82C541
+product VLSI 82C543	0x000d	82C543
+product VLSI 82C532	0x0101	82C532
+product VLSI 82C534	0x0102	82C534
+product VLSI 82C535	0x0104	82C535
+product VLSI 82C147	0x0105	82C147
+product VLSI 82C975	0x0200	82C975
+product VLSI 82C925	0x0280	82C925
 
 /* Weitek products */
 product WEITEK P9000	0x9001	P9000
 product WEITEK P9100	0x9100	P9100
 
+/* Western Digital products */
+product	WD WD33C193A	0x0193	WD33C193A
+product WD WD33C196A	0x0196	WD33C196A
+product WD WD33C197A	0x0197	WD33C197A
+product WD WD7193	0x3193	WD7193
+product WD WD7197	0x3197	WD7197
+product WD WD33C296A	0x3296	WD33C296A
+product WD WD34C296	0x4296	WD34C296
+product WD 90C		0xC24A	90C
+
 /* Winbond Electronics products */
 product WINBOND W83769F	0x0001	W83769F
 
 /* Zeinet products */
 product ZEINET 1221	0x0001	1221
 
-/* Cyclades products */
-product CYCLADES CYCLOMY_1	0x0100	Cyclom-Y below 1M
-product CYCLADES CYCLOMY_2	0x0101	Cyclom-Y above 1M
+/* Ziatech products */
+product ZIATECH ZT8905	0x8905 PCI-ST32 Bridge
 
-/* Cyclades products */
-product CYCLADES CYCLOMY_1 0x0100       Cyclom-Y below 1M
-product CYCLADES CYCLOMY_2 0x0101       Cyclom-Y above 1M