diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2008-09-10 14:01:24 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2008-09-10 14:01:24 +0000 |
| commit | 33d64896abc9e79070ec22125a832e7d8ef87878 (patch) | |
| tree | 1f2297f6ceb3127f1cc36b8d9c89baeeceb16922 /sys/kern/tty_msts.c | |
| parent | 528af50e90df2cf2ebdf638dc4d94752c1861936 (diff) | |
Convert timeout_add() calls using multiples of hz to timeout_add_sec()
Really just the low-hanging fruit of (hopefully) forthcoming timeout
conversions.
ok art@, krw@
Diffstat (limited to 'sys/kern/tty_msts.c')
| -rw-r--r-- | sys/kern/tty_msts.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/kern/tty_msts.c b/sys/kern/tty_msts.c index 660e9e2a0ee..5aa03c54376 100644 --- a/sys/kern/tty_msts.c +++ b/sys/kern/tty_msts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_msts.c,v 1.4 2008/06/11 17:11:36 mbalmer Exp $ */ +/* $OpenBSD: tty_msts.c,v 1.5 2008/09/10 14:01:23 blambert Exp $ */ /* * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org> @@ -53,7 +53,6 @@ void mstsattach(int); #endif int msts_count, msts_nxid; -static int t_trust; struct msts { char cbuf[MSTSMAX]; /* receive buffer */ @@ -92,7 +91,6 @@ mstsopen(dev_t dev, struct tty *tp) { struct proc *p = curproc; struct msts *np; - struct timeval t; int error; DPRINTF(("mstsopen\n")); @@ -128,11 +126,6 @@ mstsopen(dev_t dev, struct tty *tp) } else { sensordev_install(&np->timedev); timeout_set(&np->msts_tout, msts_timeout, np); - - /* convert timevals to hz */ - t.tv_sec = TRUSTTIME; - t.tv_usec = 0; - t_trust = tvtohz(&t); } return error; @@ -280,7 +273,7 @@ msts_decode(struct msts *np, struct tty *tp, char *fld[], int fldcnt) #ifdef MSTS_DEBUG if (np->time.status == SENSOR_S_UNKNOWN) { np->time.status = SENSOR_S_OK; - timeout_add(&np->msts_tout, t_trust); + timeout_add_sec(&np->msts_tout, TRUSTTIME); } np->gapno = 0; #endif @@ -305,7 +298,7 @@ msts_decode(struct msts *np, struct tty *tp, char *fld[], int fldcnt) if (fld[3][0] == ' ' && fld[3][1] == ' ') { np->time.status = SENSOR_S_OK; np->signal.status = SENSOR_S_OK; - timeout_add(&np->msts_tout, t_trust); + timeout_add_sec(&np->msts_tout, TRUSTTIME); } else np->signal.status = SENSOR_S_WARN; @@ -428,7 +421,7 @@ msts_timeout(void *xnp) * further degrade in TRUSTTIME seconds if no new valid MSTS * strings are received. */ - timeout_add(&np->msts_tout, t_trust); + timeout_add_sec(&np->msts_tout, TRUSTTIME); } else np->time.status = SENSOR_S_CRIT; } |