[src/trunk]: src/sys/dev/isa The DMA support here never worked, so yank it out.

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

details:   https://anonhg.NetBSD.org/src/rev/4fea4d4727a3
branches:  trunk
changeset: 543772:4fea4d4727a3
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Mon Mar 03 22:07:21 2003 +0000

description:
The DMA support here never worked, so yank it out.

diffstat:

 sys/dev/isa/files.isa |   4 ++--
 sys/dev/isa/wdc_isa.c |  10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (78 lines):

diff -r 4944f88860e0 -r 4fea4d4727a3 sys/dev/isa/files.isa
--- a/sys/dev/isa/files.isa     Mon Mar 03 21:25:09 2003 +0000
+++ b/sys/dev/isa/files.isa     Mon Mar 03 22:07:21 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.isa,v 1.127 2002/10/05 15:16:13 tsutsui Exp $
+#      $NetBSD: files.isa,v 1.128 2003/03/03 22:07:21 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -146,7 +146,7 @@
 attach scd at isa
 file   dev/isa/scd.c                   scd                     needs-flag
 
-attach wdc at isa with wdc_isa: isadma
+attach wdc at isa with wdc_isa
 file   dev/isa/wdc_isa.c               wdc_isa
 
 # Wangtek- and Archive-compatible tape controller boards
diff -r 4944f88860e0 -r 4fea4d4727a3 sys/dev/isa/wdc_isa.c
--- a/sys/dev/isa/wdc_isa.c     Mon Mar 03 21:25:09 2003 +0000
+++ b/sys/dev/isa/wdc_isa.c     Mon Mar 03 22:07:21 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_isa.c,v 1.28 2002/10/02 03:10:50 thorpej Exp $ */
+/*     $NetBSD: wdc_isa.c,v 1.29 2003/03/03 22:07:21 mycroft Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.28 2002/10/02 03:10:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.29 2003/03/03 22:07:21 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,10 +78,12 @@
 CFATTACH_DECL(wdc_isa, sizeof(struct wdc_isa_softc),
     wdc_isa_probe, wdc_isa_attach, NULL, NULL);
 
+#if 0
 static void    wdc_isa_dma_setup __P((struct wdc_isa_softc *));
 static int     wdc_isa_dma_init __P((void*, int, int, void *, size_t, int));
 static void    wdc_isa_dma_start __P((void*, int, int));
 static int     wdc_isa_dma_finish __P((void*, int, int, int));
+#endif
 
 int
 wdc_isa_probe(parent, match, aux)
@@ -165,6 +167,7 @@
        sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
            IST_EDGE, IPL_BIO, wdcintr, &sc->wdc_channel);
 
+#if 0
        if (ia->ia_ndrq > 0 && ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT) {
                sc->sc_drq = ia->ia_drq[0].ir_drq;
 
@@ -175,6 +178,7 @@
                sc->sc_wdcdev.dma_finish = wdc_isa_dma_finish;
                wdc_isa_dma_setup(sc);
        }
+#endif
        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;
@@ -201,6 +205,7 @@
        wdcattach(&sc->wdc_channel);
 }
 
+#if 0
 static void
 wdc_isa_dma_setup(sc)
        struct wdc_isa_softc *sc;
@@ -256,3 +261,4 @@
        isa_dmadone(sc->sc_ic, sc->sc_drq);
        return 0;
 }
+#endif