Support the Intel G35 which apparently works similarly to the 965.

Initial information, half the diff, and testing from Andrew Lutomirski,
thanks!

4 files changed, 11 insertions, 4 deletions

diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index f0d1fc96e38..76b8858d967 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.22 2008/06/05 09:45:14 brad Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.23 2008/06/25 18:54:06 oga Exp $	*/
 /*	$NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -182,6 +182,7 @@ pchbattach(struct device *parent, struct device *self, void *aux)
 		case PCI_PRODUCT_INTEL_82Q965_HB:
 		case PCI_PRODUCT_INTEL_82GM965_HB:
 		case PCI_PRODUCT_INTEL_82G33_HB:
+		case PCI_PRODUCT_INTEL_82G35_HB:
 			has_agp = 1;
 			break;
 
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 9ffec6a7cb1..102d1fea3ee 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.70 2008/06/05 09:45:14 brad Exp $ */
+/*	$OpenBSD: pchb.c,v 1.71 2008/06/25 18:54:06 oga Exp $ */
 /*	$NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $	*/
 
 /*
@@ -334,6 +334,7 @@ pchbattach(struct device *parent, struct device *self, void *aux)
 		case PCI_PRODUCT_INTEL_82Q965_HB:
 		case PCI_PRODUCT_INTEL_82GM965_HB:
 		case PCI_PRODUCT_INTEL_82G33_HB:
+		case PCI_PRODUCT_INTEL_82G35_HB:
 			has_agp = 1;
 			break;
 
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 15f31704d45..32eac48feab 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp.c,v 1.21 2008/05/06 19:19:02 oga Exp $ */
+/* $OpenBSD: agp.c,v 1.22 2008/06/25 18:54:06 oga Exp $ */
 /*-
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
@@ -91,6 +91,7 @@ const struct agp_product agp_products[] = {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_HB, agp_i810_attach },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_HB, agp_i810_attach },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_HB, agp_i810_attach },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_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 9bf30ef4e15..4a0af97dc35 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.37 2008/06/11 17:21:46 matthieu Exp $	*/
+/*	$OpenBSD: agp_i810.c,v 1.38 2008/06/25 18:54:06 oga Exp $	*/
 /*	$NetBSD: agp_i810.c,v 1.15 2003/01/31 00:07:39 thorpej Exp $	*/
 
 /*-
@@ -147,6 +147,8 @@ agp_i810_vgamatch(struct pci_attach_args *pa)
 	case PCI_PRODUCT_INTEL_82GME965_IGD_2:
 	case PCI_PRODUCT_INTEL_82G33_IGD_1:
 	case PCI_PRODUCT_INTEL_82G33_IGD_2:
+	case PCI_PRODUCT_INTEL_82G35_IGD_1:
+	case PCI_PRODUCT_INTEL_82G35_IGD_2:
 		return (1);
 	}
 
@@ -222,6 +224,8 @@ agp_i810_attach(struct agp_softc *sc, struct pci_attach_args *pa)
 	case PCI_PRODUCT_INTEL_82GM965_IGD_2:
 	case PCI_PRODUCT_INTEL_82GME965_IGD_1:
 	case PCI_PRODUCT_INTEL_82GME965_IGD_2:
+	case PCI_PRODUCT_INTEL_82G35_IGD_1:
+	case PCI_PRODUCT_INTEL_82G35_IGD_2:
 		isc->chiptype = CHIP_I965;
 		break;
 	case PCI_PRODUCT_INTEL_82G33_IGD_1: