summaryrefslogtreecommitdiff
path: root/sys/arch/evbarm/dev/plcom.c
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2021-10-20 01:09:49 +0000
committerjmcneill <jmcneill@NetBSD.org>2021-10-20 01:09:49 +0000
commitdc8cdf89dbf17cd33f50fc4fd84feb987f5ee37d (patch)
treed6cbd37e28e56bbe4540f1937f06f89c2dd3bec7 /sys/arch/evbarm/dev/plcom.c
parent726327dbdde55547d27cc63104a76bd05e3b6fd2 (diff)
- microtime -> microuptime
- avoid kpause with timeo=0
Diffstat (limited to 'sys/arch/evbarm/dev/plcom.c')
-rw-r--r--sys/arch/evbarm/dev/plcom.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/evbarm/dev/plcom.c b/sys/arch/evbarm/dev/plcom.c
index 9b0309d5bf4..e18c1d28ac0 100644
--- a/sys/arch/evbarm/dev/plcom.c
+++ b/sys/arch/evbarm/dev/plcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom.c,v 1.63 2021/10/17 22:34:17 jmcneill Exp $ */
+/* $NetBSD: plcom.c,v 1.64 2021/10/20 01:09:49 jmcneill Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.63 2021/10/17 22:34:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.64 2021/10/20 01:09:49 jmcneill Exp $");
#include "opt_plcom.h"
#include "opt_ddb.h"
@@ -686,7 +686,7 @@ plcom_shutdown(struct plcom_softc *sc)
*/
if (ISSET(tp->t_cflag, HUPCL)) {
plcom_modem(sc, 0);
- microtime(&sc->sc_hup_pending);
+ microuptime(&sc->sc_hup_pending);
sc->sc_hup_pending.tv_sec++;
}
@@ -790,13 +790,14 @@ plcomopen(dev_t dev, int flag, int mode, struct lwp *l)
}
if (timerisset(&sc->sc_hup_pending)) {
- microtime(&now);
+ microuptime(&now);
while (timercmp(&now, &sc->sc_hup_pending, <)) {
timersub(&sc->sc_hup_pending, &now, &diff);
const int ms = diff.tv_sec * 100 +
- uimax(diff.tv_usec / 1000, 1);
- kpause(ttclos, false, mstohz(ms), &sc->sc_lock);
- microtime(&now);
+ diff.tv_usec / 1000;
+ kpause(ttclos, false, uimax(mstohz(ms), 1),
+ &sc->sc_lock);
+ microuptime(&now);
}
timerclear(&sc->sc_hup_pending);
}