diff options
| author |   kettenis <kettenis@openbsd.org> | 2007-04-19 19:00:01 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2007-04-19 19:00:01 +0000 |
| commit | d2cc2cb8ff52a32f377a5908d60f393022000aa1 (patch) | |
| tree | 2a029f933c912eb9c836f2113df016ee1800cdbf /sys/dev/pci/if_gem_pci.c | |
| parent | When doing pmap_collect, skip wired mappings when removing. (diff) | |
| download | wireguard-openbsd-d2cc2cb8ff52a32f377a5908d60f393022000aa1.tar.xz wireguard-openbsd-d2cc2cb8ff52a32f377a5908d60f393022000aa1.zip | |
Cleanup phy selection code, simplifying the code considerably. Attach only
one phy on Sun ERI; gets rid of the duplicate phy on the blade1k.
tested by many, ok drahn@
Diffstat (limited to 'sys/dev/pci/if_gem_pci.c')
| -rw-r--r-- | sys/dev/pci/if_gem_pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index 4484a8fe05c..d64d662f8ae 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.27 2006/12/21 22:13:36 jason Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.28 2007/04/19 19:00:01 kettenis Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -232,17 +232,17 @@ gem_attach_pci(struct device *parent, struct device *self, void *aux) 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; + sc->sc_variant = GEM_APPLE_GMAC; else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_PANGEA_GMAC) - sc->sc_variant = GEM_APPLE_PANGEA_GMAC; + sc->sc_variant = GEM_APPLE_GMAC; else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_SHASTA_GMAC) - sc->sc_variant = GEM_APPLE_SHASTA_GMAC; + sc->sc_variant = GEM_APPLE_GMAC; else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_UNINORTHGMAC) - sc->sc_variant = GEM_APPLE_UNINORTHGMAC; + sc->sc_variant = GEM_APPLE_GMAC; else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_UNINORTH2GMAC) - sc->sc_variant = GEM_APPLE_UNINORTH2GMAC; + sc->sc_variant = GEM_APPLE_GMAC; + else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_K2_GMAC) + sc->sc_variant = GEM_APPLE_K2_GMAC; #define PCI_GEM_BASEADDR 0x10 if (pci_mapreg_map(pa, PCI_GEM_BASEADDR, type, 0, |