Clean up Intel host bridge PCI IDs.

ok deraadt@

1 files changed, 102 insertions, 102 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 69ca62e4994..bae14a092ef 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$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 $	*/
 
 /*
@@ -1894,16 +1894,9 @@ product INTEL 82575GB_QUAD_CPR	0x10d6	PRO/1000 QP (82575GB)
 product INTEL 82571EB_SDS_DUAL	0x10d9	PRO/1000 PT (82571EB)
 product INTEL 82571EB_SDS_QUAD	0x10da	PRO/1000 QP (82571EB)
 product INTEL 82598EB_CX4	0x10dd	82598EB CX4
-product INTEL 82815_DC100_HUB	0x1100	82815 Hub
-product INTEL 82815_DC100_AGP	0x1101	82815 AGP
-product INTEL 82815_DC100_GRAPH	0x1102	82815 Graphics
-product INTEL 82815_NOAGP_HUB	0x1110	82815 Hub
-product INTEL 82815_NOAGP_GRAPH	0x1112	82815 Graphics
-product INTEL 82815_NOGRAPH_HUB	0x1120	82815 Hub
-product INTEL 82815_NOGRAPH_AGP	0x1121	82815 AGP
-product INTEL 82815_FULL_HUB	0x1130	82815 Hub
-product INTEL 82815_FULL_AGP	0x1131	82815 AGP
-product INTEL 82815_FULL_GRAPH	0x1132	82815 Graphics
+product INTEL 82815_HB		0x1130	82815 Host
+product INTEL 82815_AGP		0x1131	82815 AGP
+product INTEL 82815_IGD		0x1132	82815 Video
 product INTEL 82806AA_APIC	0x1161	82806AA APIC
 product INTEL 82559ER		0x1209	82559ER
 product INTEL 82092AA		0x1222	82092AA IDE
@@ -2000,16 +1993,16 @@ product INTEL 82801EB_IDE	0x24db	82801EB/ER IDE
 product INTEL 82801EB_USB_5	0x24dd	82801EB/ER USB2
 product INTEL 82801EB_USB_4	0x24de	82801EB/ER USB
 product INTEL 82801ER_SATA	0x24df	82801ER SATA
-product INTEL 82820_MCH		0x2501	82820 MCH
+product INTEL 82820_HB		0x2501	82820 Host
 product INTEL 82820_AGP		0x250f	82820 AGP
 product INTEL 82850_HB		0x2530	82850 Host
 product INTEL 82860_HB		0x2531	82860 Host
 product INTEL 82850_AGP		0x2532	82850/82860 AGP
-product INTEL 82860_PCI1	0x2533	82860 PCI-PCI
-product INTEL 82860_PCI2	0x2534	82860 PCI-PCI
-product INTEL 82860_PCI3	0x2535	82860 PCI-PCI
-product INTEL 82860_PCI4	0x2536	82860 PCI-PCI
-product INTEL E7500_HB		0x2540	E7500 MCH Host
+product INTEL 82860_PCI1	0x2533	82860 PCI
+product INTEL 82860_PCI2	0x2534	82860 PCI
+product INTEL 82860_PCI3	0x2535	82860 PCI
+product INTEL 82860_PCI4	0x2536	82860 PCI
+product INTEL E7500_HB		0x2540	E7500 Host
 product INTEL E7500_DRAM	0x2541	E7500 DRAM
 product INTEL E7500_HI_B1	0x2543	E7500 MCH
 product INTEL E7500_HI_B2	0x2544	E7500 MCH
@@ -2017,34 +2010,34 @@ product INTEL E7500_HI_C1	0x2545	E7500 MCH
 product INTEL E7500_HI_C2	0x2546	E7500 MCH
 product INTEL E7500_HI_D1	0x2547	E7500 MCH
 product INTEL E7500_HI_D2	0x2548	E7500 MCH
-product INTEL E7501_HB		0x254c	E7501 MCH Host
-product INTEL E7505_HB		0x2550	E7505 MCH Host
-product INTEL E7505_RAS		0x2551	E7505 MCH RAS
-product INTEL E7505_AGP		0x2552	E7505 MCH AGP
-product INTEL E7505_HI_B1	0x2553	E7505 MCH PCI-PCI
-product INTEL E7505_HI_B2	0x2554	E7505 MCH PCI-PCI
-product INTEL 82845G		0x2560	82845G/GL
-product INTEL 82845G_AGP	0x2561	82845G/GL/GV/GE/PE AGP
-product INTEL 82845G_IGD	0x2562	82845G/GL Video
-product INTEL 82865_IO_1	0x2570	82865G/PE/P CPU-I/0-1
-product INTEL 82865_AGP		0x2571	82865G/PE/P CPU-AGP
-product INTEL 82865_IGD		0x2572	82865G Video
-product INTEL 82865_CSA		0x2573	82865G/PE/P CPU-CSA
-product INTEL 82865_IO_2	0x2576	82865G/PE/P CPU-I/0-2
+product INTEL E7501_HB		0x254c	E7501 Host
+product INTEL E7505_HB		0x2550	E7505 Host
+product INTEL E7505_RAS		0x2551	E7505 RAS
+product INTEL E7505_AGP		0x2552	E7505 AGP
+product INTEL E7505_HI_B1	0x2553	E7505 PCI
+product INTEL E7505_HI_B2	0x2554	E7505 PCI
+product INTEL 82845G_HB		0x2560	82845G Host
+product INTEL 82845G_AGP	0x2561	82845G AGP
+product INTEL 82845G_IGD	0x2562	82845G Video
+product INTEL 82865G_HB		0x2570	82865G Host
+product INTEL 82865G_AGP	0x2571	82865G AGP
+product INTEL 82865G_IGD	0x2572	82865G Video
+product INTEL 82865G_CSA	0x2573	82865G CSA
+product INTEL 82865G_OVF	0x2576	82865G Overflow
 product INTEL 82875P_HB		0x2578	82875P Host
 product INTEL 82875P_AGP	0x2579	82875P AGP
-product INTEL 82875P_CSA	0x257b	82875P PCI-CSA
-product INTEL 82915G_HB		0x2580	82915G/P/GV Host
-product INTEL 82915G_PCIE	0x2581	82915G/P/GV PCIE
-product INTEL 82915G_IV		0x2582	82915G/P/GV Video
-product INTEL 82925X_HB		0x2584	82925X MCH Host
+product INTEL 82875P_CSA	0x257b	82875P CSA
+product INTEL 82915G_HB		0x2580	82915G Host
+product INTEL 82915G_PCIE	0x2581	82915G PCIE
+product INTEL 82915G_IGD_1	0x2582	82915G Video
+product INTEL 82925X_HB		0x2584	82925X Host
 product INTEL 82925X_PCIE	0x2585	82925X PCIE
-product INTEL E7221_HB		0x2588	E7221 MCH Host
+product INTEL E7221_HB		0x2588	E7221 Host
 product INTEL E7221_PCIE	0x2589	E7221 PCIE
 product INTEL E7221_IGD		0x258a	E7221 Video
-product INTEL 82915GM_HB	0x2590	82915GM/PM/GMS Host
-product INTEL 82915GM_PCIE	0x2591	82915PM/GM PCIE
-product INTEL 82915GM_IGD	0x2592	82915GM/GMS Video
+product INTEL 82915GM_HB	0x2590	82915GM Host
+product INTEL 82915GM_PCIE	0x2591	82915GM PCIE
+product INTEL 82915GM_IGD_1	0x2592	82915GM Video
 product INTEL 6300ESB_LPC	0x25a1	6300ESB LPC
 product INTEL 6300ESB_IDE	0x25a2	6300ESB IDE
 product INTEL 6300ESB_SATA	0x25a3	6300ESB SATA
@@ -2150,22 +2143,22 @@ product INTEL 6321ESB_ACM	0x2699	6321ESB Modem
 product INTEL 6321ESB_HDA	0x269a	6321ESB HD Audio
 product INTEL 6321ESB_SMB	0x269b	6321ESB SMBus
 product INTEL 6321ESB_IDE	0x269e	6321ESB IDE
-product INTEL 82945GP_MCH	0x2770	82945GP
-product INTEL 82945GP_PCIE	0x2771	82945GP PCIE
+product INTEL 82945G_HB		0x2770	82945G Host
+product INTEL 82945G_PCIE	0x2771	82945G PCIE
 product INTEL 82945G_IGD_1	0x2772	82945G Video
-product INTEL 82955X_HB		0x2774	82955X MCH
+product INTEL 82955X_HB		0x2774	82955X Host
 product INTEL 82955X_PCIE	0x2775	82955X PCIE
 product INTEL 82945G_IGD_2	0x2776	82945G Video
-product INTEL E7230_MCH		0x2778	E7230 MCH
+product INTEL E7230_HB		0x2778	E7230 Host
 product INTEL E7230_PCIE	0x2779	E7230 PCIE
-product INTEL 82975X_MCH	0x277c	82975X MCH
+product INTEL 82975X_HB		0x277c	82975X Host
 product INTEL 82975X_PCIE	0x277d	82975X PCIE
-product INTEL 82915G_IGD	0x2782	82915G Video
-product INTEL 82915GM_IGD_S	0x2792	82915GM/GMS Video
-product INTEL 82945GM_MCH	0x27a0	82945GM MCH
-product INTEL 82945GM_PEG	0x27a1	82945GM PCIE
-product INTEL 82945GM_IGD	0x27a2	82945GM Video
-product INTEL 82945GM_IGD_S	0x27a6	82945GM Video
+product INTEL 82915G_IGD_2	0x2782	82915G Video
+product INTEL 82915GM_IGD_2	0x2792	82915GM Video
+product INTEL 82945GM_HB	0x27a0	82945GM Host
+product INTEL 82945GM_PCIE	0x27a1	82945GM PCIE
+product INTEL 82945GM_IGD_1	0x27a2	82945GM Video
+product INTEL 82945GM_IGD_2	0x27a6	82945GM Video
 product INTEL 82801GH_LPC	0x27b0	82801GH LPC
 product INTEL 82801GB_LPC	0x27b8	82801GB LPC
 product INTEL 82801GBM_LPC	0x27b9	82801GBM LPC
@@ -2260,37 +2253,45 @@ product INTEL 82946GZ_HECI_1	0x2974	82946GZ HECI
 product INTEL 82946GZ_HECI_2	0x2975	82946GZ HECI
 product INTEL 82946GZ_PT_IDER	0x2976	82946GZ PT_IDER
 product INTEL 82946GZ_KT	0x2977	82946GZ KT
-product INTEL 82965G1_HB	0x2980	82965G1 Host
-product INTEL 82965G1_PCIE	0x2981	82965G1 PCIE
-product INTEL 82965G1_IGD	0x2982	82965G1 Graphics
-product INTEL 82Q963_HB		0x2990	82Q963 Host
-product INTEL 82Q963_PCIE	0x2991	82Q963 PCIE
-product INTEL 82Q963_IGD_1	0x2992	82Q963 Graphics
-product INTEL 82Q963_IGD_2	0x2993	82Q963 Graphics
-product INTEL 82Q963_HECI_1	0x2994	82Q963 HECI
-product INTEL 82Q963_HECI_2	0x2995	82Q963 HECI
-product INTEL 82Q963_PT_IDER	0x2996	82Q963 PT IDER
-product INTEL 82Q963_KT		0x2997	82Q963 KT
-product INTEL 82965_MCH		0x29a0	82965 MCH
-product INTEL 82965_PPB		0x29a1	82965 PCIE
-product INTEL 82965_IGD_1	0x29a2	82965 Video
-product INTEL 82965_IGD_2	0x29a3	82965 Video
-product INTEL 82965_HECI_1	0x29a4	82965 HECI
-product INTEL 82965_HECI_2	0x29a5	82965 HECI
-product INTEL 82965_PT_IDER	0x29a6	82965 PT IDER
-product INTEL 82965_KT		0x29a7	82965 KT
-product INTEL 82G33_MCH		0x29c0	82G33 MCH
+product INTEL 82G35_HB		0x2980	82G35 Host
+product INTEL 82G35_PCIE	0x2981	82G35 PCIE
+product INTEL 82G35_IGD_1	0x2982	82G35 Video
+product INTEL 82G35_IGD_2	0x2983	82G35 Video
+product INTEL 82G35_HECI	0x2984	82G35 HECI
+product INTEL 82Q965_HB		0x2990	82Q965 Host
+product INTEL 82Q965_PCIE	0x2991	82Q965 PCIE
+product INTEL 82Q965_IGD_1	0x2992	82Q965 Video
+product INTEL 82Q965_IGD_2	0x2993	82Q965 Video
+product INTEL 82Q965_HECI_1	0x2994	82Q965 HECI
+product INTEL 82Q965_HECI_2	0x2995	82Q965 HECI
+product INTEL 82Q965_PT_IDER	0x2996	82Q965 PT IDER
+product INTEL 82Q965_KT		0x2997	82Q965 KT
+product INTEL 82G965_HB		0x29a0	82G965 Host
+product INTEL 82G965_PCIE	0x29a1	82G965 PCIE
+product INTEL 82G965_IGD_1	0x29a2	82G965 Video
+product INTEL 82G965_IGD_2	0x29a3	82G965 Video
+product INTEL 82G965_HECI_1	0x29a4	82G965 HECI
+product INTEL 82G965_HECI_2	0x29a5	82G965 HECI
+product INTEL 82G965_PT_IDER	0x29a6	82G965 PT IDER
+product INTEL 82G965_KT		0x29a7	82G965 KT
+product INTEL 82G33_HB		0x29c0	82G33 Host
 product INTEL 82G33_PCIE	0x29c1	82G33 PCIE
-product INTEL 82G33_IGD		0x29c2	82G33 Graphics
-product INTEL 82965GM_MCH	0x2a00	82965GM MCH
-product INTEL 82965GM_PCIE	0x2a01	82965GM PCIE
-product INTEL 82965GM_IGD_1	0x2a02	82965GM Video
-product INTEL 82965GM_IGD_2	0x2a03	82965GM Video
+product INTEL 82G33_IGD_1	0x29c2	82G33 Video
+product INTEL 82G33_IGD_2	0x29c3	82G33 Video
+product INTEL 82G33_HECI_1	0x29c4	82G33 HECI
+product INTEL 82G33_HECI_2	0x29c5	82G33 HECI
+product INTEL 82G33_PT_IDER	0x29c6	82G33 PT IDER
+product INTEL 82G33_KT		0x29c7	82G33 KT
+product INTEL 82GM965_HB	0x2a00	GM965 Host
+product INTEL 82GM965_PCIE	0x2a01	GM965 PCIE
+product INTEL 82GM965_IGD_1	0x2a02	GM965 Video
+product INTEL 82GM965_IGD_2	0x2a03	GM965 Video
 product INTEL RCU32		0x3092	RCU32 I2O RAID
 product INTEL 3124		0x3124	3124 SATA
 product INTEL 31244		0x3200	31244 SATA
-product INTEL 82855PE		0x3340	82855PE Hub
-product INTEL 82855PE_AGP	0x3341	82855PE AGP
+product INTEL 82855PM_HB	0x3340	82855PM Host
+product INTEL 82855PM_AGP	0x3341	82855PM AGP
+product INTEL 82855PM_PM	0x3342	82855PM Power
 product INTEL 6321ESB_PCIE_5	0x3500	6321ESB PCIE
 product INTEL 6321ESB_PCIX	0x350c	6321ESB PCIE-PCIX
 product INTEL 6321ESB_PCIE_6	0x3510	6321ESB PCIE
@@ -2299,30 +2300,29 @@ product INTEL 6321ESB_PCIE_8	0x3514	6321ESB PCIE
 product INTEL 6321ESB_PCIE_9	0x3515	6321ESB PCIE
 product INTEL 6321ESB_PCIE_10	0x3518	6321ESB PCIE
 product INTEL 6321ESB_PCIE_11	0x3519	6321ESB PCIE
-product INTEL 82830MP_IO_1	0x3575	82830MP CPU-I/O-1
-product INTEL 82830MP_AGP	0x3576	82830MP CPU-AGP
-product INTEL 82830MP_IV	0x3577	82830MP Integrated Video
-product INTEL 82830MP_IO_2	0x3578	82830MP CPU-I/O-2
-product INTEL 82852GM_HPB	0x3580	82852GM Hub-PCI
-product INTEL 82852_AGP		0x3581	82852/82855 AGP
-product INTEL 82852GM_AGP	0x3582	82852GM AGP
-product INTEL 82852GM_MEM	0x3584	82852GM Memory
-product INTEL 82852GM_CFG	0x3585	82852GM Configuration
-product INTEL 82854_MCH		0x358c	82854 MCH
+product INTEL 82830M_HB		0x3575	82830M Host
+product INTEL 82830M_AGP	0x3576	82830M AGP
+product INTEL 82830M_IGD	0x3577	82830M Video
+product INTEL 82855GM_HB	0x3580	82855GM Host
+product INTEL 82855GME_AGP	0x3581	82855GME AGP
+product INTEL 82855GM_IGD	0x3582	82855GM Video
+product INTEL 82855GM_MEM	0x3584	82855GM Memory
+product INTEL 82855GM_CFG	0x3585	82855GM Config
+product INTEL 82854_HB		0x358c	82854 Host
 product INTEL 82854_IGD		0x358e	82854 Video
-product INTEL E7520_MCH		0x3590	E7520 MCH
-product INTEL E7520_MCH_ERR	0x3591	E7520 MCH ERR
-product INTEL E7320_MCH		0x3592	E7320 MCH
-product INTEL E7525_MCH_ERR	0x3593	E7525 MCH ERR
-product INTEL E7520_MCH_DMA	0x3594	E7520 MCH DMA
+product INTEL E7520_HB		0x3590	E7520 Host
+product INTEL E7520_MCH_ERR	0x3591	E7520 Error Reporting
+product INTEL E7320_HB		0x3592	E7320 Host
+product INTEL E7525_ERR		0x3593	E7525 Error Reporting
+product INTEL E7520_DMA		0x3594	E7520 DMA
 product INTEL MCH_PCIEA0	0x3595	MCH PCIE
 product INTEL MCH_PCIEA1	0x3596	MCH PCIE
 product INTEL MCH_PCIEB0	0x3597	MCH PCIE
 product INTEL MCH_PCIEB1	0x3598	MCH PCIE
 product INTEL MCH_PCIEC0	0x3599	MCH PCIE
 product INTEL MCH_PCIEC1	0x359a	MCH PCIE
-product INTEL E7525_MCH_CFG	0x359b	E7525 MCH Configuration
-product INTEL E7525_MCH		0x359e	E7525 MCH
+product INTEL E7525_CFG		0x359b	E7525 Config
+product INTEL E7525_HB		0x359e	E7525 Host
 product INTEL PRO_WL_2200BG	0x4220	PRO/Wireless 2200BG
 product INTEL PRO_WL_2225BG	0x4221	PRO/Wireless 2225BG
 product INTEL PRO_WL_3945ABG_1	0x4222	PRO/Wireless 3945ABG
@@ -2342,18 +2342,18 @@ product INTEL 82371AB_ISA	0x7110	82371AB PIIX4 ISA
 product INTEL 82371AB_IDE	0x7111	82371AB IDE
 product INTEL 82371AB_USB	0x7112	82371AB USB
 product INTEL 82371AB_PM	0x7113	82371AB Power
-product INTEL 82810_MCH		0x7120	82810
-product INTEL 82810_GC		0x7121	82810 Graphics
-product INTEL 82810_DC100_MCH	0x7122	82810-DC100
-product INTEL 82810_DC100_GC	0x7123	82810-DC100 Graphics
-product INTEL 82810E_MCH	0x7124	82810E
-product INTEL 82810E_GC		0x7125	82810E Graphics
+product INTEL 82810_HB		0x7120	82810 Host
+product INTEL 82810_IGD		0x7121	82810 Video
+product INTEL 82810_DC100_HB	0x7122	82810-DC100 Host
+product INTEL 82810_DC100_IGD	0x7123	82810-DC100 Video
+product INTEL 82810E_HB		0x7124	82810E Host
+product INTEL 82810E_IGD	0x7125	82810E Video
 product INTEL 82443LX		0x7180	82443LX AGP
 product INTEL 82443LX_AGP	0x7181	82443LX AGP
 product INTEL 82443BX		0x7190	82443BX AGP
 product INTEL 82443BX_AGP	0x7191	82443BX AGP
 product INTEL 82443BX_NOAGP	0x7192	82443BX
-product INTEL 82440MX		0x7194	82440MX Host
+product INTEL 82440MX_HB	0x7194	82440MX Host
 product INTEL 82440MX_ACA	0x7195	82440MX AC97
 product INTEL 82440MX_ACM	0x7196	82440MX Modem
 product INTEL 82440MX_ISA	0x7198	82440MX ISA