From 447ea046b5b4aba425b2879f683099c1cfa3713f Mon Sep 17 00:00:00 2001 From: Bret Lambert Date: Wed, 15 Oct 2008 19:12:21 +0000 Subject: Second pass of simple timeout_add -> timeout_add_sec conversions This should take care of the simpler ones (i.e., timeout values of integer multiples of hz). ok krw@, art@ --- sys/dev/ic/com.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/ic/com.c') diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 7e9ccbbdcce..0c5119f5edf 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.128 2008/06/08 13:55:06 kettenis Exp $ */ +/* $OpenBSD: com.c,v 1.129 2008/10/15 19:12:19 blambert Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -503,7 +503,7 @@ comclose(dev_t dev, int flag, int mode, struct proc *p) /* tty device is waiting for carrier; drop dtr then re-raise */ CLR(sc->sc_mcr, MCR_DTR | MCR_RTS); bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr); - timeout_add(&sc->sc_dtr_tmo, hz * 2); + timeout_add_sec(&sc->sc_dtr_tmo, 2); } else { /* no one else waiting; turn off the uart */ compwroff(sc); @@ -1161,7 +1161,7 @@ comintr(void *arg) if (p >= sc->sc_ibufend) { sc->sc_floods++; if (sc->sc_errors++ == 0) - timeout_add(&sc->sc_diag_tmo, 60 * hz); + timeout_add_sec(&sc->sc_diag_tmo, 60); } else { *p++ = data; *p++ = lsr; -- cgit v1.2.3