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 | |
| parent | 97fa6d8648097fbaf375d71224aa13ecde27a416 (diff) | |
Convert to new timeouts; miod@ ok
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/tc/asc.c | 9 | ||||
| -rw-r--r-- | sys/dev/tc/asc_ioasic.c | 3 | ||||
| -rw-r--r-- | sys/dev/tc/asc_tc.c | 3 | ||||
| -rw-r--r-- | sys/dev/tc/ascvar.h | 3 |
4 files changed, 11 insertions, 7 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) { diff --git a/sys/dev/tc/asc_ioasic.c b/sys/dev/tc/asc_ioasic.c index 7ee81b0529d..fde58e9355f 100644 --- a/sys/dev/tc/asc_ioasic.c +++ b/sys/dev/tc/asc_ioasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_ioasic.c,v 1.4 1998/05/18 00:25:08 millert Exp $ */ +/* $OpenBSD: asc_ioasic.c,v 1.5 2001/06/25 15:27:59 aaron Exp $ */ /* $NetBSD: asc_ioasic.c,v 1.12 1998/01/12 09:51:30 thorpej Exp $ */ /* @@ -18,6 +18,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/timeout.h> #include <sys/device.h> #include <dev/tc/tcvar.h> #include <dev/tc/ioasicvar.h> diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c index abdf7ed6b6e..a47a6299eaf 100644 --- a/sys/dev/tc/asc_tc.c +++ b/sys/dev/tc/asc_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_tc.c,v 1.3 1998/05/18 00:25:09 millert Exp $ */ +/* $OpenBSD: asc_tc.c,v 1.4 2001/06/25 15:27:59 aaron Exp $ */ /* $NetBSD: asc_tc.c,v 1.8 1997/10/31 06:29:59 jonathan Exp $ */ /* @@ -17,6 +17,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/timeout.h> #include <sys/types.h> #include <sys/device.h> #include <dev/tc/tcvar.h> diff --git a/sys/dev/tc/ascvar.h b/sys/dev/tc/ascvar.h index 010f8902295..fac62d72ea3 100644 --- a/sys/dev/tc/ascvar.h +++ b/sys/dev/tc/ascvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ascvar.h,v 1.6 2001/05/11 07:28:26 miod Exp $ */ +/* $OpenBSD: ascvar.h,v 1.7 2001/06/25 15:27:59 aaron Exp $ */ /* $NetBSD: ascvar.h,v 1.4 1997/11/28 18:23:40 mhitch Exp $ */ @@ -67,6 +67,7 @@ struct asc_softc { int ccf; /* CCF, whatever that really is? */ int timeout_250; /* 250ms timeout */ int tb_ticks; /* 4ns. ticks/tb channel ticks */ + struct timeout asc_timo; #ifdef USE_NEW_SCSI struct scsi_link sc_link; /* scsipi link struct */ #endif |