diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
| commit | 169c29d1b708c51bbae3f546e0adfe0d433b5b7b (patch) | |
| tree | 15b32c155eb85259ca3be610962de5f8aa24b91c /sys/dev/isa/fd.c | |
| parent | 7aa5f12551d2fef2475152a3a5c9b9961e14b83a (diff) | |
Merging w/ NetBSD 021796.
speaker upgraded to the current.
some changes to the VM stuff (ie kern_thread.c added and so).
Diffstat (limited to 'sys/dev/isa/fd.c')
| -rw-r--r-- | sys/dev/isa/fd.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 78d8ff0c347..abd878fcc6b 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -308,7 +308,7 @@ fdcattach(parent, self, aux) isa_establish(&fdc->sc_id, &fdc->sc_dev); #endif fdc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, fdcintr, - fdc, fdc->sc_dev.dv_xname); + fdc); /* * The NVRAM info only tells us about the first two disks on the @@ -931,8 +931,8 @@ loop: at_dma(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, fdc->sc_drq); #else - isadma_start(bp->b_data + fd->sc_skip, fd->sc_nbytes, - fdc->sc_drq, read ? ISADMA_START_READ : ISADMA_START_WRITE); + isa_dmastart(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, + fdc->sc_drq); #endif outb(iobase + fdctl, type->rate); #ifdef FD_DEBUG @@ -987,7 +987,7 @@ loop: #ifdef NEWCONFIG at_dma_abort(fdc->sc_drq); #else - isadma_abort(fdc->sc_drq); + isa_dmaabort(fdc->sc_drq); #endif case SEEKTIMEDOUT: case RECALTIMEDOUT: @@ -1004,7 +1004,7 @@ loop: #ifdef NEWCONFIG at_dma_abort(fdc->sc_drq); #else - isadma_abort(fdc->sc_drq); + isa_dmaabort(fdc->sc_drq); #endif #ifdef FD_DEBUG fdcstatus(&fd->sc_dev, 7, bp->b_flags & B_READ ? @@ -1018,7 +1018,9 @@ loop: #ifdef NEWCONFIG at_dma_terminate(fdc->sc_drq); #else - isadma_done(fdc->sc_drq); + read = bp->b_flags & B_READ; + isa_dmadone(read, bp->b_data + fd->sc_skip, fd->sc_nbytes, + fdc->sc_drq); #endif if (fdc->sc_errors) { diskerr(bp, "fd", "soft error", LOG_PRINTF, |