On Wed, Sep 26, 2012 at 03:32:37PM -0400, Brad Smith wrote:
> Simplify the gem(4) variant detection code a bit.
>
> OK?
How about this..
Index: if_gem_pci.c
===================================================================
RCS file: /home/cvs/src/sys/dev/pci/if_gem_pci.c,v
retrieving revision 1.32
diff -u -p -r1.32 if_gem_pci.c
--- if_gem_pci.c 3 Apr 2011 15:36:02 -0000 1.32
+++ if_gem_pci.c 28 Sep 2012 05:16:00 -0000
@@ -227,22 +227,19 @@ gem_attach_pci(struct device *parent, st
sc->sc_pci = 1; /* XXXXX should all be done in bus_dma. */
- if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_GEMNETWORK)
+ switch (PCI_PRODUCT(pa->pa_id)) {
+ case PCI_PRODUCT_SUN_GEMNETWORK:
sc->sc_variant = GEM_SUN_GEM;
- else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_ERINETWORK)
+ break;
+ case 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)
+ break;
+ case PCI_PRODUCT_APPLE_K2_GMAC:
sc->sc_variant = GEM_APPLE_K2_GMAC;
+ break;
+ default:
+ sc->sc_variant = GEM_APPLE_GMAC;
+ }
#define PCI_GEM_BASEADDR 0x10
if (pci_mapreg_map(pa, PCI_GEM_BASEADDR, type, 0,
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
