sync

2 files changed, 54 insertions, 52 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 60fbd14e825..74a6a3eb9f1 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.257 2000/05/04 17:05:01 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.258 2000/05/15 21:51:00 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -1009,15 +1009,15 @@
 #define	PCI_PRODUCT_INTEL_EEPRO100S	0x1228		/* EE Pro 100 Smart */
 #define	PCI_PRODUCT_INTEL_82557	0x1229		/* 82557 */
 #define	PCI_PRODUCT_INTEL_82559	0x1030		/* 82559 */
-#define	PCI_PRODUCT_INTEL_82437FX	0x122d		/* 82437FX (Triton) PCI/Cache/DRAM */
+#define	PCI_PRODUCT_INTEL_82437FX	0x122d		/* 82437FX (Triton) */
 #define	PCI_PRODUCT_INTEL_82371FB_ISA	0x122e		/* 82371FB (Triton) PCI-ISA */
 #define	PCI_PRODUCT_INTEL_82371FB_IDE	0x1230		/* 82371FB (Triton) IDE */
 #define	PCI_PRODUCT_INTEL_82371MX	0x1234		/* 82371 (Triton MX) PCI-ISA and IDE */
 #define	PCI_PRODUCT_INTEL_82437MX	0x1235		/* 82437 (Triton MX) PCI/CACHECOMP/DRAM */
-#define	PCI_PRODUCT_INTEL_82441FX	0x1237		/* 82441FX PCI/Memory (PMC) */
-#define	PCI_PRODUCT_INTEL_82380AB	0x123c		/* 82380AB Mobile PCI-to-ISA (MISA) */
-#define	PCI_PRODUCT_INTEL_82380FB	0x124b		/* 82380FB Mobile PCI-to-PCI (MPCI2) */
-#define	PCI_PRODUCT_INTEL_82439HX	0x1250		/* 82439HX (Triton II) TXC Host */
+#define	PCI_PRODUCT_INTEL_82441FX	0x1237		/* 82441FX */
+#define	PCI_PRODUCT_INTEL_82380AB	0x123c		/* 82380AB Mobile PCI-ISA */
+#define	PCI_PRODUCT_INTEL_82380FB	0x124b		/* 82380FB Mobile PCI-PCI */
+#define	PCI_PRODUCT_INTEL_82439HX	0x1250		/* 82439HX (Triton II) */
 #define	PCI_PRODUCT_INTEL_82801AA_LPC	0x2410		/* 82801AA LPC Interface */
 #define	PCI_PRODUCT_INTEL_82801AA_IDE	0x2411		/* 82801AA IDE */
 #define	PCI_PRODUCT_INTEL_82801AA_USB	0x2412		/* 82801AA USB */
@@ -1035,26 +1035,28 @@
 #define	PCI_PRODUCT_INTEL_82371SB_ISA	0x7000		/* 82371SB (Triton II) PCI-ISA */
 #define	PCI_PRODUCT_INTEL_82371SB_IDE	0x7010		/* 82371SB (Triton II) IDE */
 #define	PCI_PRODUCT_INTEL_82371USB	0x7020		/* 82371SB (Triton II) USB */
-#define	PCI_PRODUCT_INTEL_82437VX	0x7030		/* 82437VX System (TVX) */
+#define	PCI_PRODUCT_INTEL_82437VX	0x7030		/* 82437VX */
 #define	PCI_PRODUCT_INTEL_82439TX	0x7100		/* 82439TX System (MTXC) */
 #define	PCI_PRODUCT_INTEL_82371AB_ISA	0x7110		/* 82371AB PIIX4 ISA */
 #define	PCI_PRODUCT_INTEL_82371AB_IDE	0x7111		/* 82371AB IDE (PIIX4) */
 #define	PCI_PRODUCT_INTEL_82371AB_USB	0x7112		/* 82371AB USB (PIIX4) */
 #define	PCI_PRODUCT_INTEL_82371AB_PMC	0x7113		/* 82371AB Power Management (PIIX4) */
-#define	PCI_PRODUCT_INTEL_82810_MCH	0x7120		/* 82810 Memory Hub */
+#define	PCI_PRODUCT_INTEL_82810_MCH	0x7120		/* 82810 */
 #define	PCI_PRODUCT_INTEL_82810_GC	0x7121		/* 82810 Graphics */
+#define	PCI_PRODUCT_INTEL_82810_DC100_MCH	0x7122		/* 82810-DC100 */
 #define	PCI_PRODUCT_INTEL_82810_DC100_GC	0x7123		/* 82810-DC100 Graphics */
-#define	PCI_PRODUCT_INTEL_82810E_MCH	0x7124		/* 82810E Memory Controller Hub */
-#define	PCI_PRODUCT_INTEL_82810E_GC	0x7125		/* 82810E Graphics Controller */
-#define	PCI_PRODUCT_INTEL_82443LX	0x7180		/* 82443LX PCI-AGP (PAC) */
-#define	PCI_PRODUCT_INTEL_82443LX_AGP	0x7181		/* 82443LX AGP (PAC) */
-#define	PCI_PRODUCT_INTEL_82443BX	0x7190		/* 82443BX PCI-AGP (PAC) */
-#define	PCI_PRODUCT_INTEL_82443BX_AGP	0x7191		/* 82443BX AGP (PAC) */
-#define	PCI_PRODUCT_INTEL_82443BX_NOAGP	0x7192		/* 82443BX Host-PCI (no AGP) */
-#define	PCI_PRODUCT_INTEL_82440BX	0x71a0		/* 82440BX PCI-AGP (PAC) */
-#define	PCI_PRODUCT_INTEL_82440BX_AGP	0x71a1		/* 82440BX AGP (PAC) */
-#define	PCI_PRODUCT_INTEL_PCI450_PB	0x84c4		/* 450 PCIset (Orion) Host-PCI */
-#define	PCI_PRODUCT_INTEL_PCI450_MC	0x84c5		/* 450 PCIset (Orion) Memory */
+#define	PCI_PRODUCT_INTEL_82810E_MCH	0x7124		/* 82810E */
+#define	PCI_PRODUCT_INTEL_82810E_GC	0x7125		/* 82810E Graphics */
+#define	PCI_PRODUCT_INTEL_82443LX	0x7180		/* 82443LX PCI-AGP */
+#define	PCI_PRODUCT_INTEL_82443LX_AGP	0x7181		/* 82443LX AGP */
+#define	PCI_PRODUCT_INTEL_82443BX	0x7190		/* 82443BX PCI-AGP */
+#define	PCI_PRODUCT_INTEL_82443BX_AGP	0x7191		/* 82443BX AGP */
+#define	PCI_PRODUCT_INTEL_82443BX_NOAGP	0x7192		/* 82443BX */
+#define	PCI_PRODUCT_INTEL_82440BX	0x71a0		/* 82440BX PCI-AGP */
+#define	PCI_PRODUCT_INTEL_82440BX_AGP	0x71a1		/* 82440BX AGP */
+#define	PCI_PRODUCT_INTEL_82443GX	0x71a2		/* 82443GX */
+#define	PCI_PRODUCT_INTEL_PCI450_PB	0x84c4		/* 82450KX/GX (Orion) */
+#define	PCI_PRODUCT_INTEL_PCI450_MC	0x84c5		/* 82450KX/GX (Orion) Memory */
 #define	PCI_PRODUCT_INTEL_82840_HB	0x1a21		/* 82840 Host */
 #define	PCI_PRODUCT_INTEL_82840_AGP	0x1a23		/* 82840 AGP */
 #define	PCI_PRODUCT_INTEL_82840_PCI	0x1a24		/* 82840 PCI */
@@ -1270,8 +1272,8 @@
 #define	PCI_PRODUCT_RCC_CNB20LE	0x0009		/* CNB20LE Host */
 #define	PCI_PRODUCT_RCC_CIOB30	0x0010		/* CIOB30 */
 #define	PCI_PRODUCT_RCC_CMIC_HE	0x0011		/* CMIC_HE Host */
-#define	PCI_PRODUCT_RCC_ROSB4_IDE	0x0211		/* ROSB4 IDE */
-#define	PCI_PRODUCT_RCC_ROSB4_USB	0x0220		/* ROSB4 USB */
+/* product RCC UNKNOWN		0x0211	IDE */
+/* product RCC UNKNOWN		0x0220	USB */
 
 /* PLX products */
 #define	PCI_PRODUCT_PLX_1076	0x1076		/* I/O */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index b898bd739e8..8d6ddae3a97 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.257 2000/05/04 17:05:01 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.258 2000/05/15 21:51:00 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -1950,7 +1950,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437FX,
 	    0,
 	    "Intel",
-	    "82437FX (Triton) PCI/Cache/DRAM",
+	    "82437FX (Triton)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371FB_ISA,
@@ -1980,25 +1980,25 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82441FX,
 	    0,
 	    "Intel",
-	    "82441FX PCI/Memory (PMC)",
+	    "82441FX",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82380AB,
 	    0,
 	    "Intel",
-	    "82380AB Mobile PCI-to-ISA (MISA)",
+	    "82380AB Mobile PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82380FB,
 	    0,
 	    "Intel",
-	    "82380FB Mobile PCI-to-PCI (MPCI2)",
+	    "82380FB Mobile PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439HX,
 	    0,
 	    "Intel",
-	    "82439HX (Triton II) TXC Host",
+	    "82439HX (Triton II)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_LPC,
@@ -2106,7 +2106,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437VX,
 	    0,
 	    "Intel",
-	    "82437VX System (TVX)",
+	    "82437VX",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439TX,
@@ -2142,7 +2142,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_MCH,
 	    0,
 	    "Intel",
-	    "82810 Memory Hub",
+	    "82810",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_GC,
@@ -2151,6 +2151,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82810 Graphics",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_MCH,
+	    0,
+	    "Intel",
+	    "82810-DC100",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_GC,
 	    0,
 	    "Intel",
@@ -2160,67 +2166,73 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_MCH,
 	    0,
 	    "Intel",
-	    "82810E Memory Controller Hub",
+	    "82810E",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_GC,
 	    0,
 	    "Intel",
-	    "82810E Graphics Controller",
+	    "82810E Graphics",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443LX,
 	    0,
 	    "Intel",
-	    "82443LX PCI-AGP (PAC)",
+	    "82443LX PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443LX_AGP,
 	    0,
 	    "Intel",
-	    "82443LX AGP (PAC)",
+	    "82443LX AGP",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443BX,
 	    0,
 	    "Intel",
-	    "82443BX PCI-AGP (PAC)",
+	    "82443BX PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443BX_AGP,
 	    0,
 	    "Intel",
-	    "82443BX AGP (PAC)",
+	    "82443BX AGP",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443BX_NOAGP,
 	    0,
 	    "Intel",
-	    "82443BX Host-PCI (no AGP)",
+	    "82443BX",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440BX,
 	    0,
 	    "Intel",
-	    "82440BX PCI-AGP (PAC)",
+	    "82440BX PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440BX_AGP,
 	    0,
 	    "Intel",
-	    "82440BX AGP (PAC)",
+	    "82440BX AGP",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443GX,
+	    0,
+	    "Intel",
+	    "82443GX",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCI450_PB,
 	    0,
 	    "Intel",
-	    "450 PCIset (Orion) Host-PCI",
+	    "82450KX/GX (Orion)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCI450_MC,
 	    0,
 	    "Intel",
-	    "450 PCIset (Orion) Memory",
+	    "82450KX/GX (Orion) Memory",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82840_HB,
@@ -3081,18 +3093,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "CMIC_HE Host",
 	},
 	{
-	    PCI_VENDOR_RCC, PCI_PRODUCT_RCC_ROSB4_IDE,
-	    0,
-	    "Reliance Computer",
-	    "ROSB4 IDE",
-	},
-	{
-	    PCI_VENDOR_RCC, PCI_PRODUCT_RCC_ROSB4_USB,
-	    0,
-	    "Reliance Computer",
-	    "ROSB4 USB",
-	},
-	{
 	    PCI_VENDOR_PLX, PCI_PRODUCT_PLX_1076,
 	    0,
 	    "PLX Technology",