[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.168 (requested by bouyer...

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

details:   https://anonhg.NetBSD.org/src/rev/f34356edc0d0
branches:  netbsd-1-6
changeset: 529224:f34356edc0d0
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 01 16:37:42 2002 +0000

description:
Pull up revision 1.168 (requested by bouyer in ticket #728):
Support Ultra/133 on promise controllers that can do it.

diffstat:

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

diffs (40 lines):

diff -r 37142f890ed9 -r f34356edc0d0 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Fri Nov 01 16:33:50 2002 +0000
+++ b/sys/dev/pci/pciide.c      Fri Nov 01 16:37:42 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.153.2.8 2002/11/01 16:33:33 tron Exp $    */
+/*     $NetBSD: pciide.c,v 1.153.2.9 2002/11/01 16:37:42 tron Exp $    */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.8 2002/11/01 16:33:33 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.9 2002/11/01 16:37:42 tron Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -3592,6 +3592,10 @@
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133 ||     \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2 ||  \
        (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2v2)
+#define PDC_IS_276(sc)                                                 \
+       ((sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133 ||    \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2 ||  \
+       (sc)->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA133TX2v2)
 
 void
 pdc202xx_chip_map(sc, pa)
@@ -3636,7 +3640,9 @@
        }
        sc->sc_wdcdev.PIO_cap = 4;
        sc->sc_wdcdev.DMA_cap = 2;
-       if (PDC_IS_265(sc))
+       if (PDC_IS_276(sc))
+               sc->sc_wdcdev.UDMA_cap = 6;
+       else if (PDC_IS_265(sc))
                sc->sc_wdcdev.UDMA_cap = 5;
        else if (PDC_IS_262(sc))
                sc->sc_wdcdev.UDMA_cap = 4;