[src/netbsd-1-4]: src/sys/dev/isa pullup 1.14->1.15 (bouyer)

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

details:   https://anonhg.NetBSD.org/src/rev/09cf08254efe
branches:  netbsd-1-4
changeset: 468774:09cf08254efe
user:      perry <perry%NetBSD.org@localhost>
date:      Mon Jun 21 14:21:58 1999 +0000

description:
pullup 1.14->1.15 (bouyer)

diffstat:

 sys/dev/isa/wdc_isa.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 0f58ff18d21b -r 09cf08254efe sys/dev/isa/wdc_isa.c
--- a/sys/dev/isa/wdc_isa.c     Mon Jun 21 14:12:02 1999 +0000
+++ b/sys/dev/isa/wdc_isa.c     Mon Jun 21 14:21:58 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_isa.c,v 1.13.2.1 1999/04/12 09:14:31 bouyer Exp $ */
+/*     $NetBSD: wdc_isa.c,v 1.13.2.2 1999/06/21 14:21:58 perry Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -55,9 +55,8 @@
 #define        WDC_ISA_AUXREG_OFFSET   0x206
 #define        WDC_ISA_AUXREG_NPORTS   1 /* XXX "fdc" owns ports 0x3f7/0x377 */
 
-/*
- * XXX This code currently doesn't even try to allow 32-bit data port use.
- */
+/* options passed via the 'flags' config keyword */
+#define WDC_OPTIONS_32 0x01 /* try to use 32bit data I/O */
 
 struct wdc_isa_softc {
        struct  wdc_softc sc_wdcdev;
@@ -150,8 +149,9 @@
                sc->sc_wdcdev.dma_finish = wdc_isa_dma_finish;
                wdc_isa_dma_setup(sc);
        }
-       sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32 |
-           WDC_CAPABILITY_PREATA;
+       sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_PREATA;
+       if (sc->sc_wdcdev.sc_dev.dv_cfdata->cf_flags & WDC_OPTIONS_32)
+               sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32;
        sc->sc_wdcdev.PIO_cap = 0;
        sc->wdc_chanptr = &sc->wdc_channel;
        sc->sc_wdcdev.channels = &sc->wdc_chanptr;