diff options
Diffstat (limited to 'sys/arch/sparc/dev')
| -rw-r--r-- | sys/arch/sparc/dev/be.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/fd.c | 10 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/z8530kbd.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/z8530tty.c | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c index 9cf5a694449..ed47a39d63a 100644 --- a/sys/arch/sparc/dev/be.c +++ b/sys/arch/sparc/dev/be.c @@ -1,4 +1,4 @@ -/* $OpenBSD: be.c,v 1.41 2008/10/02 20:21:13 brad Exp $ */ +/* $OpenBSD: be.c,v 1.42 2008/10/15 19:12:19 blambert Exp $ */ /* * Copyright (c) 1998 Theo de Raadt and Jason L. Wright. @@ -557,7 +557,7 @@ betick(vsc) br->lt_ctr = 0; bestart(ifp); splx(s); - timeout_add(&sc->sc_tick, hz); + timeout_add_sec(&sc->sc_tick, 1); } int @@ -749,7 +749,7 @@ beinit(sc) ifp->if_flags &= ~IFF_OACTIVE; splx(s); - timeout_add(&sc->sc_tick, hz); + timeout_add_sec(&sc->sc_tick, 1); bestart(ifp); } diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index 6f0cd599152..1cb6a5c2e34 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.62 2008/06/26 05:42:13 ray Exp $ */ +/* $OpenBSD: fd.c,v 1.63 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */ /*- @@ -811,7 +811,7 @@ fdfinish(fd, bp) biodone(bp); /* turn off motor 5s from now */ - timeout_add(&fd->fd_motor_off_to, 5 * hz); + timeout_add_sec(&fd->fd_motor_off_to, 5); fdc->sc_state = DEVIDLE; } @@ -1359,7 +1359,7 @@ loop: fd->sc_dk.dk_seek++; disk_busy(&fd->sc_dk); - timeout_add(&fdc->fdctimeout_to, 4 * hz); + timeout_add_sec(&fdc->fdctimeout_to, 4); /* specify command */ FDC_WRFIFO(fdc, NE7CMD_SPECIFY); @@ -1421,7 +1421,7 @@ loop: disk_busy(&fd->sc_dk); /* allow 3 seconds for operation */ - timeout_add(&fdc->fdctimeout_to, 3 * hz); + timeout_add_sec(&fdc->fdctimeout_to, 3); if (finfo != NULL) { /* formatting */ @@ -1604,7 +1604,7 @@ loop: fdc->sc_state = RECALWAIT; fdc->sc_itask = FDC_ITASK_SENSEI; fdc->sc_nstat = 0; - timeout_add(&fdc->fdctimeout_to, 5 * hz); + timeout_add_sec(&fdc->fdctimeout_to, 5); /* recalibrate function */ FDC_WRFIFO(fdc, NE7CMD_RECAL); FDC_WRFIFO(fdc, fd->sc_drive); diff --git a/sys/arch/sparc/dev/z8530kbd.c b/sys/arch/sparc/dev/z8530kbd.c index 5c1aff82061..0f275b93c75 100644 --- a/sys/arch/sparc/dev/z8530kbd.c +++ b/sys/arch/sparc/dev/z8530kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530kbd.c,v 1.9 2007/05/25 21:27:15 krw Exp $ */ +/* $OpenBSD: z8530kbd.c,v 1.10 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -949,7 +949,7 @@ zskbd_rxsoft(zst) if (cc == zskbd_rbuf_size) { zst->zst_floods++; if (zst->zst_errors++ == 0) - timeout_add(&zst->zst_diag_ch, 60 * hz); + timeout_add_sec(&zst->zst_diag_ch, 60); } while (cc) { @@ -959,7 +959,7 @@ zskbd_rxsoft(zst) if (ISSET(rr1, ZSRR1_DO)) { zst->zst_overflows++; if (zst->zst_errors++ == 0) - timeout_add(&zst->zst_diag_ch, 60 * hz); + timeout_add_sec(&zst->zst_diag_ch, 60); } if (ISSET(rr1, ZSRR1_FE)) SET(code, TTY_FE); diff --git a/sys/arch/sparc/dev/z8530tty.c b/sys/arch/sparc/dev/z8530tty.c index 638e423e169..83d7da7d24d 100644 --- a/sys/arch/sparc/dev/z8530tty.c +++ b/sys/arch/sparc/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.9 2008/03/01 17:56:42 kettenis Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.10 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */ /*- @@ -1463,7 +1463,7 @@ zstty_rxsoft(zst, tp) if (cc == zstty_rbuf_size) { zst->zst_floods++; if (zst->zst_errors++ == 0) - timeout_add(&zst->zst_diag_ch, 60 * hz); + timeout_add_sec(&zst->zst_diag_ch, 60); } /* If not yet open, drop the entire buffer content here */ @@ -1480,7 +1480,7 @@ zstty_rxsoft(zst, tp) if (ISSET(rr1, ZSRR1_DO)) { zst->zst_overflows++; if (zst->zst_errors++ == 0) - timeout_add(&zst->zst_diag_ch, 60 * hz); + timeout_add_sec(&zst->zst_diag_ch, 60); } if (ISSET(rr1, ZSRR1_FE)) SET(code, TTY_FE); |