diff options
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/dev/apci.c | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/dma.c | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/hd.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c index b470208a919..f15b54817fa 100644 --- a/sys/arch/hp300/dev/apci.c +++ b/sys/arch/hp300/dev/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.32 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: apci.c,v 1.33 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */ /*- @@ -373,7 +373,7 @@ apciopen(dev, flag, mode, p) if (error == 0) { /* clear errors, start timeout */ sc->sc_ferr = sc->sc_perr = sc->sc_oflow = sc->sc_toterr = 0; - timeout_add(&sc->sc_timeout, hz); + timeout_add_sec(&sc->sc_timeout, 1); } return (error); @@ -860,7 +860,7 @@ apcitimeout(arg) sc->sc_dev.dv_xname, ferr, perr, oflow, sc->sc_toterr); } - timeout_add(&sc->sc_timeout, hz); + timeout_add_sec(&sc->sc_timeout, 1); } /* diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c index 189dfc173ea..33a9551ba68 100644 --- a/sys/arch/hp300/dev/dma.c +++ b/sys/arch/hp300/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.19 2008/07/18 21:39:52 miod Exp $ */ +/* $OpenBSD: dma.c,v 1.20 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $ */ /* @@ -178,7 +178,7 @@ dmainit() #ifdef DEBUG /* make sure timeout is really not needed */ timeout_set(&sc->sc_timeout, dmatimeout, sc); - timeout_add(&sc->sc_timeout, 30 * hz); + timeout_add_sec(&sc->sc_timeout, 30); #endif printf("98620%c, 2 channels, %d bit DMA\n", @@ -567,6 +567,6 @@ dmatimeout(void *arg) } splx(s); } - timeout_add(&sc->sc_timeout, 30 * hz); + timeout_add_sec(&sc->sc_timeout, 30); } #endif diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 389d21d4d25..e5e2e2f01ee 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.53 2007/06/21 20:23:07 miod Exp $ */ +/* $OpenBSD: hd.c,v 1.54 2008/10/15 19:12:20 blambert Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -1036,7 +1036,7 @@ hderror(unit) rs->sc_stats.hdtimeouts++; #endif hpibfree(rs->sc_dev.dv_parent, &rs->sc_hq); - timeout_add(&rs->sc_timeout, hdtimo * hz); + timeout_add_sec(&rs->sc_timeout, hdtimo); return(0); } /* |