Clean up Intel host bridge PCI IDs.

ok deraadt@

6 files changed, 90 insertions, 93 deletions

diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index 16f75d163cb..2e3f9252b48 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.17 2007/12/18 22:48:14 deraadt Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.18 2008/01/04 00:23:26 kettenis Exp $	*/
 /*	$NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -175,16 +175,16 @@ pchbattach(struct device *parent, struct device *self, void *aux)
 
 		/* AGP only */
 		case PCI_PRODUCT_INTEL_82915GM_HB:
-		case PCI_PRODUCT_INTEL_82945GM_MCH:
-		case PCI_PRODUCT_INTEL_82965GM_MCH:
-		case PCI_PRODUCT_INTEL_82965_MCH:
-		case PCI_PRODUCT_INTEL_82Q963_HB:
+		case PCI_PRODUCT_INTEL_82945GM_HB:
+		case PCI_PRODUCT_INTEL_82G965_HB:
+		case PCI_PRODUCT_INTEL_82Q965_HB:
+		case PCI_PRODUCT_INTEL_82GM965_HB:
 			has_agp = 1;
 			break;
 
 		/* AGP + RNG */
 		case PCI_PRODUCT_INTEL_82915G_HB:
-		case PCI_PRODUCT_INTEL_82945GP_MCH:
+		case PCI_PRODUCT_INTEL_82945G_HB:
 			has_agp = 1;
 			/* FALLTHROUGH */
 
diff --git a/sys/arch/i386/pci/ichpcib.c b/sys/arch/i386/pci/ichpcib.c
index 997dbda8366..2fae05cb879 100644
--- a/sys/arch/i386/pci/ichpcib.c
+++ b/sys/arch/i386/pci/ichpcib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ichpcib.c,v 1.22 2007/11/28 17:05:09 tedu Exp $	*/
+/*	$OpenBSD: ichpcib.c,v 1.23 2008/01/04 00:23:25 kettenis Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -239,7 +239,7 @@ ichss_present(struct pci_attach_args *pa)
 			br_id = pci_conf_read(pa->pa_pc, br_tag, PCI_ID_REG);
 			br_class = pci_conf_read(pa->pa_pc, br_tag, PCI_CLASS_REG);
 
-			if (PCI_PRODUCT(br_id) == PCI_PRODUCT_INTEL_82815_FULL_HUB &&
+			if (PCI_PRODUCT(br_id) == PCI_PRODUCT_INTEL_82815_HB &&
 			    PCI_REVISION(br_class) < 5) {
 				ret = 0;
 			}
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 6f9c44ccec1..759bd9c2953 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.65 2007/12/18 22:56:45 kettenis Exp $ */
+/*	$OpenBSD: pchb.c,v 1.66 2008/01/04 00:23:25 kettenis Exp $ */
 /*	$NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $	*/
 
 /*
@@ -321,37 +321,34 @@ pchbattach(struct device *parent, struct device *self, void *aux)
 
 		/* AGP only */
 #ifdef __i386__
-		case PCI_PRODUCT_INTEL_82830MP_IO_1:
-		case PCI_PRODUCT_INTEL_82845G:
-		case PCI_PRODUCT_INTEL_82852GM_HPB:
-		case PCI_PRODUCT_INTEL_82865_IO_1:
+		case PCI_PRODUCT_INTEL_82830M_HB:
+		case PCI_PRODUCT_INTEL_82845G_HB:
+		case PCI_PRODUCT_INTEL_82855GM_HB:
+		case PCI_PRODUCT_INTEL_82865G_HB:
 #endif /* __i386__ */
 		case PCI_PRODUCT_INTEL_82915GM_HB:
-		case PCI_PRODUCT_INTEL_82945GM_MCH:
-		case PCI_PRODUCT_INTEL_82965GM_MCH:
-		case PCI_PRODUCT_INTEL_82965_MCH:
-		case PCI_PRODUCT_INTEL_82Q963_HB:
+		case PCI_PRODUCT_INTEL_82945GM_HB:
+		case PCI_PRODUCT_INTEL_82G965_HB:
+		case PCI_PRODUCT_INTEL_82Q965_HB:
+		case PCI_PRODUCT_INTEL_82GM965_HB:
 			has_agp = 1;
 			break;
 
 		/* AGP + RNG */
 #ifdef __i386__
-		case PCI_PRODUCT_INTEL_82810E_MCH:
-		case PCI_PRODUCT_INTEL_82810_DC100_MCH:
-		case PCI_PRODUCT_INTEL_82810_MCH:
-		case PCI_PRODUCT_INTEL_82815_FULL_HUB:
+		case PCI_PRODUCT_INTEL_82810_HB:
+		case PCI_PRODUCT_INTEL_82810_DC100_HB:
+		case PCI_PRODUCT_INTEL_82810E_HB:
+		case PCI_PRODUCT_INTEL_82815_HB:
 #endif /* __i386__ */
 		case PCI_PRODUCT_INTEL_82915G_HB:
-		case PCI_PRODUCT_INTEL_82945GP_MCH:
+		case PCI_PRODUCT_INTEL_82945G_HB:
 			has_agp = 1;
 			/* FALLTHROUGH */
 
 		/* RNG only */
 #ifdef __i386__
-		case PCI_PRODUCT_INTEL_82815_DC100_HUB:
-		case PCI_PRODUCT_INTEL_82815_NOAGP_HUB:
-		case PCI_PRODUCT_INTEL_82815_NOGRAPH_HUB:
-		case PCI_PRODUCT_INTEL_82820_MCH:
+		case PCI_PRODUCT_INTEL_82820_HB:
 		case PCI_PRODUCT_INTEL_82840_HB:
 		case PCI_PRODUCT_INTEL_82850_HB:
 		case PCI_PRODUCT_INTEL_82860_HB:
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 4b2fc70976d..49bcbef2704 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp.c,v 1.15 2008/01/02 03:40:38 brad Exp $ */
+/* $OpenBSD: agp.c,v 1.16 2008/01/04 00:23:26 kettenis Exp $ */
 /*-
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
@@ -75,28 +75,21 @@ const struct agp_product agp_products[] = {
 	{ PCI_VENDOR_AMD, -1, agp_amd_attach },
 #endif
 #if NAGP_I810 > 0
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_MCH, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_MCH, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_MCH, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_FULL_HUB, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82840_HB, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_IO_1, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852GM_HPB, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_IO_1, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830M_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_HB, agp_i810_attach },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_HB, agp_i810_attach },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_HB, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GP_MCH, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_MCH, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_HB, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_MCH, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IV, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_IGD, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_IGD_1, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_IGD, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_IGD_1, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GM_MCH, agp_i810_attach },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GM_IGD_1, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_HB, agp_i810_attach },
 #endif 
 #if NAGP_INTEL > 0
 	{ PCI_VENDOR_INTEL, -1, agp_intel_attach },
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 1dd2b975ed0..8ca1535acf5 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_i810.c,v 1.31 2007/12/19 11:25:16 oga Exp $	*/
+/*	$OpenBSD: agp_i810.c,v 1.32 2008/01/04 00:23:26 kettenis Exp $	*/
 /*	$NetBSD: agp_i810.c,v 1.15 2003/01/31 00:07:39 thorpej Exp $	*/
 
 /*-
@@ -121,25 +121,28 @@ agp_i810_vgamatch(struct pci_attach_args *pa)
 		return (0);
 
 	switch (PCI_PRODUCT(pa->pa_id)) {
-	case PCI_PRODUCT_INTEL_82810_GC:
-	case PCI_PRODUCT_INTEL_82810_DC100_GC:
-	case PCI_PRODUCT_INTEL_82810E_GC:
-	case PCI_PRODUCT_INTEL_82815_FULL_GRAPH:
-	case PCI_PRODUCT_INTEL_82830MP_IV:
+	case PCI_PRODUCT_INTEL_82810_IGD:
+	case PCI_PRODUCT_INTEL_82810_DC100_IGD:
+	case PCI_PRODUCT_INTEL_82810E_IGD:
+	case PCI_PRODUCT_INTEL_82815_IGD:
+	case PCI_PRODUCT_INTEL_82830M_IGD:
 	case PCI_PRODUCT_INTEL_82845G_IGD:
-	case PCI_PRODUCT_INTEL_82852GM_AGP:
-	case PCI_PRODUCT_INTEL_82865_IGD:
-	case PCI_PRODUCT_INTEL_82915G_IGD:
-	case PCI_PRODUCT_INTEL_82915GM_IGD:
+	case PCI_PRODUCT_INTEL_82855GM_IGD:
+	case PCI_PRODUCT_INTEL_82865G_IGD:
+	case PCI_PRODUCT_INTEL_82915G_IGD_1:
+	case PCI_PRODUCT_INTEL_82915G_IGD_2:
+	case PCI_PRODUCT_INTEL_82915GM_IGD_1:
+	case PCI_PRODUCT_INTEL_82915GM_IGD_2:
 	case PCI_PRODUCT_INTEL_82945G_IGD_1:
-	case PCI_PRODUCT_INTEL_82945GM_IGD:
-	case PCI_PRODUCT_INTEL_82945GM_IGD_S:
-	case PCI_PRODUCT_INTEL_82Q963_IGD_1:
-	case PCI_PRODUCT_INTEL_82Q963_IGD_2:
-	case PCI_PRODUCT_INTEL_82965_IGD_1:
-	case PCI_PRODUCT_INTEL_82965_IGD_2:
-	case PCI_PRODUCT_INTEL_82965GM_IGD_1:
-	case PCI_PRODUCT_INTEL_82965GM_IGD_2:
+	case PCI_PRODUCT_INTEL_82945G_IGD_2:
+	case PCI_PRODUCT_INTEL_82945GM_IGD_1:
+	case PCI_PRODUCT_INTEL_82945GM_IGD_2:
+	case PCI_PRODUCT_INTEL_82G965_IGD_1:
+	case PCI_PRODUCT_INTEL_82G965_IGD_2:
+	case PCI_PRODUCT_INTEL_82Q965_IGD_1:
+	case PCI_PRODUCT_INTEL_82Q965_IGD_2:
+	case PCI_PRODUCT_INTEL_82GM965_IGD_1:
+	case PCI_PRODUCT_INTEL_82GM965_IGD_2:
 		return (1);
 	}
 
@@ -167,10 +170,9 @@ agp_i810_attach(struct agp_softc *sc, struct pci_attach_args *pa)
 #if NAGP_INTEL > 0
 
 		switch (PCI_PRODUCT(pa->pa_id)) {
-		case PCI_PRODUCT_INTEL_82840_HB:
-		case PCI_PRODUCT_INTEL_82865_IO_1:
-		case PCI_PRODUCT_INTEL_82845G:
-		case PCI_PRODUCT_INTEL_82815_FULL_HUB:
+		case PCI_PRODUCT_INTEL_82815_HB:
+		case PCI_PRODUCT_INTEL_82845G_HB:
+		case PCI_PRODUCT_INTEL_82865G_HB:
 			return (agp_intel_attach(sc, pa));
 		}
 #endif
@@ -183,33 +185,36 @@ agp_i810_attach(struct agp_softc *sc, struct pci_attach_args *pa)
 	sc->sc_dmat = isc->vga_pa.pa_dmat;
 
 	switch (PCI_PRODUCT(isc->vga_pa.pa_id)) {
-	case PCI_PRODUCT_INTEL_82810_GC:
-	case PCI_PRODUCT_INTEL_82810_DC100_GC:
-	case PCI_PRODUCT_INTEL_82810E_GC:
-	case PCI_PRODUCT_INTEL_82815_FULL_GRAPH:
+	case PCI_PRODUCT_INTEL_82810_IGD:
+	case PCI_PRODUCT_INTEL_82810_DC100_IGD:
+	case PCI_PRODUCT_INTEL_82810E_IGD:
+	case PCI_PRODUCT_INTEL_82815_IGD:
 		isc->chiptype = CHIP_I810;
 		break;
-	case PCI_PRODUCT_INTEL_82830MP_IV:
+	case PCI_PRODUCT_INTEL_82830M_IGD:
 	case PCI_PRODUCT_INTEL_82845G_IGD:
 		isc->chiptype = CHIP_I830;
 		break;
-	case PCI_PRODUCT_INTEL_82852GM_AGP:
-	case PCI_PRODUCT_INTEL_82865_IGD:
+	case PCI_PRODUCT_INTEL_82855GM_IGD:
+	case PCI_PRODUCT_INTEL_82865G_IGD:
 		isc->chiptype = CHIP_I855;
 		break;
-	case PCI_PRODUCT_INTEL_82915G_IV:
-	case PCI_PRODUCT_INTEL_82915GM_IGD:
+	case PCI_PRODUCT_INTEL_82915G_IGD_1:
+	case PCI_PRODUCT_INTEL_82915G_IGD_2:
+	case PCI_PRODUCT_INTEL_82915GM_IGD_1:
+	case PCI_PRODUCT_INTEL_82915GM_IGD_2:
 	case PCI_PRODUCT_INTEL_82945G_IGD_1:
-	case PCI_PRODUCT_INTEL_82945GM_IGD:
-	case PCI_PRODUCT_INTEL_82945GM_IGD_S:
+	case PCI_PRODUCT_INTEL_82945G_IGD_2:
+	case PCI_PRODUCT_INTEL_82945GM_IGD_1:
+	case PCI_PRODUCT_INTEL_82945GM_IGD_2:
 		isc->chiptype = CHIP_I915;
 		break;
-	case PCI_PRODUCT_INTEL_82965_IGD_1:
-	case PCI_PRODUCT_INTEL_82965_IGD_2:
-	case PCI_PRODUCT_INTEL_82Q963_IGD_1:	
-	case PCI_PRODUCT_INTEL_82Q963_IGD_2:
-	case PCI_PRODUCT_INTEL_82965GM_IGD_1:
-	case PCI_PRODUCT_INTEL_82965GM_IGD_2:
+	case PCI_PRODUCT_INTEL_82Q965_IGD_1:
+	case PCI_PRODUCT_INTEL_82Q965_IGD_2:
+	case PCI_PRODUCT_INTEL_82G965_IGD_1:
+	case PCI_PRODUCT_INTEL_82G965_IGD_2:
+	case PCI_PRODUCT_INTEL_82GM965_IGD_1:
+	case PCI_PRODUCT_INTEL_82GM965_IGD_2:
 		isc->chiptype = CHIP_I965;
 		break;
 	}
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index dc120fc4443..5b2b2b03b0b 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_intel.c,v 1.9 2007/12/07 17:35:22 oga Exp $	*/
+/*	$OpenBSD: agp_intel.c,v 1.10 2008/01/04 00:23:26 kettenis Exp $	*/
 /*	$NetBSD: agp_intel.c,v 1.3 2001/09/15 00:25:00 thorpej Exp $	*/
 
 /*-
@@ -88,14 +88,15 @@ int
 agp_intel_vgamatch(struct pci_attach_args *pa)
 {
 	switch (PCI_PRODUCT(pa->pa_id)) {
-	case PCI_PRODUCT_INTEL_82855PE_AGP:
 	case PCI_PRODUCT_INTEL_82443LX_AGP:
 	case PCI_PRODUCT_INTEL_82443BX_AGP:
 	case PCI_PRODUCT_INTEL_82440BX_AGP:
-	case PCI_PRODUCT_INTEL_82850_AGP:	/* i850/i860 */
-	case PCI_PRODUCT_INTEL_82845_AGP:
 	case PCI_PRODUCT_INTEL_82840_AGP:
-	case PCI_PRODUCT_INTEL_82865_AGP:
+	case PCI_PRODUCT_INTEL_82845_AGP:
+	case PCI_PRODUCT_INTEL_82845G_AGP:
+	case PCI_PRODUCT_INTEL_82850_AGP:	/* i850/i860 */
+	case PCI_PRODUCT_INTEL_82855PM_AGP:
+	case PCI_PRODUCT_INTEL_82865G_AGP:
 	case PCI_PRODUCT_INTEL_82875P_AGP:
 		return (1);
 	}
@@ -142,14 +143,15 @@ agp_intel_attach(struct agp_softc *sc, struct pci_attach_args *pa)
 	case PCI_PRODUCT_INTEL_82840_AGP:
 		isc->chiptype = CHIP_I840;
 		break;
-	case PCI_PRODUCT_INTEL_82855PE_AGP:
 	case PCI_PRODUCT_INTEL_82845_AGP:
+	case PCI_PRODUCT_INTEL_82845G_AGP:
+	case PCI_PRODUCT_INTEL_82855PM_AGP:
 		isc->chiptype = CHIP_I845;
 		break;
 	case PCI_PRODUCT_INTEL_82850_AGP:
 		isc->chiptype = CHIP_I850;
 		break;
-	case PCI_PRODUCT_INTEL_82865_AGP:
+	case PCI_PRODUCT_INTEL_82865G_AGP:
 	case PCI_PRODUCT_INTEL_82875P_AGP:
 		isc->chiptype = CHIP_I865;
 		break;