regen

2 files changed, 71 insertions, 71 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index b269b935515..41507b1f00f 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.1320 2008/02/09 15:03:25 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1321 2008/02/09 19:05:02 kettenis Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -1942,7 +1942,7 @@
 #define	PCI_PRODUCT_INTEL_82840_PCI	0x1a24		/* 82840 PCI */
 #define	PCI_PRODUCT_INTEL_82845_HB	0x1a30		/* 82845 Host */
 #define	PCI_PRODUCT_INTEL_82845_AGP	0x1a31		/* 82845 AGP */
-#define	PCI_PRODUCT_INTEL_5000_DMA	0x1a38		/* 5000 DMA Engine */
+#define	PCI_PRODUCT_INTEL_5000_DMA	0x1a38		/* 5000 DMA */
 #define	PCI_PRODUCT_INTEL_82597EX_SR	0x1a48		/* PRO/10GbE SR (82597EX) */
 #define	PCI_PRODUCT_INTEL_82597EX_LR	0x1b48		/* PRO/10GbE LR (82597EX) */
 #define	PCI_PRODUCT_INTEL_82801AA_LPC	0x2410		/* 82801AA LPC */
@@ -2020,19 +2020,19 @@
 #define	PCI_PRODUCT_INTEL_82860_PCI3	0x2535		/* 82860 PCI */
 #define	PCI_PRODUCT_INTEL_82860_PCI4	0x2536		/* 82860 PCI */
 #define	PCI_PRODUCT_INTEL_E7500_HB	0x2540		/* E7500 Host */
-#define	PCI_PRODUCT_INTEL_E7500_DRAM	0x2541		/* E7500 DRAM */
-#define	PCI_PRODUCT_INTEL_E7500_HI_B1	0x2543		/* E7500 MCH */
-#define	PCI_PRODUCT_INTEL_E7500_HI_B2	0x2544		/* E7500 MCH */
-#define	PCI_PRODUCT_INTEL_E7500_HI_C1	0x2545		/* E7500 MCH */
-#define	PCI_PRODUCT_INTEL_E7500_HI_C2	0x2546		/* E7500 MCH */
-#define	PCI_PRODUCT_INTEL_E7500_HI_D1	0x2547		/* E7500 MCH */
-#define	PCI_PRODUCT_INTEL_E7500_HI_D2	0x2548		/* E7500 MCH */
+#define	PCI_PRODUCT_INTEL_E7500_ERR	0x2541		/* E7500 Error Reporting */
+#define	PCI_PRODUCT_INTEL_E7500_PCI_B1	0x2543		/* E7500 PCI */
+#define	PCI_PRODUCT_INTEL_E7500_PCI_B2	0x2544		/* E7500 PCI */
+#define	PCI_PRODUCT_INTEL_E7500_PCI_C1	0x2545		/* E7500 PCI */
+#define	PCI_PRODUCT_INTEL_E7500_PCI_C2	0x2546		/* E7500 PCI */
+#define	PCI_PRODUCT_INTEL_E7500_PCI_D1	0x2547		/* E7500 PCI */
+#define	PCI_PRODUCT_INTEL_E7500_PCI_D2	0x2548		/* E7500 PCI */
 #define	PCI_PRODUCT_INTEL_E7501_HB	0x254c		/* E7501 Host */
 #define	PCI_PRODUCT_INTEL_E7505_HB	0x2550		/* E7505 Host */
-#define	PCI_PRODUCT_INTEL_E7505_RAS	0x2551		/* E7505 RAS */
+#define	PCI_PRODUCT_INTEL_E7505_ERR	0x2551		/* E7505 Error Reporting */
 #define	PCI_PRODUCT_INTEL_E7505_AGP	0x2552		/* E7505 AGP */
-#define	PCI_PRODUCT_INTEL_E7505_HI_B1	0x2553		/* E7505 PCI */
-#define	PCI_PRODUCT_INTEL_E7505_HI_B2	0x2554		/* E7505 PCI */
+#define	PCI_PRODUCT_INTEL_E7505_PCI_B1	0x2553		/* E7505 PCI */
+#define	PCI_PRODUCT_INTEL_E7505_PCI_B2	0x2554		/* E7505 PCI */
 #define	PCI_PRODUCT_INTEL_82845G_HB	0x2560		/* 82845G Host */
 #define	PCI_PRODUCT_INTEL_82845G_AGP	0x2561		/* 82845G AGP */
 #define	PCI_PRODUCT_INTEL_82845G_IGD	0x2562		/* 82845G Video */
@@ -2078,15 +2078,15 @@
 #define	PCI_PRODUCT_INTEL_5000_PCIE_4	0x25e5		/* 5000 PCIE */
 #define	PCI_PRODUCT_INTEL_5000_PCIE_5	0x25e6		/* 5000 PCIE */
 #define	PCI_PRODUCT_INTEL_5000_PCIE_6	0x25e7		/* 5000 PCIE */
-#define	PCI_PRODUCT_INTEL_5000_ERR_REG	0x25f0		/* 5000 Error Reporting */
+#define	PCI_PRODUCT_INTEL_5000_ERR	0x25f0		/* 5000 Error Reporting */
 #define	PCI_PRODUCT_INTEL_5000_RESERVED_1	0x25f1		/* 5000 Reserved */
 #define	PCI_PRODUCT_INTEL_5000_RESERVED_2	0x25f3		/* 5000 Reserved */
 #define	PCI_PRODUCT_INTEL_5000_FBD_1	0x25f5		/* 5000 FBD */
 #define	PCI_PRODUCT_INTEL_5000_FBD_2	0x25f6		/* 5000 FBD */
-#define	PCI_PRODUCT_INTEL_5000_PCIE_7	0x25f7		/* 5000 PCIE */
-#define	PCI_PRODUCT_INTEL_5000_PCIE_8	0x25f8		/* 5000 PCIE */
-#define	PCI_PRODUCT_INTEL_5000_PCIE_9	0x25f9		/* 5000 PCIE */
-#define	PCI_PRODUCT_INTEL_5000X_PCIE	0x25fa		/* 5000X PCIE */
+#define	PCI_PRODUCT_INTEL_5000_PCIE_7	0x25f7		/* 5000 PCIE x8 */
+#define	PCI_PRODUCT_INTEL_5000_PCIE_8	0x25f8		/* 5000 PCIE x8 */
+#define	PCI_PRODUCT_INTEL_5000_PCIE_9	0x25f9		/* 5000 PCIE x8 */
+#define	PCI_PRODUCT_INTEL_5000_PCIE_10	0x25fa		/* 5000 PCIE x16 */
 #define	PCI_PRODUCT_INTEL_E8500_HB	0x2600		/* E8500 Host */
 #define	PCI_PRODUCT_INTEL_E8500_PCIE_1	0x2601		/* E8500 PCIE */
 #define	PCI_PRODUCT_INTEL_E8500_PCIE_2	0x2602		/* E8500 PCIE */
@@ -2098,7 +2098,7 @@
 #define	PCI_PRODUCT_INTEL_E8500_PCIE_8	0x2608		/* E8500 PCIE x8 */
 #define	PCI_PRODUCT_INTEL_E8500_PCIE_9	0x2609		/* E8500 PCIE x8 */
 #define	PCI_PRODUCT_INTEL_E8500_PCIE_10	0x260a		/* E8500 PCIE x8 */
-#define	PCI_PRODUCT_INTEL_E8500_IMI_1	0x260c		/* E8500 IMI */
+#define	PCI_PRODUCT_INTEL_E8500_IMI	0x260c		/* E8500 IMI */
 #define	PCI_PRODUCT_INTEL_E8500_FSBINT	0x2610		/* E8500 FSB/Boot/Interrupt */
 #define	PCI_PRODUCT_INTEL_E8500_AM	0x2611		/* E8500 Address Mapping */
 #define	PCI_PRODUCT_INTEL_E8500_RAS	0x2612		/* E8500 RAS */
@@ -2329,17 +2329,17 @@
 #define	PCI_PRODUCT_INTEL_82854_HB	0x358c		/* 82854 Host */
 #define	PCI_PRODUCT_INTEL_82854_IGD	0x358e		/* 82854 Video */
 #define	PCI_PRODUCT_INTEL_E7520_HB	0x3590		/* E7520 Host */
-#define	PCI_PRODUCT_INTEL_E7520_MCH_ERR	0x3591		/* E7520 Error Reporting */
+#define	PCI_PRODUCT_INTEL_E7520_ERR	0x3591		/* E7520 Error Reporting */
 #define	PCI_PRODUCT_INTEL_E7320_HB	0x3592		/* E7320 Host */
-#define	PCI_PRODUCT_INTEL_E7525_ERR	0x3593		/* E7525 Error Reporting */
+#define	PCI_PRODUCT_INTEL_E7320_ERR	0x3593		/* E7320 Error Reporting */
 #define	PCI_PRODUCT_INTEL_E7520_DMA	0x3594		/* E7520 DMA */
-#define	PCI_PRODUCT_INTEL_MCH_PCIEA0	0x3595		/* MCH PCIE */
-#define	PCI_PRODUCT_INTEL_MCH_PCIEA1	0x3596		/* MCH PCIE */
-#define	PCI_PRODUCT_INTEL_MCH_PCIEB0	0x3597		/* MCH PCIE */
-#define	PCI_PRODUCT_INTEL_MCH_PCIEB1	0x3598		/* MCH PCIE */
-#define	PCI_PRODUCT_INTEL_MCH_PCIEC0	0x3599		/* MCH PCIE */
-#define	PCI_PRODUCT_INTEL_MCH_PCIEC1	0x359a		/* MCH PCIE */
-#define	PCI_PRODUCT_INTEL_E7525_CFG	0x359b		/* E7525 Config */
+#define	PCI_PRODUCT_INTEL_E7520_PCIE_A0	0x3595		/* E7520 PCIE */
+#define	PCI_PRODUCT_INTEL_E7520_PCIE_A1	0x3596		/* E7520 PCIE */
+#define	PCI_PRODUCT_INTEL_E7520_PCIE_B0	0x3597		/* E7520 PCIE */
+#define	PCI_PRODUCT_INTEL_E7520_PCIE_B1	0x3598		/* E7520 PCIE */
+#define	PCI_PRODUCT_INTEL_E7520_PCIE_C0	0x3599		/* E7520 PCIE */
+#define	PCI_PRODUCT_INTEL_E7520_PCIE_C1	0x359a		/* E7520 PCIE */
+#define	PCI_PRODUCT_INTEL_E7520_CFG	0x359b		/* E7520 Config */
 #define	PCI_PRODUCT_INTEL_E7525_HB	0x359e		/* E7525 Host */
 #define	PCI_PRODUCT_INTEL_PRO_WL_2200BG	0x4220		/* PRO/Wireless 2200BG */
 #define	PCI_PRODUCT_INTEL_PRO_WL_2225BG	0x4221		/* PRO/Wireless 2225BG */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index b2302271059..c82e04e7986 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.1320 2008/02/09 15:03:25 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1321 2008/02/09 19:05:02 kettenis Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -5569,7 +5569,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000_DMA,
-	    "5000 DMA Engine",
+	    "5000 DMA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82597EX_SR,
@@ -5880,32 +5880,32 @@ static const struct pci_known_product pci_known_products[] = {
 	    "E7500 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_DRAM,
-	    "E7500 DRAM",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_ERR,
+	    "E7500 Error Reporting",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_HI_B1,
-	    "E7500 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_PCI_B1,
+	    "E7500 PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_HI_B2,
-	    "E7500 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_PCI_B2,
+	    "E7500 PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_HI_C1,
-	    "E7500 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_PCI_C1,
+	    "E7500 PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_HI_C2,
-	    "E7500 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_PCI_C2,
+	    "E7500 PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_HI_D1,
-	    "E7500 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_PCI_D1,
+	    "E7500 PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_HI_D2,
-	    "E7500 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_PCI_D2,
+	    "E7500 PCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7501_HB,
@@ -5916,19 +5916,19 @@ static const struct pci_known_product pci_known_products[] = {
 	    "E7505 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_RAS,
-	    "E7505 RAS",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_ERR,
+	    "E7505 Error Reporting",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_AGP,
 	    "E7505 AGP",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_HI_B1,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_PCI_B1,
 	    "E7505 PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_HI_B2,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_PCI_B2,
 	    "E7505 PCI",
 	},
 	{
@@ -6112,7 +6112,7 @@ static const struct pci_known_product pci_known_products[] = {
 	    "5000 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000_ERR_REG,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000_ERR,
 	    "5000 Error Reporting",
 	},
 	{
@@ -6133,19 +6133,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000_PCIE_7,
-	    "5000 PCIE",
+	    "5000 PCIE x8",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000_PCIE_8,
-	    "5000 PCIE",
+	    "5000 PCIE x8",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000_PCIE_9,
-	    "5000 PCIE",
+	    "5000 PCIE x8",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000X_PCIE,
-	    "5000X PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5000_PCIE_10,
+	    "5000 PCIE x16",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E8500_HB,
@@ -6192,7 +6192,7 @@ static const struct pci_known_product pci_known_products[] = {
 	    "E8500 PCIE x8",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E8500_IMI_1,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E8500_IMI,
 	    "E8500 IMI",
 	},
 	{
@@ -7116,7 +7116,7 @@ static const struct pci_known_product pci_known_products[] = {
 	    "E7520 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_MCH_ERR,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_ERR,
 	    "E7520 Error Reporting",
 	},
 	{
@@ -7124,40 +7124,40 @@ static const struct pci_known_product pci_known_products[] = {
 	    "E7320 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_ERR,
-	    "E7525 Error Reporting",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7320_ERR,
+	    "E7320 Error Reporting",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_DMA,
 	    "E7520 DMA",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MCH_PCIEA0,
-	    "MCH PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_PCIE_A0,
+	    "E7520 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MCH_PCIEA1,
-	    "MCH PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_PCIE_A1,
+	    "E7520 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MCH_PCIEB0,
-	    "MCH PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_PCIE_B0,
+	    "E7520 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MCH_PCIEB1,
-	    "MCH PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_PCIE_B1,
+	    "E7520 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MCH_PCIEC0,
-	    "MCH PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_PCIE_C0,
+	    "E7520 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MCH_PCIEC1,
-	    "MCH PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_PCIE_C1,
+	    "E7520 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_CFG,
-	    "E7525 Config",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_CFG,
+	    "E7520 Config",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_HB,