diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-11-28 16:43:58 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-11-28 16:43:58 +0000 |
| commit | c9e4f9c4cdbdf140d4de20021d07037f8d590bfd (patch) | |
| tree | 06c9f4f12c5567fde5d4cc1c6d896ed6bc7bb792 /sys/dev/isa/fd.c | |
| parent | e8819b77bfb041f813ffbf6e8c1ad7f334adc333 (diff) | |
i386 isa bounce buffers by hannken@eis.cs.tu-bs.de
Diffstat (limited to 'sys/dev/isa/fd.c')
| -rw-r--r-- | sys/dev/isa/fd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 5a46d1b3147..5ef1f655df8 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -915,8 +915,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 ? ISADMA_START_READ : ISADMA_START_WRITE); #endif outb(iobase + fdctl, type->rate); #ifdef FD_DEBUG @@ -966,7 +966,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: @@ -980,7 +980,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 ? @@ -994,9 +994,7 @@ loop: #ifdef NEWCONFIG at_dma_terminate(fdc->sc_drq); #else - read = bp->b_flags & B_READ; - 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, |