On Wed, Sep 26, 2012 at 15:32, Brad Smith wrote: > Simplify the gem(4) variant detection code a bit. > > OK?
Wouldn't a switch be a nicer simplification? > > > Index: if_gem_pci.c > =================================================================== > RCS file: /home/cvs/src/sys/dev/pci/if_gem_pci.c,v > retrieving revision 1.31 > diff -u -p -r1.31 if_gem_pci.c > --- if_gem_pci.c 15 Oct 2009 17:54:56 -0000 1.31 > +++ if_gem_pci.c 6 Mar 2011 06:50:12 -0000 > @@ -231,18 +231,10 @@ gem_attach_pci(struct device *parent, st > 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_GMAC; > - else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_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_GMAC; > - else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_UNINORTHGMAC) > - sc->sc_variant = GEM_APPLE_GMAC; > - else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_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; > + else > + sc->sc_variant = GEM_APPLE_GMAC; > > #define PCI_GEM_BASEADDR 0x10 > if (pci_mapreg_map(pa, PCI_GEM_BASEADDR, type, 0,
