diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2001-05-11 07:28:27 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2001-05-11 07:28:27 +0000 |
| commit | 71dc779315000649a42c225acb6e416207ad5c5a (patch) | |
| tree | 9d50a09113f7560c6d099093e145d933fc860876 /sys/dev | |
| parent | 11fbf8de6f74b4707595940efca7da159a2ea67a (diff) | |
Revert previous untested change, until a fix is ready.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/tc/asc.c | 10 | ||||
| -rw-r--r-- | sys/dev/tc/ascvar.h | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c index 5f9a2a0bee4..328adf5e06a 100644 --- a/sys/dev/tc/asc.c +++ b/sys/dev/tc/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.17 2001/05/01 01:07:50 aaron Exp $ */ +/* $OpenBSD: asc.c,v 1.18 2001/05/11 07:28:26 miod Exp $ */ /* $NetBSD: asc.c,v 1.46 1998/05/08 15:39:01 mhitch Exp $ */ /*- @@ -125,7 +125,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/timeout.h> #include <sys/dkstat.h> #include <sys/buf.h> #include <sys/conf.h> @@ -524,8 +523,6 @@ ascattach(asc, bus_speed) /* Hack for old-sytle SCSI-device probe */ (void) pmax_add_scsi(&ascdriver, unit); - timeout_set(&asc->asc_timo, asc_timeout, scsicmd); - printf(": target %d\n", id); @@ -590,7 +587,8 @@ asc_start(scsicmd) * Kludge: use a 60 second timeout if data is being transferred, * otherwise use a 30 minute timeout. */ - timeout_add(&asc->asc_timo, hz * (scsicmd->buflen == 0 ? 1800 : 60)); + timeout(asc_timeout, scsicmd, hz * (scsicmd->buflen == 0 ? + 1800 : 60)); asc_startcmd(asc, sdp->sd_drive); splx(s); } @@ -1380,7 +1378,7 @@ asc_end(asc, status, ss, ir) scsicmd = asc->cmd[target]; asc->cmd[target] = (ScsiCmd *)0; state = &asc->st[target]; - timeout_del(&asc->asc_timo); + untimeout(asc_timeout, scsicmd); #ifdef DEBUG if (asc_debug > 1) { diff --git a/sys/dev/tc/ascvar.h b/sys/dev/tc/ascvar.h index 02327cac7a8..010f8902295 100644 --- a/sys/dev/tc/ascvar.h +++ b/sys/dev/tc/ascvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ascvar.h,v 1.5 2001/05/01 01:07:51 aaron Exp $ */ +/* $OpenBSD: ascvar.h,v 1.6 2001/05/11 07:28:26 miod Exp $ */ /* $NetBSD: ascvar.h,v 1.4 1997/11/28 18:23:40 mhitch Exp $ */ @@ -67,7 +67,6 @@ 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 |