diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1994-05-25 09:21:21 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1994-05-25 09:21:21 +0000 |
commit | 2469c867a164210ce96143517059f21db7f1fd17 (patch) | |
tree | 9179427ac860211c445df663fd2b86267366bfba /sys/i386/eisa | |
parent | cb0aba89af15a48e2655e898a503946ac4cb42ae (diff) | |
download | FreeBSD-src-2469c867a164210ce96143517059f21db7f1fd17.zip FreeBSD-src-2469c867a164210ce96143517059f21db7f1fd17.tar.gz |
The big 4.4BSD Lite to FreeBSD 2.0.0 (Development) patch.
Reviewed by: Rodney W. Grimes
Submitted by: John Dyson and David Greenman
Diffstat (limited to 'sys/i386/eisa')
-rw-r--r-- | sys/i386/eisa/aha1742.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 95c0aed..27bce5f 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -274,7 +274,7 @@ int ahb_attach(); int ahb_init __P((int unit)); int ahbintr(); int32 ahb_scsi_cmd(); -void ahb_timeout(caddr_t, int); +void ahb_timeout(caddr_t); void ahb_done(); struct ecb *cheat; void ahb_free_ecb(); @@ -993,7 +993,7 @@ ahb_scsi_cmd(xs) if (!(flags & SCSI_NOMASK)) { s = splbio(); ahb_send_immed(unit, xs->sc_link->target, AHB_TARG_RESET); - timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); + timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); splx(s); return (SUCCESSFULLY_QUEUED); } else { @@ -1122,7 +1122,7 @@ ahb_scsi_cmd(xs) if (!(flags & SCSI_NOMASK)) { s = splbio(); ahb_send_mbox(unit, OP_START_ECB, xs->sc_link->target, ecb); - timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); + timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); splx(s); SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n")); return (SUCCESSFULLY_QUEUED); @@ -1152,7 +1152,7 @@ ahb_scsi_cmd(xs) } void -ahb_timeout(caddr_t arg1, int arg2) +ahb_timeout(caddr_t arg1) { struct ecb * ecb = (struct ecb *)arg1; int unit; @@ -1199,7 +1199,7 @@ ahb_timeout(caddr_t arg1, int arg2) printf("\n"); ahb_send_mbox(unit, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb); /* 2 secs for the abort */ - timeout(ahb_timeout, (caddr_t)ecb, 2 * hz); + timeout((timeout_t)ahb_timeout, (caddr_t)ecb, 2 * hz); ecb->flags = ECB_ABORTED; } splx(s); |