diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-10-02 22:09:41 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-10-02 22:09:41 +0000 |
| commit | f0bd1fe2be64b1a43cea979b14345c0ee06d0985 (patch) | |
| tree | 74a6425dbdc3eb46fa254132d900bb60732c6f30 /sys/arch/macppc | |
| parent | 34e6e7d06d3f634c61e7194d90981663acc2e1b1 (diff) | |
a little bit more consistent naming scheme for Apple devices and add
missing K2 host bridge and AGP bridge PCI ids.
ok drahn@
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/pci/macobio.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/pci/pchb.c | 12 |
2 files changed, 10 insertions, 8 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; |