[src/netbsd-1-5]: src/sys/dev/pci Pull up 1.87->1.88, approved by thorpej:

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

details:   https://anonhg.NetBSD.org/src/rev/02dde4b0dd90
branches:  netbsd-1-5
changeset: 489671:02dde4b0dd90
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Oct 04 17:07:44 2000 +0000

description:
Pull up 1.87->1.88, approved by thorpej:
only VT82C586A rev >= 6 supports Ultra-DMA. From OpenBSD.

diffstat:

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

diffs (27 lines):

diff -r 420b10b17719 -r 02dde4b0dd90 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Wed Oct 04 16:44:05 2000 +0000
+++ b/sys/dev/pci/pciide.c      Wed Oct 04 17:07:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.68.2.13 2000/08/22 02:19:32 enami Exp $   */
+/*     $NetBSD: pciide.c,v 1.68.2.14 2000/10/04 17:07:44 bouyer Exp $  */
 
 
 /*
@@ -1884,6 +1884,7 @@
 {
        struct pciide_channel *cp;
        pcireg_t interface = PCI_INTERFACE(pa->pa_class);
+       int rev = PCI_REVISION(pa->pa_class);
        int channel;
        u_int32_t ideconf;
        bus_size_t cmdsize, ctlsize;
@@ -1899,7 +1900,8 @@
        if (sc->sc_dma_ok) {
                sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_IRQACK;
                sc->sc_wdcdev.irqack = pciide_irqack;
-               if (sc->sc_pp->ide_product == PCI_PRODUCT_VIATECH_VT82C586A_IDE)
+               if (sc->sc_pp->ide_product == PCI_PRODUCT_VIATECH_VT82C586A_IDE
+                   && rev >= 6)
                        sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
        }
        sc->sc_wdcdev.PIO_cap = 4;