[src/trunk]: src/sys/dev/pci Support Ultra/100 on CMD 0649.

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

details:   https://anonhg.NetBSD.org/src/rev/254c8e71a274
branches:  trunk
changeset: 517599:254c8e71a274
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Nov 15 20:48:17 2001 +0000

description:
Support Ultra/100 on CMD 0649.

diffstat:

 sys/dev/pci/pciide.c         |  8 ++++++--
 sys/dev/pci/pciide_cmd_reg.h |  4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r fb26b6eb4ca4 -r 254c8e71a274 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Thu Nov 15 20:06:27 2001 +0000
+++ b/sys/dev/pci/pciide.c      Thu Nov 15 20:48:17 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.134 2001/11/13 07:48:48 lukem Exp $       */
+/*     $NetBSD: pciide.c,v 1.135 2001/11/15 20:48:17 bouyer Exp $      */
 
 
 /*
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.134 2001/11/13 07:48:48 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.135 2001/11/15 20:48:17 bouyer Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -2431,6 +2431,10 @@
                sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_IRQACK;
                switch (sc->sc_pp->ide_product) {
                case PCI_PRODUCT_CMDTECH_649:
+                       sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
+                       sc->sc_wdcdev.UDMA_cap = 5;
+                       sc->sc_wdcdev.irqack = cmd646_9_irqack;
+                       break;
                case PCI_PRODUCT_CMDTECH_648:
                        sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
                        sc->sc_wdcdev.UDMA_cap = 4;
diff -r fb26b6eb4ca4 -r 254c8e71a274 sys/dev/pci/pciide_cmd_reg.h
--- a/sys/dev/pci/pciide_cmd_reg.h      Thu Nov 15 20:06:27 2001 +0000
+++ b/sys/dev/pci/pciide_cmd_reg.h      Thu Nov 15 20:48:17 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_cmd_reg.h,v 1.10 2001/10/21 18:49:20 thorpej Exp $      */
+/*     $NetBSD: pciide_cmd_reg.h,v 1.11 2001/11/15 20:48:17 bouyer Exp $       */
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -98,7 +98,7 @@
 #define CMD_UDMATIM_TIM_MASK   0x3
 #define CMD_UDMATIM_TIM_OFF(drive) (4 + ((drive) * 2))
 static const int8_t cmd0646_9_tim_udma[] __attribute__((__unused__)) =
-    {0x03, 0x02, 0x01, 0x02, 0x01};
+    {0x03, 0x02, 0x01, 0x02, 0x01, 0x00};
 
 /*
  * timings values for the 0643/6/8/9