diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/powerpc/mac/if_gm.c | 13 | ||||
| -rw-r--r-- | sys/arch/powerpc/pci/macobio.c | 22 | ||||
| -rw-r--r-- | sys/arch/powerpc/pci/pchb.c | 3 |
3 files changed, 22 insertions, 16 deletions
diff --git a/sys/arch/powerpc/mac/if_gm.c b/sys/arch/powerpc/mac/if_gm.c index 62d274ad16f..406fcb1a293 100644 --- a/sys/arch/powerpc/mac/if_gm.c +++ b/sys/arch/powerpc/mac/if_gm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gm.c,v 1.14 2001/06/25 23:29:55 drahn Exp $ */ +/* $OpenBSD: if_gm.c,v 1.15 2001/06/26 19:06:17 maja Exp $ */ /* $NetBSD: if_gm.c,v 1.2 2000/03/04 11:17:00 tsubai Exp $ */ /*- @@ -148,11 +148,12 @@ gmac_match(parent, match, aux) { struct pci_attach_args *pa = aux; - if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_APPLE) && - (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_GMAC)) - { - return 1; - } + if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_APPLE) + switch (PCI_PRODUCT(pa->pa_id)) { + case PCI_PRODUCT_APPLE_GMAC: + case PCI_PRODUCT_APPLE_GMAC2: + return 1; + } return 0; } diff --git a/sys/arch/powerpc/pci/macobio.c b/sys/arch/powerpc/pci/macobio.c index 50e0cab64fc..609c1e8991f 100644 --- a/sys/arch/powerpc/pci/macobio.c +++ b/sys/arch/powerpc/pci/macobio.c @@ -74,11 +74,12 @@ macobio_match(parent, cf, aux) if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_APPLE) switch (PCI_PRODUCT(pa->pa_id)) { - case 0x02: /* gc */ - case 0x07: /* ohare */ - case 0x10: /* mac-io "Heathrow" */ - case 0x17: /* mac-io "Paddington" */ - case 0x22: /* mac-io "Keylargo" */ + case PCI_PRODUCT_APPLE_GC: + case PCI_PRODUCT_APPLE_OHARE: + case PCI_PRODUCT_APPLE_HEATHROW: + case PCI_PRODUCT_APPLE_PADDINGTON: + case PCI_PRODUCT_APPLE_KEYLARGO: + case PCI_PRODUCT_APPLE_PANGEA_MACIO: return 1; } @@ -108,18 +109,18 @@ macobio_attach(parent, self, aux) switch (PCI_PRODUCT(pa->pa_id)) { /* XXX should not use name */ - case 0x02: + case PCI_PRODUCT_APPLE_GC: node = OF_finddevice("/bandit/gc"); need_interrupt_controller = 1; break; - case 0x07: + case PCI_PRODUCT_APPLE_OHARE: node = OF_finddevice("/bandit/ohare"); need_interrupt_controller = 1; break; - case 0x10: /* heathrow */ - case 0x17: /* paddington */ + case PCI_PRODUCT_APPLE_HEATHROW: + case PCI_PRODUCT_APPLE_PADDINGTON: node = OF_finddevice("mac-io"); if (node == -1) node = OF_finddevice("/pci/mac-io"); @@ -131,7 +132,8 @@ macobio_attach(parent, self, aux) 4); } break; - case 0x22: /* keylargo */ + case PCI_PRODUCT_APPLE_KEYLARGO: + case PCI_PRODUCT_APPLE_PANGEA_MACIO: node = OF_finddevice("mac-io"); if (node == -1) node = OF_finddevice("/pci/mac-io"); diff --git a/sys/arch/powerpc/pci/pchb.c b/sys/arch/powerpc/pci/pchb.c index 6c38c96df06..97e72dde5d1 100644 --- a/sys/arch/powerpc/pci/pchb.c +++ b/sys/arch/powerpc/pci/pchb.c @@ -76,6 +76,9 @@ pchbmatch(parent, cf, aux) 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_PANGEA_AGP: return (1); } break; |