[src/trunk]: src/sys/dev/pci Clean up revision stuff for the sis. Suggested b...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6f0d37e35ccf
branches:  trunk
changeset: 480703:6f0d37e35ccf
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Jan 18 13:58:07 2000 +0000

description:
Clean up revision stuff for the sis. Suggested by Chris Cappuccio.

diffstat:

 sys/dev/pci/pciide.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 8c269465f252 -r 6f0d37e35ccf sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Tue Jan 18 13:30:32 2000 +0000
+++ b/sys/dev/pci/pciide.c      Tue Jan 18 13:58:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.51 2000/01/16 21:31:28 bouyer Exp $       */
+/*     $NetBSD: pciide.c,v 1.52 2000/01/18 13:58:07 bouyer Exp $       */
 
 
 /*
@@ -2135,10 +2135,11 @@
 {
        struct pciide_channel *cp;
        int channel;
-       u_int32_t rev;
        u_int8_t sis_ctr0 = pciide_pci_read(sc->sc_pc, sc->sc_tag, SIS_CTRL0);
        pcireg_t interface = PCI_INTERFACE(pci_conf_read(sc->sc_pc,
                                    sc->sc_tag, PCI_CLASS_REG));
+       pcireg_t rev = PCI_REVISION(pci_conf_read(sc->sc_pc,
+                                   sc->sc_tag, PCI_CLASS_REG));
        bus_size_t cmdsize, ctlsize;
 
        if (pciide_chipen(sc, pa) == 0)
@@ -2147,8 +2148,6 @@
            sc->sc_wdcdev.sc_dev.dv_xname);
        pciide_mapreg_dma(sc, pa);
        printf("\n");
-       rev = pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_CLASS_REG) & \
-           PCI_REVISION_MASK;
        if (sc->sc_dma_ok) {
                sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA;
                if (rev >= 0xd0)