Clean up Intel host bridge PCI IDs.

ok deraadt@

3 files changed, 67 insertions, 67 deletions

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;