regen

1 files changed, 102 insertions, 102 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index dbfc8dfa3a0..498223f1d29 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.1308 2008/01/02 09:31:26 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1309 2008/01/04 00:17:27 kettenis Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -1899,16 +1899,9 @@
 #define	PCI_PRODUCT_INTEL_82571EB_SDS_DUAL	0x10d9		/* PRO/1000 PT (82571EB) */
 #define	PCI_PRODUCT_INTEL_82571EB_SDS_QUAD	0x10da		/* PRO/1000 QP (82571EB) */
 #define	PCI_PRODUCT_INTEL_82598EB_CX4	0x10dd		/* 82598EB CX4 */
-#define	PCI_PRODUCT_INTEL_82815_DC100_HUB	0x1100		/* 82815 Hub */
-#define	PCI_PRODUCT_INTEL_82815_DC100_AGP	0x1101		/* 82815 AGP */
-#define	PCI_PRODUCT_INTEL_82815_DC100_GRAPH	0x1102		/* 82815 Graphics */
-#define	PCI_PRODUCT_INTEL_82815_NOAGP_HUB	0x1110		/* 82815 Hub */
-#define	PCI_PRODUCT_INTEL_82815_NOAGP_GRAPH	0x1112		/* 82815 Graphics */
-#define	PCI_PRODUCT_INTEL_82815_NOGRAPH_HUB	0x1120		/* 82815 Hub */
-#define	PCI_PRODUCT_INTEL_82815_NOGRAPH_AGP	0x1121		/* 82815 AGP */
-#define	PCI_PRODUCT_INTEL_82815_FULL_HUB	0x1130		/* 82815 Hub */
-#define	PCI_PRODUCT_INTEL_82815_FULL_AGP	0x1131		/* 82815 AGP */
-#define	PCI_PRODUCT_INTEL_82815_FULL_GRAPH	0x1132		/* 82815 Graphics */
+#define	PCI_PRODUCT_INTEL_82815_HB	0x1130		/* 82815 Host */
+#define	PCI_PRODUCT_INTEL_82815_AGP	0x1131		/* 82815 AGP */
+#define	PCI_PRODUCT_INTEL_82815_IGD	0x1132		/* 82815 Video */
 #define	PCI_PRODUCT_INTEL_82806AA_APIC	0x1161		/* 82806AA APIC */
 #define	PCI_PRODUCT_INTEL_82559ER	0x1209		/* 82559ER */
 #define	PCI_PRODUCT_INTEL_82092AA	0x1222		/* 82092AA IDE */
@@ -2005,16 +1998,16 @@
 #define	PCI_PRODUCT_INTEL_82801EB_USB_5	0x24dd		/* 82801EB/ER USB2 */
 #define	PCI_PRODUCT_INTEL_82801EB_USB_4	0x24de		/* 82801EB/ER USB */
 #define	PCI_PRODUCT_INTEL_82801ER_SATA	0x24df		/* 82801ER SATA */
-#define	PCI_PRODUCT_INTEL_82820_MCH	0x2501		/* 82820 MCH */
+#define	PCI_PRODUCT_INTEL_82820_HB	0x2501		/* 82820 Host */
 #define	PCI_PRODUCT_INTEL_82820_AGP	0x250f		/* 82820 AGP */
 #define	PCI_PRODUCT_INTEL_82850_HB	0x2530		/* 82850 Host */
 #define	PCI_PRODUCT_INTEL_82860_HB	0x2531		/* 82860 Host */
 #define	PCI_PRODUCT_INTEL_82850_AGP	0x2532		/* 82850/82860 AGP */
-#define	PCI_PRODUCT_INTEL_82860_PCI1	0x2533		/* 82860 PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82860_PCI2	0x2534		/* 82860 PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82860_PCI3	0x2535		/* 82860 PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82860_PCI4	0x2536		/* 82860 PCI-PCI */
-#define	PCI_PRODUCT_INTEL_E7500_HB	0x2540		/* E7500 MCH Host */
+#define	PCI_PRODUCT_INTEL_82860_PCI1	0x2533		/* 82860 PCI */
+#define	PCI_PRODUCT_INTEL_82860_PCI2	0x2534		/* 82860 PCI */
+#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 */
@@ -2022,34 +2015,34 @@
 #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_E7501_HB	0x254c		/* E7501 MCH Host */
-#define	PCI_PRODUCT_INTEL_E7505_HB	0x2550		/* E7505 MCH Host */
-#define	PCI_PRODUCT_INTEL_E7505_RAS	0x2551		/* E7505 MCH RAS */
-#define	PCI_PRODUCT_INTEL_E7505_AGP	0x2552		/* E7505 MCH AGP */
-#define	PCI_PRODUCT_INTEL_E7505_HI_B1	0x2553		/* E7505 MCH PCI-PCI */
-#define	PCI_PRODUCT_INTEL_E7505_HI_B2	0x2554		/* E7505 MCH PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82845G	0x2560		/* 82845G/GL */
-#define	PCI_PRODUCT_INTEL_82845G_AGP	0x2561		/* 82845G/GL/GV/GE/PE AGP */
-#define	PCI_PRODUCT_INTEL_82845G_IGD	0x2562		/* 82845G/GL Video */
-#define	PCI_PRODUCT_INTEL_82865_IO_1	0x2570		/* 82865G/PE/P CPU-I/0-1 */
-#define	PCI_PRODUCT_INTEL_82865_AGP	0x2571		/* 82865G/PE/P CPU-AGP */
-#define	PCI_PRODUCT_INTEL_82865_IGD	0x2572		/* 82865G Video */
-#define	PCI_PRODUCT_INTEL_82865_CSA	0x2573		/* 82865G/PE/P CPU-CSA */
-#define	PCI_PRODUCT_INTEL_82865_IO_2	0x2576		/* 82865G/PE/P CPU-I/0-2 */
+#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_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_82845G_HB	0x2560		/* 82845G Host */
+#define	PCI_PRODUCT_INTEL_82845G_AGP	0x2561		/* 82845G AGP */
+#define	PCI_PRODUCT_INTEL_82845G_IGD	0x2562		/* 82845G Video */
+#define	PCI_PRODUCT_INTEL_82865G_HB	0x2570		/* 82865G Host */
+#define	PCI_PRODUCT_INTEL_82865G_AGP	0x2571		/* 82865G AGP */
+#define	PCI_PRODUCT_INTEL_82865G_IGD	0x2572		/* 82865G Video */
+#define	PCI_PRODUCT_INTEL_82865G_CSA	0x2573		/* 82865G CSA */
+#define	PCI_PRODUCT_INTEL_82865G_OVF	0x2576		/* 82865G Overflow */
 #define	PCI_PRODUCT_INTEL_82875P_HB	0x2578		/* 82875P Host */
 #define	PCI_PRODUCT_INTEL_82875P_AGP	0x2579		/* 82875P AGP */
-#define	PCI_PRODUCT_INTEL_82875P_CSA	0x257b		/* 82875P PCI-CSA */
-#define	PCI_PRODUCT_INTEL_82915G_HB	0x2580		/* 82915G/P/GV Host */
-#define	PCI_PRODUCT_INTEL_82915G_PCIE	0x2581		/* 82915G/P/GV PCIE */
-#define	PCI_PRODUCT_INTEL_82915G_IV	0x2582		/* 82915G/P/GV Video */
-#define	PCI_PRODUCT_INTEL_82925X_HB	0x2584		/* 82925X MCH Host */
+#define	PCI_PRODUCT_INTEL_82875P_CSA	0x257b		/* 82875P CSA */
+#define	PCI_PRODUCT_INTEL_82915G_HB	0x2580		/* 82915G Host */
+#define	PCI_PRODUCT_INTEL_82915G_PCIE	0x2581		/* 82915G PCIE */
+#define	PCI_PRODUCT_INTEL_82915G_IGD_1	0x2582		/* 82915G Video */
+#define	PCI_PRODUCT_INTEL_82925X_HB	0x2584		/* 82925X Host */
 #define	PCI_PRODUCT_INTEL_82925X_PCIE	0x2585		/* 82925X PCIE */
-#define	PCI_PRODUCT_INTEL_E7221_HB	0x2588		/* E7221 MCH Host */
+#define	PCI_PRODUCT_INTEL_E7221_HB	0x2588		/* E7221 Host */
 #define	PCI_PRODUCT_INTEL_E7221_PCIE	0x2589		/* E7221 PCIE */
 #define	PCI_PRODUCT_INTEL_E7221_IGD	0x258a		/* E7221 Video */
-#define	PCI_PRODUCT_INTEL_82915GM_HB	0x2590		/* 82915GM/PM/GMS Host */
-#define	PCI_PRODUCT_INTEL_82915GM_PCIE	0x2591		/* 82915PM/GM PCIE */
-#define	PCI_PRODUCT_INTEL_82915GM_IGD	0x2592		/* 82915GM/GMS Video */
+#define	PCI_PRODUCT_INTEL_82915GM_HB	0x2590		/* 82915GM Host */
+#define	PCI_PRODUCT_INTEL_82915GM_PCIE	0x2591		/* 82915GM PCIE */
+#define	PCI_PRODUCT_INTEL_82915GM_IGD_1	0x2592		/* 82915GM Video */
 #define	PCI_PRODUCT_INTEL_6300ESB_LPC	0x25a1		/* 6300ESB LPC */
 #define	PCI_PRODUCT_INTEL_6300ESB_IDE	0x25a2		/* 6300ESB IDE */
 #define	PCI_PRODUCT_INTEL_6300ESB_SATA	0x25a3		/* 6300ESB SATA */
@@ -2155,22 +2148,22 @@
 #define	PCI_PRODUCT_INTEL_6321ESB_HDA	0x269a		/* 6321ESB HD Audio */
 #define	PCI_PRODUCT_INTEL_6321ESB_SMB	0x269b		/* 6321ESB SMBus */
 #define	PCI_PRODUCT_INTEL_6321ESB_IDE	0x269e		/* 6321ESB IDE */
-#define	PCI_PRODUCT_INTEL_82945GP_MCH	0x2770		/* 82945GP */
-#define	PCI_PRODUCT_INTEL_82945GP_PCIE	0x2771		/* 82945GP PCIE */
+#define	PCI_PRODUCT_INTEL_82945G_HB	0x2770		/* 82945G Host */
+#define	PCI_PRODUCT_INTEL_82945G_PCIE	0x2771		/* 82945G PCIE */
 #define	PCI_PRODUCT_INTEL_82945G_IGD_1	0x2772		/* 82945G Video */
-#define	PCI_PRODUCT_INTEL_82955X_HB	0x2774		/* 82955X MCH */
+#define	PCI_PRODUCT_INTEL_82955X_HB	0x2774		/* 82955X Host */
 #define	PCI_PRODUCT_INTEL_82955X_PCIE	0x2775		/* 82955X PCIE */
 #define	PCI_PRODUCT_INTEL_82945G_IGD_2	0x2776		/* 82945G Video */
-#define	PCI_PRODUCT_INTEL_E7230_MCH	0x2778		/* E7230 MCH */
+#define	PCI_PRODUCT_INTEL_E7230_HB	0x2778		/* E7230 Host */
 #define	PCI_PRODUCT_INTEL_E7230_PCIE	0x2779		/* E7230 PCIE */
-#define	PCI_PRODUCT_INTEL_82975X_MCH	0x277c		/* 82975X MCH */
+#define	PCI_PRODUCT_INTEL_82975X_HB	0x277c		/* 82975X Host */
 #define	PCI_PRODUCT_INTEL_82975X_PCIE	0x277d		/* 82975X PCIE */
-#define	PCI_PRODUCT_INTEL_82915G_IGD	0x2782		/* 82915G Video */
-#define	PCI_PRODUCT_INTEL_82915GM_IGD_S	0x2792		/* 82915GM/GMS Video */
-#define	PCI_PRODUCT_INTEL_82945GM_MCH	0x27a0		/* 82945GM MCH */
-#define	PCI_PRODUCT_INTEL_82945GM_PEG	0x27a1		/* 82945GM PCIE */
-#define	PCI_PRODUCT_INTEL_82945GM_IGD	0x27a2		/* 82945GM Video */
-#define	PCI_PRODUCT_INTEL_82945GM_IGD_S	0x27a6		/* 82945GM Video */
+#define	PCI_PRODUCT_INTEL_82915G_IGD_2	0x2782		/* 82915G Video */
+#define	PCI_PRODUCT_INTEL_82915GM_IGD_2	0x2792		/* 82915GM Video */
+#define	PCI_PRODUCT_INTEL_82945GM_HB	0x27a0		/* 82945GM Host */
+#define	PCI_PRODUCT_INTEL_82945GM_PCIE	0x27a1		/* 82945GM PCIE */
+#define	PCI_PRODUCT_INTEL_82945GM_IGD_1	0x27a2		/* 82945GM Video */
+#define	PCI_PRODUCT_INTEL_82945GM_IGD_2	0x27a6		/* 82945GM Video */
 #define	PCI_PRODUCT_INTEL_82801GH_LPC	0x27b0		/* 82801GH LPC */
 #define	PCI_PRODUCT_INTEL_82801GB_LPC	0x27b8		/* 82801GB LPC */
 #define	PCI_PRODUCT_INTEL_82801GBM_LPC	0x27b9		/* 82801GBM LPC */
@@ -2265,37 +2258,45 @@
 #define	PCI_PRODUCT_INTEL_82946GZ_HECI_2	0x2975		/* 82946GZ HECI */
 #define	PCI_PRODUCT_INTEL_82946GZ_PT_IDER	0x2976		/* 82946GZ PT_IDER */
 #define	PCI_PRODUCT_INTEL_82946GZ_KT	0x2977		/* 82946GZ KT */
-#define	PCI_PRODUCT_INTEL_82965G1_HB	0x2980		/* 82965G1 Host */
-#define	PCI_PRODUCT_INTEL_82965G1_PCIE	0x2981		/* 82965G1 PCIE */
-#define	PCI_PRODUCT_INTEL_82965G1_IGD	0x2982		/* 82965G1 Graphics */
-#define	PCI_PRODUCT_INTEL_82Q963_HB	0x2990		/* 82Q963 Host */
-#define	PCI_PRODUCT_INTEL_82Q963_PCIE	0x2991		/* 82Q963 PCIE */
-#define	PCI_PRODUCT_INTEL_82Q963_IGD_1	0x2992		/* 82Q963 Graphics */
-#define	PCI_PRODUCT_INTEL_82Q963_IGD_2	0x2993		/* 82Q963 Graphics */
-#define	PCI_PRODUCT_INTEL_82Q963_HECI_1	0x2994		/* 82Q963 HECI */
-#define	PCI_PRODUCT_INTEL_82Q963_HECI_2	0x2995		/* 82Q963 HECI */
-#define	PCI_PRODUCT_INTEL_82Q963_PT_IDER	0x2996		/* 82Q963 PT IDER */
-#define	PCI_PRODUCT_INTEL_82Q963_KT	0x2997		/* 82Q963 KT */
-#define	PCI_PRODUCT_INTEL_82965_MCH	0x29a0		/* 82965 MCH */
-#define	PCI_PRODUCT_INTEL_82965_PPB	0x29a1		/* 82965 PCIE */
-#define	PCI_PRODUCT_INTEL_82965_IGD_1	0x29a2		/* 82965 Video */
-#define	PCI_PRODUCT_INTEL_82965_IGD_2	0x29a3		/* 82965 Video */
-#define	PCI_PRODUCT_INTEL_82965_HECI_1	0x29a4		/* 82965 HECI */
-#define	PCI_PRODUCT_INTEL_82965_HECI_2	0x29a5		/* 82965 HECI */
-#define	PCI_PRODUCT_INTEL_82965_PT_IDER	0x29a6		/* 82965 PT IDER */
-#define	PCI_PRODUCT_INTEL_82965_KT	0x29a7		/* 82965 KT */
-#define	PCI_PRODUCT_INTEL_82G33_MCH	0x29c0		/* 82G33 MCH */
+#define	PCI_PRODUCT_INTEL_82G35_HB	0x2980		/* 82G35 Host */
+#define	PCI_PRODUCT_INTEL_82G35_PCIE	0x2981		/* 82G35 PCIE */
+#define	PCI_PRODUCT_INTEL_82G35_IGD_1	0x2982		/* 82G35 Video */
+#define	PCI_PRODUCT_INTEL_82G35_IGD_2	0x2983		/* 82G35 Video */
+#define	PCI_PRODUCT_INTEL_82G35_HECI	0x2984		/* 82G35 HECI */
+#define	PCI_PRODUCT_INTEL_82Q965_HB	0x2990		/* 82Q965 Host */
+#define	PCI_PRODUCT_INTEL_82Q965_PCIE	0x2991		/* 82Q965 PCIE */
+#define	PCI_PRODUCT_INTEL_82Q965_IGD_1	0x2992		/* 82Q965 Video */
+#define	PCI_PRODUCT_INTEL_82Q965_IGD_2	0x2993		/* 82Q965 Video */
+#define	PCI_PRODUCT_INTEL_82Q965_HECI_1	0x2994		/* 82Q965 HECI */
+#define	PCI_PRODUCT_INTEL_82Q965_HECI_2	0x2995		/* 82Q965 HECI */
+#define	PCI_PRODUCT_INTEL_82Q965_PT_IDER	0x2996		/* 82Q965 PT IDER */
+#define	PCI_PRODUCT_INTEL_82Q965_KT	0x2997		/* 82Q965 KT */
+#define	PCI_PRODUCT_INTEL_82G965_HB	0x29a0		/* 82G965 Host */
+#define	PCI_PRODUCT_INTEL_82G965_PCIE	0x29a1		/* 82G965 PCIE */
+#define	PCI_PRODUCT_INTEL_82G965_IGD_1	0x29a2		/* 82G965 Video */
+#define	PCI_PRODUCT_INTEL_82G965_IGD_2	0x29a3		/* 82G965 Video */
+#define	PCI_PRODUCT_INTEL_82G965_HECI_1	0x29a4		/* 82G965 HECI */
+#define	PCI_PRODUCT_INTEL_82G965_HECI_2	0x29a5		/* 82G965 HECI */
+#define	PCI_PRODUCT_INTEL_82G965_PT_IDER	0x29a6		/* 82G965 PT IDER */
+#define	PCI_PRODUCT_INTEL_82G965_KT	0x29a7		/* 82G965 KT */
+#define	PCI_PRODUCT_INTEL_82G33_HB	0x29c0		/* 82G33 Host */
 #define	PCI_PRODUCT_INTEL_82G33_PCIE	0x29c1		/* 82G33 PCIE */
-#define	PCI_PRODUCT_INTEL_82G33_IGD	0x29c2		/* 82G33 Graphics */
-#define	PCI_PRODUCT_INTEL_82965GM_MCH	0x2a00		/* 82965GM MCH */
-#define	PCI_PRODUCT_INTEL_82965GM_PCIE	0x2a01		/* 82965GM PCIE */
-#define	PCI_PRODUCT_INTEL_82965GM_IGD_1	0x2a02		/* 82965GM Video */
-#define	PCI_PRODUCT_INTEL_82965GM_IGD_2	0x2a03		/* 82965GM Video */
+#define	PCI_PRODUCT_INTEL_82G33_IGD_1	0x29c2		/* 82G33 Video */
+#define	PCI_PRODUCT_INTEL_82G33_IGD_2	0x29c3		/* 82G33 Video */
+#define	PCI_PRODUCT_INTEL_82G33_HECI_1	0x29c4		/* 82G33 HECI */
+#define	PCI_PRODUCT_INTEL_82G33_HECI_2	0x29c5		/* 82G33 HECI */
+#define	PCI_PRODUCT_INTEL_82G33_PT_IDER	0x29c6		/* 82G33 PT IDER */
+#define	PCI_PRODUCT_INTEL_82G33_KT	0x29c7		/* 82G33 KT */
+#define	PCI_PRODUCT_INTEL_82GM965_HB	0x2a00		/* GM965 Host */
+#define	PCI_PRODUCT_INTEL_82GM965_PCIE	0x2a01		/* GM965 PCIE */
+#define	PCI_PRODUCT_INTEL_82GM965_IGD_1	0x2a02		/* GM965 Video */
+#define	PCI_PRODUCT_INTEL_82GM965_IGD_2	0x2a03		/* GM965 Video */
 #define	PCI_PRODUCT_INTEL_RCU32	0x3092		/* RCU32 I2O RAID */
 #define	PCI_PRODUCT_INTEL_3124	0x3124		/* 3124 SATA */
 #define	PCI_PRODUCT_INTEL_31244	0x3200		/* 31244 SATA */
-#define	PCI_PRODUCT_INTEL_82855PE	0x3340		/* 82855PE Hub */
-#define	PCI_PRODUCT_INTEL_82855PE_AGP	0x3341		/* 82855PE AGP */
+#define	PCI_PRODUCT_INTEL_82855PM_HB	0x3340		/* 82855PM Host */
+#define	PCI_PRODUCT_INTEL_82855PM_AGP	0x3341		/* 82855PM AGP */
+#define	PCI_PRODUCT_INTEL_82855PM_PM	0x3342		/* 82855PM Power */
 #define	PCI_PRODUCT_INTEL_6321ESB_PCIE_5	0x3500		/* 6321ESB PCIE */
 #define	PCI_PRODUCT_INTEL_6321ESB_PCIX	0x350c		/* 6321ESB PCIE-PCIX */
 #define	PCI_PRODUCT_INTEL_6321ESB_PCIE_6	0x3510		/* 6321ESB PCIE */
@@ -2304,30 +2305,29 @@
 #define	PCI_PRODUCT_INTEL_6321ESB_PCIE_9	0x3515		/* 6321ESB PCIE */
 #define	PCI_PRODUCT_INTEL_6321ESB_PCIE_10	0x3518		/* 6321ESB PCIE */
 #define	PCI_PRODUCT_INTEL_6321ESB_PCIE_11	0x3519		/* 6321ESB PCIE */
-#define	PCI_PRODUCT_INTEL_82830MP_IO_1	0x3575		/* 82830MP CPU-I/O-1 */
-#define	PCI_PRODUCT_INTEL_82830MP_AGP	0x3576		/* 82830MP CPU-AGP */
-#define	PCI_PRODUCT_INTEL_82830MP_IV	0x3577		/* 82830MP Integrated Video */
-#define	PCI_PRODUCT_INTEL_82830MP_IO_2	0x3578		/* 82830MP CPU-I/O-2 */
-#define	PCI_PRODUCT_INTEL_82852GM_HPB	0x3580		/* 82852GM Hub-PCI */
-#define	PCI_PRODUCT_INTEL_82852_AGP	0x3581		/* 82852/82855 AGP */
-#define	PCI_PRODUCT_INTEL_82852GM_AGP	0x3582		/* 82852GM AGP */
-#define	PCI_PRODUCT_INTEL_82852GM_MEM	0x3584		/* 82852GM Memory */
-#define	PCI_PRODUCT_INTEL_82852GM_CFG	0x3585		/* 82852GM Configuration */
-#define	PCI_PRODUCT_INTEL_82854_MCH	0x358c		/* 82854 MCH */
+#define	PCI_PRODUCT_INTEL_82830M_HB	0x3575		/* 82830M Host */
+#define	PCI_PRODUCT_INTEL_82830M_AGP	0x3576		/* 82830M AGP */
+#define	PCI_PRODUCT_INTEL_82830M_IGD	0x3577		/* 82830M Video */
+#define	PCI_PRODUCT_INTEL_82855GM_HB	0x3580		/* 82855GM Host */
+#define	PCI_PRODUCT_INTEL_82855GME_AGP	0x3581		/* 82855GME AGP */
+#define	PCI_PRODUCT_INTEL_82855GM_IGD	0x3582		/* 82855GM Video */
+#define	PCI_PRODUCT_INTEL_82855GM_MEM	0x3584		/* 82855GM Memory */
+#define	PCI_PRODUCT_INTEL_82855GM_CFG	0x3585		/* 82855GM Config */
+#define	PCI_PRODUCT_INTEL_82854_HB	0x358c		/* 82854 Host */
 #define	PCI_PRODUCT_INTEL_82854_IGD	0x358e		/* 82854 Video */
-#define	PCI_PRODUCT_INTEL_E7520_MCH	0x3590		/* E7520 MCH */
-#define	PCI_PRODUCT_INTEL_E7520_MCH_ERR	0x3591		/* E7520 MCH ERR */
-#define	PCI_PRODUCT_INTEL_E7320_MCH	0x3592		/* E7320 MCH */
-#define	PCI_PRODUCT_INTEL_E7525_MCH_ERR	0x3593		/* E7525 MCH ERR */
-#define	PCI_PRODUCT_INTEL_E7520_MCH_DMA	0x3594		/* E7520 MCH DMA */
+#define	PCI_PRODUCT_INTEL_E7520_HB	0x3590		/* E7520 Host */
+#define	PCI_PRODUCT_INTEL_E7520_MCH_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_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_MCH_CFG	0x359b		/* E7525 MCH Configuration */
-#define	PCI_PRODUCT_INTEL_E7525_MCH	0x359e		/* E7525 MCH */
+#define	PCI_PRODUCT_INTEL_E7525_CFG	0x359b		/* E7525 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 */
 #define	PCI_PRODUCT_INTEL_PRO_WL_3945ABG_1	0x4222		/* PRO/Wireless 3945ABG */
@@ -2347,18 +2347,18 @@
 #define	PCI_PRODUCT_INTEL_82371AB_IDE	0x7111		/* 82371AB IDE */
 #define	PCI_PRODUCT_INTEL_82371AB_USB	0x7112		/* 82371AB USB */
 #define	PCI_PRODUCT_INTEL_82371AB_PM	0x7113		/* 82371AB Power */
-#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 */
-#define	PCI_PRODUCT_INTEL_82810E_GC	0x7125		/* 82810E Graphics */
+#define	PCI_PRODUCT_INTEL_82810_HB	0x7120		/* 82810 Host */
+#define	PCI_PRODUCT_INTEL_82810_IGD	0x7121		/* 82810 Video */
+#define	PCI_PRODUCT_INTEL_82810_DC100_HB	0x7122		/* 82810-DC100 Host */
+#define	PCI_PRODUCT_INTEL_82810_DC100_IGD	0x7123		/* 82810-DC100 Video */
+#define	PCI_PRODUCT_INTEL_82810E_HB	0x7124		/* 82810E Host */
+#define	PCI_PRODUCT_INTEL_82810E_IGD	0x7125		/* 82810E Video */
 #define	PCI_PRODUCT_INTEL_82443LX	0x7180		/* 82443LX AGP */
 #define	PCI_PRODUCT_INTEL_82443LX_AGP	0x7181		/* 82443LX AGP */
 #define	PCI_PRODUCT_INTEL_82443BX	0x7190		/* 82443BX AGP */
 #define	PCI_PRODUCT_INTEL_82443BX_AGP	0x7191		/* 82443BX AGP */
 #define	PCI_PRODUCT_INTEL_82443BX_NOAGP	0x7192		/* 82443BX */
-#define	PCI_PRODUCT_INTEL_82440MX	0x7194		/* 82440MX Host */
+#define	PCI_PRODUCT_INTEL_82440MX_HB	0x7194		/* 82440MX Host */
 #define	PCI_PRODUCT_INTEL_82440MX_ACA	0x7195		/* 82440MX AC97 */
 #define	PCI_PRODUCT_INTEL_82440MX_ACM	0x7196		/* 82440MX Modem */
 #define	PCI_PRODUCT_INTEL_82440MX_ISA	0x7198		/* 82440MX ISA */