summaryrefslogtreecommitdiff
path: root/sys/dev/ic/com.c
diff options
context:
space:
mode:
authorBret Lambert <blambert@cvs.openbsd.org>2008-10-15 19:12:21 +0000
committerBret Lambert <blambert@cvs.openbsd.org>2008-10-15 19:12:21 +0000
commit447ea046b5b4aba425b2879f683099c1cfa3713f (patch)
tree8bca5f4e5c63f94a107ad0f4fb69f34c526fe488 /sys/dev/ic/com.c
parentb302a033156f300c77b20b1eb011b4ceaccff009 (diff)
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@
Diffstat (limited to 'sys/dev/ic/com.c')
-rw-r--r--sys/dev/ic/com.c6
1 files changed, 3 insertions, 3 deletions
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;