diff options
| -rw-r--r-- | sys/dev/eisa/uha_eisa.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/uha.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/uha_isa.c | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c index d8df90a1d39..844a8d9fb0e 100644 --- a/sys/dev/eisa/uha_eisa.c +++ b/sys/dev/eisa/uha_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uha_eisa.c,v 1.2 1997/04/13 20:22:38 mickey Exp $ */ +/* $OpenBSD: uha_eisa.c,v 1.3 2001/02/03 07:29:29 mickey Exp $ */ /* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */ /* @@ -247,7 +247,7 @@ u24_start_mbox(sc, mscp) bus_space_write_1(iot, ioh, U24_LINT, U24_OGMFULL); if ((mscp->xs->flags & SCSI_POLL) == 0) - timeout(uha_timeout, mscp, (mscp->timeout * hz) / 1000); + timeout_add(&mscp->xs->stimeout, (mscp->timeout * hz) / 1000); } int @@ -315,7 +315,7 @@ u24_intr(arg) sc->sc_dev.dv_xname); 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, U24_SINT) & U24_SDIP) == 0) diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c index 7e7596e8718..420e65d362e 100644 --- a/sys/dev/ic/uha.c +++ b/sys/dev/ic/uha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uha.c,v 1.2 1997/04/13 20:10:29 mickey Exp $ */ +/* $OpenBSD: uha.c,v 1.3 2001/02/03 07:29:29 mickey Exp $ */ /* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */ #undef UHADEBUG @@ -381,6 +381,7 @@ uha_scsi_cmd(xs) } mscp->xs = xs; mscp->timeout = xs->timeout; + timeout_set(&xs->stimeout, uha_timeout, xs); /* * Put all the arguments for the xfer in the mscp diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c index 4f91d1957d6..6de42d23347 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.4 2001/01/29 07:10:14 mickey Exp $ */ +/* $OpenBSD: uha_isa.c,v 1.5 2001/02/03 07:29:29 mickey Exp $ */ /* $NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $ */ /* @@ -268,10 +268,8 @@ u14_start_mbox(sc, mscp) else bus_space_write_1(iot, ioh, U14_LINT, U14_OGMFULL); - if ((mscp->xs->flags & SCSI_POLL) == 0) { - timeout_set(&mscp->xs->stimeout, uha_timeout, mscp); + if ((mscp->xs->flags & SCSI_POLL) == 0) timeout_add(&mscp->xs->stimeout, (mscp->timeout * hz) / 1000); - } } /* |