[src/netbsd-1-4]: src/sys/dev/pci Pull up revision 1.84 (via patch, requested...

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

details:   https://anonhg.NetBSD.org/src/rev/1c36976296e5
branches:  netbsd-1-4
changeset: 470853:1c36976296e5
user:      he <he%NetBSD.org@localhost>
date:      Mon Aug 14 14:19:33 2000 +0000

description:
Pull up revision 1.84 (via patch, requested by bouyer):
  Change PCIIDE_CMD0646U_UDMA to PCIIDE_CMD0646U_ENABLEUDMA
  for consistency with PCIIDE_AMD756_ENABLEDMA.

diffstat:

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

diffs (39 lines):

diff -r c046a025a7d4 -r 1c36976296e5 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Mon Aug 14 14:15:21 2000 +0000
+++ b/sys/dev/pci/pciide.c      Mon Aug 14 14:19:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.33.2.10 2000/08/14 14:15:21 he Exp $      */
+/*     $NetBSD: pciide.c,v 1.33.2.11 2000/08/14 14:19:33 he Exp $      */
 
 
 /*
@@ -118,6 +118,8 @@
 #include <dev/pci/pciide_opti_reg.h>
 #include <dev/pci/pciide_hpt_reg.h>
 
+#include "opt_pciide.h"
+
 #if BYTE_ORDER == BIG_ENDIAN
 #define htole16(x)      bswap16((u_int16_t)(x))
 #define htole32(x)      bswap32((u_int32_t)(x))
@@ -2209,7 +2211,7 @@
                         * with UDMA. Only enable it if we know what we're
                         * doing
                         */
-#ifdef PCIIDE_CMD0646U_UDMA
+#ifdef PCIIDE_CMD0646U_ENABLEUDMA
                                sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
                                sc->sc_wdcdev.UDMA_cap = 2;
 #endif
@@ -2244,7 +2246,10 @@
                        continue;
                cmd0643_9_setup_channel(&cp->wdc_channel);
        }
-       /* note - this also make sure we clear the irq disable and reset bits */
+       /*
+        * note - this also makes sure we clear the irq disable and reset
+        * bits
+        */
        pciide_pci_write(sc->sc_pc, sc->sc_tag, CMD_DMA_MODE, CMD_DMA_MULTIPLE);
        WDCDEBUG_PRINT(("cmd0643_9_chip_map: timings reg now 0x%x 0x%x\n",
            pci_conf_read(sc->sc_pc, sc->sc_tag, 0x54),