diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-06-25 15:28:00 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-06-25 15:28:00 +0000 |
| commit | 7165f46e5fe1fc1bf1f3afb4477acec73700becc (patch) | |
| tree | 9aa17c26ad4e1cfb2933b892567e2883d39ec487 /sys/dev/tc/asc.c | |
| parent | 97fa6d8648097fbaf375d71224aa13ecde27a416 (diff) | |
Convert to new timeouts; miod@ ok
Diffstat (limited to 'sys/dev/tc/asc.c')
| -rw-r--r-- | sys/dev/tc/asc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c index 328adf5e06a..a7baa8eb1aa 100644 --- a/sys/dev/tc/asc.c +++ b/sys/dev/tc/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.18 2001/05/11 07:28:26 miod Exp $ */ +/* $OpenBSD: asc.c,v 1.19 2001/06/25 15:27:59 aaron Exp $ */ /* $NetBSD: asc.c,v 1.46 1998/05/08 15:39:01 mhitch Exp $ */ /*- @@ -125,6 +125,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/timeout.h> #include <sys/dkstat.h> #include <sys/buf.h> #include <sys/conf.h> @@ -587,8 +588,8 @@ asc_start(scsicmd) * Kludge: use a 60 second timeout if data is being transferred, * otherwise use a 30 minute timeout. */ - timeout(asc_timeout, scsicmd, hz * (scsicmd->buflen == 0 ? - 1800 : 60)); + timeout_set(&asc->asc_timo, asc_timeout, scsicmd); + timeout_add(&asc->asc_timo, hz * (scsicmd->buflen == 0 ? 1800 : 60)); asc_startcmd(asc, sdp->sd_drive); splx(s); } @@ -1378,7 +1379,7 @@ asc_end(asc, status, ss, ir) scsicmd = asc->cmd[target]; asc->cmd[target] = (ScsiCmd *)0; state = &asc->st[target]; - untimeout(asc_timeout, scsicmd); + timeout_del(&asc->asc_timo); #ifdef DEBUG if (asc_debug > 1) { |