[src/trunk]: src/sys/dev/pci PCIIDE_CMD0646U_UDMA->PCIIDE_CMD0646U_ENABLEUDMA...

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

details:   https://anonhg.NetBSD.org/src/rev/311749700af1
branches:  trunk
changeset: 495671:311749700af1
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Aug 02 21:49:09 2000 +0000

description:
PCIIDE_CMD0646U_UDMA->PCIIDE_CMD0646U_ENABLEUDMA for consistency with
    PCIIDE_AMD756_ENABLEDMA
defopt PCIIDE_CMD0646U_ENABLEUDMA, PCIIDE_AMD756_ENABLEDMA,
    PCIIDE_CMD064x_DISABLE
Fix a typo pointed out by John Hawkinson

diffstat:

 sys/dev/pci/files.pci |   5 ++++-
 sys/dev/pci/pciide.c  |  11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r 8a30d8ba728a -r 311749700af1 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Wed Aug 02 21:00:31 2000 +0000
+++ b/sys/dev/pci/files.pci     Wed Aug 02 21:49:09 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.100 2000/07/25 23:18:44 jeffs Exp $
+#      $NetBSD: files.pci,v 1.101 2000/08/02 21:49:10 bouyer Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -11,6 +11,9 @@
                        BKTR_USE_PLL BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET
                        BKTR_430_FX_MODE BKTR_SIS_VIA_MODE
 
+defopt opt_pciide.h    PCIIDE_CMD064x_DISABLE PCIIDE_AMD756_ENABLEDMA
+                       PCIIDE_CMD0646U_ENABLEUDMA
+
 device pci {[dev = -1], [function = -1]}
 attach pci at pcibus
 file   dev/pci/pci.c                   pci needs-flag
diff -r 8a30d8ba728a -r 311749700af1 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Wed Aug 02 21:00:31 2000 +0000
+++ b/sys/dev/pci/pciide.c      Wed Aug 02 21:49:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.83 2000/08/02 20:23:45 bouyer Exp $       */
+/*     $NetBSD: pciide.c,v 1.84 2000/08/02 21:49:09 bouyer Exp $       */
 
 
 /*
@@ -115,6 +115,8 @@
 #include <dev/pci/pciide_hpt_reg.h>
 #include <dev/pci/cy82c693var.h>
 
+#include "opt_pciide.h"
+
 /* inlines for reading/writing 8-bit PCI registers */
 static __inline u_int8_t pciide_pci_read __P((pci_chipset_tag_t, pcitag_t,
                                              int));
@@ -2207,7 +2209,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
@@ -2242,7 +2244,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),