diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-04-10 07:17:58 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-04-10 07:17:58 +0000 |
| commit | f231d79833e7546c082f9cca2b70bc1e5eaa7f9f (patch) | |
| tree | 8e2d12da16079db22d324166fd4a78b771cb592b | |
| parent | f01fff235c120e12c99645c22dd73377309a1421 (diff) | |
recognize the Intrepid 2 GMAC
| -rw-r--r-- | sys/dev/ic/gemvar.h | 19 | ||||
| -rw-r--r-- | sys/dev/pci/if_gem_pci.c | 5 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h index 49a816955bd..9e07c9d4f30 100644 --- a/sys/dev/ic/gemvar.h +++ b/sys/dev/ic/gemvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gemvar.h,v 1.12 2006/02/05 00:25:06 brad Exp $ */ +/* $OpenBSD: gemvar.h,v 1.13 2006/04/10 07:17:57 brad Exp $ */ /* $NetBSD: gemvar.h,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -148,14 +148,15 @@ struct gem_softc { int sc_pci; /* XXXXX -- PCI buses are LE. */ u_int sc_variant; /* which GEM are we dealing with? */ -#define GEM_UNKNOWN 0 /* don't know */ -#define GEM_SUN_GEM 1 /* Sun GEM variant */ -#define GEM_SUN_ERI 2 /* Sun ERI variant */ -#define GEM_APPLE_K2_GMAC 3 /* Apple K2 GMAC variant */ -#define GEM_APPLE_PANGEA_GMAC 4 /* Apple Pangea GMAC variant */ -#define GEM_APPLE_SHASTA_GMAC 5 /* Apple Shasta GMAC variant */ -#define GEM_APPLE_UNINORTHGMAC 6 /* Apple UniNorth GMAC variant */ -#define GEM_APPLE_UNINORTH2GMAC 7 /* Apple UniNorth 2 GMAC variant */ +#define GEM_UNKNOWN 0 /* don't know */ +#define GEM_SUN_GEM 1 /* Sun GEM */ +#define GEM_SUN_ERI 2 /* Sun ERI */ +#define GEM_APPLE_INTREPID2_GMAC 3 /* Apple Intrepid 2 GMAC */ +#define GEM_APPLE_K2_GMAC 4 /* Apple K2 GMAC */ +#define GEM_APPLE_PANGEA_GMAC 5 /* Apple Pangea GMAC */ +#define GEM_APPLE_SHASTA_GMAC 6 /* Apple Shasta GMAC */ +#define GEM_APPLE_UNINORTHGMAC 7 /* Apple UniNorth GMAC */ +#define GEM_APPLE_UNINORTH2GMAC 8 /* Apple UniNorth 2 GMAC */ u_int sc_flags; /* */ #define GEM_GIGABIT 0x0001 /* has a gigabit PHY */ diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index a480caba4b5..b5ec4262f20 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_pci.c,v 1.21 2005/11/02 02:07:11 brad Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.22 2006/04/10 07:17:57 brad Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -96,6 +96,7 @@ struct cfattach gem_pci_ca = { const struct pci_matchid gem_pci_devices[] = { { PCI_VENDOR_SUN, PCI_PRODUCT_SUN_ERINETWORK }, { PCI_VENDOR_SUN, PCI_PRODUCT_SUN_GEMNETWORK }, + { PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_INTREPID2_GMAC }, { PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_K2_GMAC }, { PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PANGEA_GMAC }, { PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_SHASTA_GMAC }, @@ -146,6 +147,8 @@ gem_attach_pci(parent, self, aux) sc->sc_variant = GEM_SUN_GEM; else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_ERINETWORK) sc->sc_variant = GEM_SUN_ERI; + else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_INTREPID2_GMAC) + sc->sc_variant = GEM_APPLE_INTREPID2_GMAC; else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_K2_GMAC) sc->sc_variant = GEM_APPLE_K2_GMAC; else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_PANGEA_GMAC) |