diff options
| author | tsubai <tsubai@NetBSD.org> | 2001-06-17 19:54:47 +0000 |
|---|---|---|
| committer | tsubai <tsubai@NetBSD.org> | 2001-06-17 19:54:47 +0000 |
| commit | 1614d87d0e7dc7214e7d5dede2fe3cdacff9b080 (patch) | |
| tree | 2149802e807f8099eed6fea37c5c8a3993b2917c /sys | |
| parent | de98ab5b38f61a983e4cbe65123349e7cfee68a7 (diff) | |
Support the new iBook.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/dev/if_gm.c | 5 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/obio.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/pci/pchb.c | 11 |
3 files changed, 13 insertions, 7 deletions
diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c index d01f1c31216..7665359eb45 100644 --- a/sys/arch/macppc/dev/if_gm.c +++ b/sys/arch/macppc/dev/if_gm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gm.c,v 1.12 2001/04/24 11:04:11 tsubai Exp $ */ +/* $NetBSD: if_gm.c,v 1.13 2001/06/17 19:54:47 tsubai Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -132,7 +132,8 @@ 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) + (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_GMAC || + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_GMAC2)) return 1; return 0; diff --git a/sys/arch/macppc/dev/obio.c b/sys/arch/macppc/dev/obio.c index 48c4c3c7b5e..a97e1bc8097 100644 --- a/sys/arch/macppc/dev/obio.c +++ b/sys/arch/macppc/dev/obio.c @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.13 2001/03/02 20:36:00 tsubai Exp $ */ +/* $NetBSD: obio.c,v 1.14 2001/06/17 19:54:47 tsubai Exp $ */ /*- * Copyright (C) 1998 Internet Research Institute, Inc. @@ -73,6 +73,7 @@ obio_match(parent, cf, aux) case PCI_PRODUCT_APPLE_HEATHROW: case PCI_PRODUCT_APPLE_PADDINGTON: case PCI_PRODUCT_APPLE_KEYLARGO: + case PCI_PRODUCT_APPLE_PANGEA_MACIO: return 1; } @@ -109,6 +110,7 @@ obio_attach(parent, self, aux) case PCI_PRODUCT_APPLE_HEATHROW: case PCI_PRODUCT_APPLE_PADDINGTON: 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/macppc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c index ea5b0c87d95..e410c0574d6 100644 --- a/sys/arch/macppc/pci/pchb.c +++ b/sys/arch/macppc/pci/pchb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $ */ +/* $NetBSD: pchb.c,v 1.5 2001/06/17 19:54:47 tsubai Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -73,19 +73,22 @@ pchbmatch(parent, cf, aux) case PCI_PRODUCT_APPLE_UNINORTH1: case PCI_PRODUCT_APPLE_UNINORTH2: case PCI_PRODUCT_APPLE_UNINORTH_AGP: - return (1); + case PCI_PRODUCT_APPLE_PANGEA_PCI1: + case PCI_PRODUCT_APPLE_PANGEA_PCI2: + case PCI_PRODUCT_APPLE_PANGEA_AGP: + return 1; } break; case PCI_VENDOR_MOT: switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_MOT_MPC106: - return (1); + return 1; } break; } - return (0); + return 0; } void |
