sync

3 files changed, 194 insertions, 41 deletions

diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 16c07abb977..d0f5bf7ef85 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.12 1997/11/06 02:53:43 niklas Exp $
+#	$OpenBSD: files.pci,v 1.13 1998/03/10 08:26:17 deraadt Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config.new file and device description for machine-independent PCI code.
@@ -25,6 +25,11 @@ file	dev/ic/smc93cx6.c		ahc_pci
 attach	bha at pci with bha_pci
 file	dev/pci/bha_pci.c		bha_pci
 
+# Qlogic ISP 10x0 (PCI) family
+# device declaration in sys/conf/files
+attach	isp at pci with isp_pci
+file	dev/pci/isp_pci.c		isp_pci
+
 # Ethernet driver for DC21040-based boards
 device	de: ether, ifnet
 attach	de at pci
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 31efae5ccc5..e1bb283feab 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.31 1998/03/07 06:55:40 downsj Exp 
+ *	OpenBSD: pcidevs,v 1.32 1998/03/10 08:26:08 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -529,6 +529,9 @@
 
 /* 3D Labs products */
 #define	PCI_PRODUCT_3DLABS_300SX	0x0001		/* 300SX (Glint) */
+#define	PCI_PRODUCT_3DLABS_500TX	0x0002		/* GLINT 500TX */
+#define	PCI_PRODUCT_3DLABS_DELTA	0x0003		/* GLINT DELTA */
+#define	PCI_PRODUCT_3DLABS_500MX	0x0006		/* GLINT 500MX */
 
 /* ACC Products */
 #define	PCI_PRODUCT_ACC_2188	0x0000		/* ACCM 2188 VL-PCI Bridge */
@@ -608,6 +611,7 @@
 #define	PCI_PRODUCT_CHIPS_65545	0x00d8		/* 65545 */
 #define	PCI_PRODUCT_CHIPS_65548	0x00dc		/* 65548 */
 #define	PCI_PRODUCT_CHIPS_65550	0x00e0		/* 65550 */
+#define	PCI_PRODUCT_CHIPS_65554	0x00e4		/* 65554 */
 
 /* Cirrus Logic products */
 #define	PCI_PRODUCT_CIRRUS_CL_GD7548	0x0038		/* CL-GD7548 */
@@ -623,10 +627,17 @@
 #define	PCI_PRODUCT_CIRRUS_CL_GD7541	0x1204		/* CL-GD7541 */
 
 /* CMD Technology products */
-#define	PCI_PRODUCT_CMDTECH_640A	0x0640		/* 640A */
-#define	PCI_PRODUCT_CMDTECH_642	0x0642		/* 642 */
-#define	PCI_PRODUCT_CMDTECH_646	0x0646		/* 646 */
-#define	PCI_PRODUCT_CMDTECH_650A	0x0650		/* 650A */
+#define	PCI_PRODUCT_CMDTECH_640A	0x0640		/* PCI640A */
+/* No data on the CMD Tech. web site for the following as of Mar. 3 '98 */
+#define	PCI_PRODUCT_CMDTECH_642	0x0642		/* PCI0642 */
+#define	PCI_PRODUCT_CMDTECH_643	0x0643		/* PCI0643 */
+#define	PCI_PRODUCT_CMDTECH_646	0x0646		/* PCI0646 */
+#define	PCI_PRODUCT_CMDTECH_647	0x0647		/* PCI0647 */
+/* Inclusion of 'A' in the following entry is probably wrong. */
+/* No data on the CMD Tech. web site for the following as of Mar. 3 '98 */
+#define	PCI_PRODUCT_CMDTECH_650A	0x0650		/* PCI0650A */
+#define	PCI_PRODUCT_CMDTECH_670	0x0670		/* USB0670 */
+#define	PCI_PRODUCT_CMDTECH_673	0x0673		/* USB0673 */
 	
 /* Cogent Data Technologies products */
 #define	PCI_PRODUCT_COGENT_EM110TX	0x1400		/* EX110TX PCI Fast Ethernet Adapter */
@@ -687,9 +698,15 @@
 /* Distributed Processing Technology products */
 #define	PCI_PRODUCT_DPT_SC_RAID	0xa400		/* SmartCache/Raid */
 
+/* Dolphin products */
+#define	PCI_PRODUCT_DOLPHIN_PCISCI	0x0658		/* PCI-SCI Bridge */
+
 /* Emulex products */
 #define	PCI_PRODUCT_EMULEX_LPPFC	0x10df		/* Light Pulse FibreChannel adapter */
 
+/* Ensoniq products */
+#define	PCI_PRODUCT_ENSONIQ_AUDIOPCI	0x5000		/* AudioPCI */
+
 /* Essential Communications products */
 #define	PCI_PRODUCT_ESSENTIAL_RR_HIPPI	0x0001		/* RoadRunner HIPPI Interface */
 #define	PCI_PRODUCT_ESSENTIAL_RR_GIGE	0x0005		/* RoadRunner Gig-E Interface */
@@ -750,14 +767,15 @@
 #define	PCI_PRODUCT_INTEL_82371SB	0x7000		/* 82371SB (Triton II) PCI-ISA Bridge */
 #define	PCI_PRODUCT_INTEL_82371IDE	0x7010		/* 82371SB (Triton II) IDE controller */
 #define	PCI_PRODUCT_INTEL_82371USB	0x7020		/* 82371SB (Triton II) USB Interface */
-#define	PCI_PRODUCT_INTEL_82439TX	0x7100		/* 82439TX System Controller (MTXC) */
 #define	PCI_PRODUCT_INTEL_82437VX	0x7030		/* 82437VX System Controller (TVX) */
 #define	PCI_PRODUCT_INTEL_82439TX	0x7100		/* 82439TX System Controller (MTXC) */
+#define	PCI_PRODUCT_INTEL_82439TX	0x7100		/* 82439TX System Controller (MTXC) */
 #define	PCI_PRODUCT_INTEL_82371AB	0x7110		/* 82371AB PIIX4 ISA Bridge */
 #define	PCI_PRODUCT_INTEL_82371AB_IDE	0x7111		/* 82371AB IDE controller (PIIX4) */
 #define	PCI_PRODUCT_INTEL_82371AB_USB	0x7112		/* 82371AB USB Host Controller (PIIX4) */
 #define	PCI_PRODUCT_INTEL_82371AB_PMC	0x7113		/* 82371AB Power Management Controller (PIIX4) */
 #define	PCI_PRODUCT_INTEL_82443LX	0x7180		/* 82443LX PCI AGP Controller (PAC) */
+#define	PCI_PRODUCT_INTEL_82443LX_AGP	0x7181		/* 82443LX AGP Device (PAC) */
 #define	PCI_PRODUCT_INTEL_PCI450_PB	0x84c4		/* 450 PCIset (Orion) Host-PCI bridge */
 #define	PCI_PRODUCT_INTEL_PCI450_MC	0x84c5		/* 450 PCIset (Orion) Memory Controller */
 
@@ -768,6 +786,9 @@
 /* LeadTek Research */
 #define	PCI_PRODUCT_LEADTEK_S3_805	0x0000		/* S3 805 */
 
+/* Macronix */
+#define	PCI_PRODUCT_MACRONIX_MX98713	0x0512		/* PMAC 100/10base PCI MAC controller */
+
 /* Madge Networks products */
 #define	PCI_PRODUCT_MADGE_COLLAGE25	0x1000		/* Collage 25 ATM adapter */
 #define	PCI_PRODUCT_MADGE_COLLAGE155	0x1001		/* Collage 155 ATM adapter */
@@ -776,6 +797,8 @@
 #define	PCI_PRODUCT_MATROX_IMPRESSION	0x0d10		/* MGA Impression */
 #define	PCI_PRODUCT_MATROX_ATLAS	0x0518		/* MGA PX2085 (Atlas) */
 #define	PCI_PRODUCT_MATROX_MILLENIUM	0x0519		/* MGA Millenium 2064W (Storm) */
+#define	PCI_PRODUCT_MATROX_MILLENNIUM_II	0x051B		/* MGA Millennium II 2164W */
+#define	PCI_PRODUCT_MATROX_MILLENNIUM_II_AGP	0x051F		/* MGA Millennium II 2164WA-B AGP */
 #define	PCI_PRODUCT_MATROX_MYSTIQUE	0x102B		/* MGA 1064SG */
 
 /* Mylex products */
@@ -832,6 +855,7 @@
 /* QLogic products */
 #define	PCI_PRODUCT_QLOGIC_ISP1020	0x1020		/* ISP1020 */
 #define	PCI_PRODUCT_QLOGIC_ISP1022	0x1022		/* ISP1022 */
+#define	PCI_PRODUCT_QLOGIC_ISP2100	0x2100		/* ISP2100 */
 
 /* Quantum Designs products */
 #define	PCI_PRODUCT_QUANTUMDESIGNS_8500	0x0001		/* 8500 */
@@ -861,6 +885,7 @@
 #define	PCI_PRODUCT_S3_968_1	0x88f1		/* 86C968-1 (Vision968) */
 #define	PCI_PRODUCT_S3_968_2	0x88f2		/* 86C968-2 (Vision968) */
 #define	PCI_PRODUCT_S3_968_3	0x88f3		/* 86C968-3 (Vision968) */
+#define	PCI_PRODUCT_S3_TRIO64V2_DX	0x8901		/* Trio64V2/DX */
 
 /* SGS Thomson products */
 #define	PCI_PRODUCT_SGSTHOMSON_2000	0x0008		/* STG 2000X */
@@ -878,6 +903,10 @@
 /* SMC products */
 #define	PCI_PRODUCT_SMC_37C665	0x1000		/* FDC 37C665 */
 #define	PCI_PRODUCT_SMC_37C922	0x1001		/* FDC 37C922 */
+#define	PCI_PRODUCT_SMC_83C170	0x0005		/* 83C170 (\"EPIC/100\") Fast Ethernet */
+
+/* STB products */
+#define	PCI_PRODUCT_STB2_RIVA128	0x0018		/* Velocity128 */
 
 /* Symphony Labs products */
 #define	PCI_PRODUCT_SYMPHONY_82C101	0x0001		/* 82C101 */
@@ -892,7 +921,10 @@
 #define	PCI_PRODUCT_TEKRAM2_DC690C	0x690c		/* DC-690C */
 
 /* Texas Instruments products */
-#define	PCI_PRODUCT_TI_CT1130	0xac12		/* CT1130 */
+#define	PCI_PRODUCT_TI_TLAN	0x0500		/* TLAN */
+#define	PCI_PRODUCT_TI_PCI1130	0xac12		/* PCI1130 */
+#define	PCI_PRODUCT_TI_PCI1131	0xac15		/* PCI1131 */
+#define	PCI_PRODUCT_TI_PCI2030	0xac20		/* PCI2030 */
 
 /* Toshiba products */
 #define	PCI_PRODUCT_TOSHIBA_R4X00	0x102f		/* R4x00 Host-PCI Bridge */
@@ -944,11 +976,11 @@
 #define	PCI_PRODUCT_VIATECH_VT82C505	0x0505		/* VT82C505 (Pluto) */
 #define	PCI_PRODUCT_VIATECH_VT82C561	0x0561		/* VT82C561 */
 #define	PCI_PRODUCT_VIATECH_VT82C576	0x0576		/* VT82C576 3V */
+#define	PCI_PRODUCT_VIATECH_VT82C586	0x0586		/* VT82C586 (Apollo VP) PCI-ISA Bridge */
+#define	PCI_PRODUCT_VIATECH_VT86C926	0x0926		/* VT86C926 Amazon PCI-Ethernet Controller */
 #define	PCI_PRODUCT_VIATECH_VT82C570M	0x1000		/* VT82C570M (Apollo) Host-PCI Bridge */
 #define	PCI_PRODUCT_VIATECH_VT82C570MV	0x1006		/* VT82C570M (Apollo) PCI-ISA Bridge */
 #define	PCI_PRODUCT_VIATECH_VT82C416MV	0x1571		/* VT82C416MV */
-#define	PCI_PRODUCT_VIATECH_VT86C926	0x0926		/* VT86C926 Amazon PCI-Ethernet Controller */
-#define	PCI_PRODUCT_VIATECH_VT82C586	0x0586		/* VT82C586 (Apollo VP) PCI-ISA Bridge */
 #define	PCI_PRODUCT_VIATECH_VT82C595	0x1595		/* VT82C595 (Apollo VP2) Host-PCI Bridge */
 #define	PCI_PRODUCT_VIATECH_VT83C572	0x3038		/* VT83C572 USB Controller */
 
@@ -992,7 +1024,3 @@
 
 /* Ziatech products */
 #define	PCI_PRODUCT_ZIATECH_ZT8905	0x8905		/* PCI-ST32 Bridge */
-
-/* STB products */
-#define	PCI_PRODUCT_STB2_RIVA128	0x0018		/* Velocity128 */
-
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 8d60720d927..e6be623dff2 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.31 1998/03/07 06:55:40 downsj Exp 
+ *	OpenBSD: pcidevs,v 1.32 1998/03/10 08:26:08 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -63,6 +63,24 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "300SX (Glint)",
 	},
 	{
+	    PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_500TX,
+	    0,
+	    "3D Labs",
+	    "GLINT 500TX",
+	},
+	{
+	    PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_DELTA,
+	    0,
+	    "3D Labs",
+	    "GLINT DELTA",
+	},
+	{
+	    PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_500MX,
+	    0,
+	    "3D Labs",
+	    "GLINT 500MX",
+	},
+	{
 	    PCI_VENDOR_ACC, PCI_PRODUCT_ACC_2188,
 	    0,
 	    "ACC Microelectronics",
@@ -369,6 +387,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "65550",
 	},
 	{
+	    PCI_VENDOR_CHIPS, PCI_PRODUCT_CHIPS_65554,
+	    0,
+	    "Chips and Technologies",
+	    "65554",
+	},
+	{
 	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_GD7548,
 	    0,
 	    "Cirrus Logic",
@@ -438,25 +462,49 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_640A,
 	    0,
 	    "CMD Technology",
-	    "640A",
+	    "PCI640A",
 	},
 	{
 	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_642,
 	    0,
 	    "CMD Technology",
-	    "642",
+	    "PCI0642",
+	},
+	{
+	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_643,
+	    0,
+	    "CMD Technology",
+	    "PCI0643",
 	},
 	{
 	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_646,
 	    0,
 	    "CMD Technology",
-	    "646",
+	    "PCI0646",
+	},
+	{
+	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_647,
+	    0,
+	    "CMD Technology",
+	    "PCI0647",
 	},
 	{
 	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_650A,
 	    0,
 	    "CMD Technology",
-	    "650A",
+	    "PCI0650A",
+	},
+	{
+	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_670,
+	    0,
+	    "CMD Technology",
+	    "USB0670",
+	},
+	{
+	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_673,
+	    0,
+	    "CMD Technology",
+	    "USB0673",
 	},
 	{
 	    PCI_VENDOR_COGENT, PCI_PRODUCT_COGENT_EM110TX,
@@ -711,12 +759,24 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "SmartCache/Raid",
 	},
 	{
+	    PCI_VENDOR_DOLPHIN, PCI_PRODUCT_DOLPHIN_PCISCI,
+	    0,
+	    "Dolphin Interconnect Solutions",
+	    "PCI-SCI Bridge",
+	},
+	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPPFC,
 	    0,
 	    "Emulex",
 	    "Light Pulse FibreChannel adapter",
 	},
 	{
+	    PCI_VENDOR_ENSONIQ, PCI_PRODUCT_ENSONIQ_AUDIOPCI,
+	    0,
+	    "",
+	    "AudioPCI",
+	},
+	{
 	    PCI_VENDOR_ESSENTIAL, PCI_PRODUCT_ESSENTIAL_RR_HIPPI,
 	    0,
 	    "Essential Communications",
@@ -975,16 +1035,16 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82371SB (Triton II) USB Interface",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439TX,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437VX,
 	    0,
 	    "Intel",
-	    "82439TX System Controller (MTXC)",
+	    "82437VX System Controller (TVX)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437VX,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439TX,
 	    0,
 	    "Intel",
-	    "82437VX System Controller (TVX)",
+	    "82439TX System Controller (MTXC)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439TX,
@@ -1023,6 +1083,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82443LX PCI AGP Controller (PAC)",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443LX_AGP,
+	    0,
+	    "Intel",
+	    "82443LX AGP Device (PAC)",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCI450_PB,
 	    0,
 	    "Intel",
@@ -1053,6 +1119,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "S3 805",
 	},
 	{
+	    PCI_VENDOR_MACRONIX, PCI_PRODUCT_MACRONIX_MX98713,
+	    0,
+	    "Macronix",
+	    "PMAC 100/10base PCI MAC controller",
+	},
+	{
 	    PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_COLLAGE25,
 	    0,
 	    "Madge Networks",
@@ -1083,6 +1155,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "MGA Millenium 2064W (Storm)",
 	},
 	{
+	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILLENNIUM_II,
+	    0,
+	    "Matrox",
+	    "MGA Millennium II 2164W",
+	},
+	{
+	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILLENNIUM_II_AGP,
+	    0,
+	    "Matrox",
+	    "MGA Millennium II 2164WA-B AGP",
+	},
+	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MYSTIQUE,
 	    0,
 	    "Matrox",
@@ -1263,6 +1347,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "ISP1022",
 	},
 	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP2100,
+	    0,
+	    "Q Logic",
+	    "ISP2100",
+	},
+	{
 	    PCI_VENDOR_QUANTUMDESIGNS, PCI_PRODUCT_QUANTUMDESIGNS_8500,
 	    0,
 	    "Quantum Designs",
@@ -1401,6 +1491,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "86C968-3 (Vision968)",
 	},
 	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_TRIO64V2_DX,
+	    0,
+	    "S3",
+	    "Trio64V2/DX",
+	},
+	{
 	    PCI_VENDOR_SGSTHOMSON, PCI_PRODUCT_SGSTHOMSON_2000,
 	    0,
 	    "SGS Thomson Microelectric",
@@ -1467,6 +1563,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "FDC 37C922",
 	},
 	{
+	    PCI_VENDOR_SMC, PCI_PRODUCT_SMC_83C170,
+	    0,
+	    "Standard Microsystems",
+	    "83C170 (\"EPIC/100\") Fast Ethernet",
+	},
+	{
+	    PCI_VENDOR_STB2, PCI_PRODUCT_STB2_RIVA128,
+	    0,
+	    "STB (2nd PCI Vendor ID)",
+	    "Velocity128",
+	},
+	{
 	    PCI_VENDOR_SYMPHONY, PCI_PRODUCT_SYMPHONY_82C101,
 	    0,
 	    "Symphony Labs",
@@ -1503,10 +1611,28 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "DC-690C",
 	},
 	{
-	    PCI_VENDOR_TI, PCI_PRODUCT_TI_CT1130,
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_TLAN,
 	    0,
 	    "Texas Instruments",
-	    "CT1130",
+	    "TLAN",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1130,
+	    0,
+	    "Texas Instruments",
+	    "PCI1130",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1131,
+	    0,
+	    "Texas Instruments",
+	    "PCI1131",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI2030,
+	    0,
+	    "Texas Instruments",
+	    "PCI2030",
 	},
 	{
 	    PCI_VENDOR_TOSHIBA, PCI_PRODUCT_TOSHIBA_R4X00,
@@ -1731,34 +1857,34 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "VT82C576 3V",
 	},
 	{
-	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570M,
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586,
 	    0,
 	    "VIA Technologies",
-	    "VT82C570M (Apollo) Host-PCI Bridge",
+	    "VT82C586 (Apollo VP) PCI-ISA Bridge",
 	},
 	{
-	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570MV,
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C926,
 	    0,
 	    "VIA Technologies",
-	    "VT82C570M (Apollo) PCI-ISA Bridge",
+	    "VT86C926 Amazon PCI-Ethernet Controller",
 	},
 	{
-	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C416MV,
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570M,
 	    0,
 	    "VIA Technologies",
-	    "VT82C416MV",
+	    "VT82C570M (Apollo) Host-PCI Bridge",
 	},
 	{
-	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C926,
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570MV,
 	    0,
 	    "VIA Technologies",
-	    "VT86C926 Amazon PCI-Ethernet Controller",
+	    "VT82C570M (Apollo) PCI-ISA Bridge",
 	},
 	{
-	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586,
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C416MV,
 	    0,
 	    "VIA Technologies",
-	    "VT82C586 (Apollo VP) PCI-ISA Bridge",
+	    "VT82C416MV",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C595,
@@ -1935,12 +2061,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "PCI-ST32 Bridge",
 	},
 	{
-	    PCI_VENDOR_STB2, PCI_PRODUCT_STB2_RIVA128,
-	    0,
-	    "STB (2nd PCI Vendor ID)",
-	    "Velocity128",
-	},
-	{
 	    PCI_VENDOR_MARTINMARIETTA, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Martin-Marietta Corporation",