diff options
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/dev/fd.c | 12 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/z8530kbd.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/z8530tty.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c index 452e0181d85..4cd37048dcd 100644 --- a/sys/arch/sparc64/dev/fd.c +++ b/sys/arch/sparc64/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.25 2008/06/26 05:42:13 ray Exp $ */ +/* $OpenBSD: fd.c,v 1.26 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */ /*- @@ -811,7 +811,7 @@ fdfinish(fd, bp) biodone(bp); /* turn off motor 5s from now */ - timeout_add(&fd->sc_motoroff_to, 5 * hz); + timeout_add_sec(&fd->sc_motoroff_to, 5); fdc->sc_state = DEVIDLE; } @@ -1373,7 +1373,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); @@ -1395,7 +1395,7 @@ loop: * followed by a recalibrate. */ disk_busy(&fd->sc_dk); - timeout_add(&fdc->fdctimeout_to, 4 * hz); + timeout_add_sec(&fdc->fdctimeout_to, 4); fd->sc_cylin = -1; fdc->sc_nstat = 0; fdc->sc_state = DSKCHGWAIT; @@ -1476,7 +1476,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 */ @@ -1661,7 +1661,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/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c index 3d4a5ddae06..5610131842a 100644 --- a/sys/arch/sparc64/dev/z8530kbd.c +++ b/sys/arch/sparc64/dev/z8530kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530kbd.c,v 1.19 2007/05/25 21:27:15 krw Exp $ */ +/* $OpenBSD: z8530kbd.c,v 1.20 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -932,7 +932,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) { @@ -942,7 +942,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/sparc64/dev/z8530tty.c b/sys/arch/sparc64/dev/z8530tty.c index 79622eac199..80a14247bcc 100644 --- a/sys/arch/sparc64/dev/z8530tty.c +++ b/sys/arch/sparc64/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.14 2008/01/18 21:35:54 kettenis Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.15 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -1424,7 +1424,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 */ @@ -1441,7 +1441,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); |