diff options
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ami.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/com.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/dc.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/isp_openbsd.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 712e007e50f..4542d286d96 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.190 2008/10/28 11:53:18 marco Exp $ */ +/* $OpenBSD: ami.c,v 1.191 2009/01/11 16:54:59 blambert Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -978,7 +978,7 @@ ami_start_xs(struct ami_softc *sc, struct ami_ccb *ccb, struct scsi_xfer *xs) } /* XXX way wrong, this timeout needs to be set later */ - timeout_add(&xs->stimeout, 61 * hz); + timeout_add_sec(&xs->stimeout, 61); ami_start(sc, ccb); return (SUCCESSFULLY_QUEUED); diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index bc0da3fc5ec..1d965c9017d 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.130 2008/11/23 17:59:00 deraadt Exp $ */ +/* $OpenBSD: com.c,v 1.131 2009/01/11 16:54:59 blambert Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -1048,7 +1048,7 @@ comsoft(void *arg) if (ISSET(*ibufp, LSR_OE)) { sc->sc_overflows++; if (sc->sc_errors++ == 0) - timeout_add(&sc->sc_diag_tmo, 60 * hz); + timeout_add_sec(&sc->sc_diag_tmo, 60); } /* This is ugly, but fast. */ c |= lsrmap[(*ibufp++ & (LSR_BI|LSR_FE|LSR_PE)) >> 2]; diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index 61ab4a56285..c3e36634817 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.107 2008/11/28 02:44:17 brad Exp $ */ +/* $OpenBSD: dc.c,v 1.108 2009/01/11 16:54:59 blambert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2398,7 +2398,7 @@ dc_tick(void *xsc) if (sc->dc_flags & DC_21143_NWAY && !sc->dc_link) timeout_add(&sc->dc_tick_tmo, hz / 10); else - timeout_add(&sc->dc_tick_tmo, hz); + timeout_add_sec(&sc->dc_tick_tmo, 1); splx(s); } diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c index 8864a834ade..c744900b145 100644 --- a/sys/dev/ic/isp_openbsd.c +++ b/sys/dev/ic/isp_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_openbsd.c,v 1.33 2008/10/15 19:12:18 blambert Exp $ */ +/* $OpenBSD: isp_openbsd.c,v 1.34 2009/01/11 16:54:59 blambert Exp $ */ /* * Platform (OpenBSD) dependent common attachment code for QLogic adapters. * @@ -374,7 +374,7 @@ ispcmd(XS_T *xs) isp_prt(isp, ISP_LOGDEBUG1, "retrying later for %d.%d", XS_TGT(xs), XS_LUN(xs)); timeout_set(&xs->stimeout, isp_requeue, xs); - timeout_add(&xs->stimeout, hz); + timeout_add_sec(&xs->stimeout, 1); XS_CMD_S_TIMER(xs); break; case CMD_COMPLETE: |