a little bit more consistent naming scheme for Apple devices and add

missing K2 host bridge and AGP bridge PCI ids.

ok drahn@

3 files changed, 19 insertions, 15 deletions

diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index 1cfde6ec6d3..96a7427bf02 100644
--- a/sys/arch/macppc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macobio.c,v 1.12 2005/09/29 23:58:06 drahn Exp $	*/
+/*	$OpenBSD: macobio.c,v 1.13 2005/10/02 22:09:40 brad Exp $	*/
 /*	$NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $	*/
 
 /*-
@@ -87,7 +87,7 @@ macobio_match(struct device *parent, void *cf, void *aux)
 		case PCI_PRODUCT_APPLE_INTREPID:
 		case PCI_PRODUCT_APPLE_PANGEA_MACIO:
 		case PCI_PRODUCT_APPLE_SHASTA:
-		case PCI_PRODUCT_APPLE_K2:
+		case PCI_PRODUCT_APPLE_K2_MACIO:
 			return 1;
 		}
 
@@ -144,7 +144,7 @@ macobio_attach(struct device *parent, struct device *self, void *aux)
 	case PCI_PRODUCT_APPLE_INTREPID:
 	case PCI_PRODUCT_APPLE_PANGEA_MACIO:
 	case PCI_PRODUCT_APPLE_SHASTA:
-	case PCI_PRODUCT_APPLE_K2:
+	case PCI_PRODUCT_APPLE_K2_MACIO:
 		node = OF_finddevice("mac-io");
 		if (node == -1)
 			node = OF_finddevice("/pci/mac-io");
diff --git a/sys/arch/macppc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c
index 4455b7d1b91..f851e86aa38 100644
--- a/sys/arch/macppc/pci/pchb.c
+++ b/sys/arch/macppc/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.7 2005/09/29 20:11:13 kettenis Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.8 2005/10/02 22:09:40 brad Exp $	*/
 /*	$NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $	*/
 
 /*-
@@ -73,17 +73,19 @@ pchbmatch(struct device *parent, void *cf, void *aux)
 		case PCI_PRODUCT_APPLE_BANDIT:
 		case PCI_PRODUCT_APPLE_UNINORTH:
 		case PCI_PRODUCT_APPLE_UNINORTHETH:
-		case PCI_PRODUCT_APPLE_UNINORTHAGP:
-		case PCI_PRODUCT_APPLE_PANGEA_PCI1:
-		case PCI_PRODUCT_APPLE_PANGEA_PCI2:
+		case PCI_PRODUCT_APPLE_UNINORTH_AGP:
+		case PCI_PRODUCT_APPLE_PANGEA:
+		case PCI_PRODUCT_APPLE_PANGEA_PCI:
 		case PCI_PRODUCT_APPLE_PANGEA_AGP:
 		case PCI_PRODUCT_APPLE_UNINORTH2:
 		case PCI_PRODUCT_APPLE_UNINORTH2ETH:
-		case PCI_PRODUCT_APPLE_UNINORTH2AGP:
+		case PCI_PRODUCT_APPLE_UNINORTH2_AGP:
 		case PCI_PRODUCT_APPLE_UNINORTH_AGP3:
 		case PCI_PRODUCT_APPLE_UNINORTH5:
 		case PCI_PRODUCT_APPLE_UNINORTH6:
 		case PCI_PRODUCT_APPLE_SHASTA_HT:
+		case PCI_PRODUCT_APPLE_K2:
+		case PCI_PRODUCT_APPLE_K2_AGP:
 			return (1);
 		}
 		break;
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index b48149ca405..f555344b69b 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.927 2005/10/02 17:49:16 brad Exp $
+$OpenBSD: pcidevs,v 1.928 2005/10/02 22:09:39 brad Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -627,16 +627,16 @@ product APPLE UNINORTHETH	0x001e	Uni-N Eth
 product APPLE UNINORTH		0x001f	Uni-N
 product APPLE UNINORTHETH_FW	0x0018	Uni-N Eth Firewire
 product APPLE USB		0x0019	USB
-product APPLE UNINORTHAGP	0x0020	Uni-N AGP
+product APPLE UNINORTH_AGP	0x0020	Uni-N AGP
 product APPLE UNINORTHGMAC	0x0021	Uni-N GMAC
 product APPLE KEYLARGO		0x0022	Keylargo
 product APPLE PANGEA_GMAC	0x0024	Pangea GMAC
-product APPLE PANGEA_MACIO	0x0025	Pangea
+product APPLE PANGEA_MACIO	0x0025	Pangea Macio
 product APPLE PANGEA_OHCI	0x0026	Pangea USB
 product APPLE PANGEA_AGP	0x0027	Pangea AGP
-product APPLE PANGEA_PCI1	0x0028	Pangea PCI
-product APPLE PANGEA_PCI2	0x0029	Pangea PCI
-product APPLE UNINORTH2AGP	0x002d	Uni-N2 AGP
+product APPLE PANGEA		0x0028	Pangea
+product APPLE PANGEA_PCI	0x0029	Pangea PCI
+product APPLE UNINORTH2_AGP	0x002d	Uni-N2 AGP
 product APPLE UNINORTH2		0x002e	Uni-N2 Host
 product APPLE UNINORTH2ETH	0x002f	Uni-N2 Host
 product APPLE PANGEA_FW		0x0030	Pangea FireWire
@@ -650,7 +650,7 @@ product APPLE INTREPID_ATA	0x003b	Intrepid ATA
 product APPLE INTREPID		0x003e	Intrepid
 product APPLE INTREPID_OHCI	0x003f	Intrepid USB
 product APPLE K2_USB		0x0040	K2 USB
-product APPLE K2		0x0041	K2 Macio
+product APPLE K2_MACIO		0x0041	K2 Macio
 product APPLE K2_FW		0x0042	K2 Firewire
 product APPLE K2_ATA		0x0043	K2 ATA
 product APPLE U3_PPB1		0x0045	U3 PCI-PCI
@@ -668,7 +668,9 @@ product APPLE SHASTA_PCI1	0x0053	Shasta PCI
 product APPLE SHASTA_PCI2	0x0054	Shasta PCI
 product APPLE SHASTA_PCI3	0x0055	Shasta PCI
 product APPLE SHASTA_HT		0x0056  Shasta HyperTransport
+product APPLE K2		0x0057	K2
 product APPLE U3L_AGP		0x0058	U3L AGP
+product APPLE K2_AGP		0x0059	K2 AGP
 product APPLE BCM5701		0x1645	BCM5701
 
 /* Aralion products */