diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-18 18:48:42 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-18 18:48:42 +0000 |
| commit | e48ef09d84ca7e1fb62143e3ee21e13dab2730ed (patch) | |
| tree | ae64f08650e3a3d3908d6dd8cec25c0f60ae9bdb /sys/dev/isa | |
| parent | a88291e16ca40034b8ef95b1b71d1d5736a9dbf2 (diff) | |
move to current OpenBSD isadma API
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/fd.c | 13 | ||||
| -rw-r--r-- | sys/dev/isa/wdc.c | 15 | ||||
| -rw-r--r-- | sys/dev/isa/wds.c | 4 |
3 files changed, 14 insertions, 18 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 770ed4cb5bd..9f432b2a704 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.36 1997/11/12 07:33:10 deraadt Exp $ */ +/* $OpenBSD: fd.c,v 1.37 1998/01/18 18:48:41 niklas Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -698,8 +698,8 @@ loop: at_dma(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, fdc->sc_drq); #else - isa_dmastart(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, - fdc->sc_drq); + isadma_start(bp->b_data + fd->sc_skip, fd->sc_nbytes, + fdc->sc_drq, read); #endif bus_space_write_1(iot, ioh, fdctl, type->rate); #ifdef FD_DEBUG @@ -768,7 +768,7 @@ loop: #ifdef NEWCONFIG at_dma_abort(fdc->sc_drq); #else - isa_dmaabort(fdc->sc_drq); + isadma_abort(fdc->sc_drq); #endif case SEEKTIMEDOUT: case RECALTIMEDOUT: @@ -785,7 +785,7 @@ loop: #ifdef NEWCONFIG at_dma_abort(fdc->sc_drq); #else - isa_dmaabort(fdc->sc_drq); + isadma_abort(fdc->sc_drq); #endif #ifdef FD_DEBUG fdcstatus(&fd->sc_dev, 7, bp->b_flags & B_READ ? @@ -800,8 +800,7 @@ loop: at_dma_terminate(fdc->sc_drq); #else read = bp->b_flags & B_READ ? DMAMODE_READ : DMAMODE_WRITE; - isa_dmadone(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, - fdc->sc_drq); + isadma_done(fdc->sc_drq); #endif if (fdc->sc_errors) { diskerr(bp, "fd", "soft error", LOG_PRINTF, diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c index d6487ba0cc4..e511bf20f33 100644 --- a/sys/dev/isa/wdc.c +++ b/sys/dev/isa/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.25 1997/12/10 23:02:01 rees Exp $ */ +/* $OpenBSD: wdc.c,v 1.26 1998/01/18 18:48:40 niklas Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* @@ -538,10 +538,10 @@ wdc_ata_start(wdc, xfer) * Start the DMA channel and bounce the buffer if * necessary. */ - isa_dmastart(xfer->c_flags & B_READ ? - DMAMODE_READ : DMAMODE_WRITE, - xfer->databuf + xfer->c_skip, - xfer->c_nbytes, wdc->sc_drq); + isadma_start(xfer->databuf + xfer->c_skip, + xfer->c_nbytes, wdc->sc_drq, + xfer->c_flags & B_READ ? + DMAMODE_READ : DMAMODE_WRITE); break; #endif @@ -641,10 +641,7 @@ wdc_ata_intr(wdc, xfer) #if NISADMA > 0 /* Turn off the DMA channel and unbounce the buffer. */ if (d_link->sc_mode == WDM_DMA) - isa_dmadone(xfer->c_flags & B_READ ? - DMAMODE_READ : DMAMODE_WRITE, - xfer->databuf + xfer->c_skip, xfer->c_nbytes, - wdc->sc_drq); + isadma_done(wdc->sc_drq); #endif /* Have we an error? */ diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index a6218c1a618..71725b52a84 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wds.c,v 1.12 1997/07/07 17:02:07 niklas Exp $ */ +/* $OpenBSD: wds.c,v 1.13 1998/01/18 18:48:40 niklas Exp $ */ /* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */ #undef WDSDIAG @@ -290,7 +290,7 @@ wdsattach(parent, self, aux) wds_init(sc); if (sc->sc_drq != DRQUNK) - isa_dmacascade(sc->sc_drq); + isadma_cascade(sc->sc_drq); TAILQ_INIT(&sc->sc_free_scb); TAILQ_INIT(&sc->sc_waiting_scb); |