diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-18 23:48:25 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-18 23:48:25 +0000 |
| commit | 76067dc38b59d22fa68139e9e0f6387455213fef (patch) | |
| tree | a07a31d71b761635bad242646844c4ead9cdbed8 /sys/dev/isa/wd.c | |
| parent | 740ab8eb879aa7a6c29f0a9c83c747b8ae4988c9 (diff) | |
NetBSD 960317 merge
Diffstat (limited to 'sys/dev/isa/wd.c')
| -rw-r--r-- | sys/dev/isa/wd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c index 916e1b12a40..96fedd9de01 100644 --- a/sys/dev/isa/wd.c +++ b/sys/dev/isa/wd.c @@ -1,4 +1,5 @@ -/* $NetBSD: wd.c,v 1.145 1996/01/08 21:21:56 mycroft Exp $ */ +/* $OpenBSD: wd.c,v 1.9 1996/04/18 23:47:51 niklas Exp $ */ +/* $NetBSD: wd.c,v 1.146 1996/03/01 04:08:51 mycroft Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -662,7 +663,8 @@ loop: WDCC_READDMA : WDCC_WRITEDMA; /* Start the DMA channel and bounce the buffer if necessary. */ - isa_dmastart(bp->b_flags & B_READ, + isa_dmastart( + bp->b_flags & B_READ ? DMAMODE_READ : DMAMODE_WRITE, bp->b_data + wd->sc_skip, wd->sc_nbytes, wdc->sc_drq); break; @@ -766,8 +768,8 @@ wdcintr(arg) /* Turn off the DMA channel and unbounce the buffer. */ if (wd->sc_mode == WDM_DMA) - isa_dmadone(bp->b_flags & B_READ, bp->b_data + wd->sc_skip, - wd->sc_nbytes, wdc->sc_drq); + isa_dmadone(bp->b_flags & B_READ ? DMAMODE_READ : DMAMODE_WRITE, + bp->b_data + wd->sc_skip, wd->sc_nbytes, wdc->sc_drq); /* Have we an error? */ if (wdc->sc_status & WDCS_ERR) { |