Module Name: src
Committed By: kre
Date: Tue Oct 12 06:25:17 UTC 2021
Modified Files:
src/sys/dev/ic: com.c
Log Message:
Now Jason has made this build, avoid a 50+ year
sleep to implement HUPCL.
To generate a diff of this commit:
cvs rdiff -u -r1.366 -r1.367 src/sys/dev/ic/com.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.366 src/sys/dev/ic/com.c:1.367
--- src/sys/dev/ic/com.c:1.366 Mon Oct 11 18:39:06 2021
+++ src/sys/dev/ic/com.c Tue Oct 12 06:25:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.366 2021/10/11 18:39:06 jmcneill Exp $ */
+/* $NetBSD: com.c,v 1.367 2021/10/12 06:25:17 kre Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.366 2021/10/11 18:39:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.367 2021/10/12 06:25:17 kre Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -986,9 +986,12 @@ comopen(dev_t dev, int flag, int mode, s
if (timerisset(&sc->sc_hup_pending)) {
getmicrotime(&now);
while (timercmp(&now, &sc->sc_hup_pending, <)) {
+ int ms;
+
+
timersub(&sc->sc_hup_pending, &now, &diff);
- int ms = now.tv_sec * 1000 +
- uimin(now.tv_usec / 1000, 1);
+ ms = diff.tv_sec * 1000 +
+ uimax(diff.tv_usec / 1000, 1);
kpause("comopen", false, mstohz(ms),
&sc->sc_lock);
}
