diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-29 07:10:15 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-29 07:10:15 +0000 |
| commit | 0f7a8828201d693fbd8bc55b66e421b3e72745ad (patch) | |
| tree | 7cc7684f8f6b828531934dd2343ca040c0155afd /sys/dev | |
| parent | 487804de4518ceeef0cfa35f0b0318db46d64f23 (diff) | |
new timeouts
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/uha_isa.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c index 1ef1ce52078..4f91d1957d6 100644 --- a/sys/dev/isa/uha_isa.c +++ b/sys/dev/isa/uha_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uha_isa.c,v 1.3 1998/01/18 18:58:39 niklas Exp $ */ +/* $OpenBSD: uha_isa.c,v 1.4 2001/01/29 07:10:14 mickey Exp $ */ /* $NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $ */ /* @@ -268,8 +268,10 @@ u14_start_mbox(sc, mscp) else bus_space_write_1(iot, ioh, U14_LINT, U14_OGMFULL); - if ((mscp->xs->flags & SCSI_POLL) == 0) - timeout(uha_timeout, mscp, (mscp->timeout * hz) / 1000); + if ((mscp->xs->flags & SCSI_POLL) == 0) { + timeout_set(&mscp->xs->stimeout, uha_timeout, mscp); + timeout_add(&mscp->xs->stimeout, (mscp->timeout * hz) / 1000); + } } /* @@ -346,7 +348,7 @@ u14_intr(arg) continue; /* whatever it was, it'll timeout */ } - untimeout(uha_timeout, mscp); + timeout_del(&mscp->xs->stimeout); uha_done(sc, mscp); if ((bus_space_read_1(iot, ioh, U14_SINT) & U14_SDIP) == 0) |