diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-31 10:57:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-31 10:57:05 +0000 |
| commit | 045684ca6b1bf4feb2a1a582c4e18625ef5c9a05 (patch) | |
| tree | 6f56586b2833e8f5809013b73f459c551ae6f889 /sys/dev | |
| parent | 46277a53455b0c91b76acb88cba98659d5853e89 (diff) | |
fixes by hannken and deraadt
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/aha.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 54e86db1330..34443d22b77 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.21 1996/05/31 08:14:51 deraadt Exp $ */ +/* $OpenBSD: aha.c,v 1.22 1996/05/31 10:57:04 deraadt Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #define AHADIAG @@ -486,6 +486,8 @@ AGAIN: } untimeout(aha_timeout, ccb); + isadma_copyfrombuf((caddr_t)ccb, CCB_PHYS_SIZE, + 1, ccb->ccb_phys); aha_done(sc, ccb); next: @@ -766,6 +768,8 @@ aha_start_ccbs(sc) #endif /* Link ccb to mbo. */ + isadma_copytobuf((caddr_t)ccb, CCB_PHYS_SIZE, + 1, ccb->ccb_phys); ltophys(ccb->ccb_phys[0].addr, wmbo->ccb_addr); if (ccb->flags & CCB_ABORT) wmbo->cmd = AHA_MBO_ABORT; @@ -1277,7 +1281,6 @@ aha_scsi_cmd(xs) s = splbio(); aha_queue_ccb(sc, ccb); - splx(s); /* * Usually return SUCCESSFULLY QUEUED @@ -1300,6 +1303,7 @@ aha_scsi_cmd(xs) scsi_done(xs); return COMPLETE; } + splx(s); if ((flags & SCSI_POLL) == 0) return SUCCESSFULLY_QUEUED; @@ -1352,15 +1356,19 @@ aha_timeout(arg) void *arg; { struct aha_ccb *ccb = arg; - struct scsi_xfer *xs = ccb->xs; - struct scsi_link *sc_link = xs->sc_link; - struct aha_softc *sc = sc_link->adapter_softc; + struct scsi_xfer *xs; + struct scsi_link *sc_link; + struct aha_softc *sc; int s; sc_print_addr(sc_link); printf("timed out"); s = splbio(); + isadma_copyfrombuf((caddr_t)ccb, CCB_PHYS_SIZE, 1, ccb->ccb_phys); + xs = ccb->xs; + sc_link = xs->sc_link; + sc = sc_link->adapter_softc; #ifdef AHADIAG /* |