diff options
| author | cheloha <cheloha@cvs.openbsd.org> | 2019-08-08 02:19:19 +0000 |
|---|---|---|
| committer | cheloha <cheloha@cvs.openbsd.org> | 2019-08-08 02:19:19 +0000 |
| commit | c022ae85ada69750c183d8e07bb6b3f5e0e7c110 (patch) | |
| tree | 838c5b9a73dd66dadc73e3cb2254b71fad5b2836 /sys | |
| parent | 19cee8c6521e711a45fff97320bd43b4403e6dce (diff) | |
wskbd, wsmouse(4): tsleep(9) -> tsleep_nsec(9); ok mpi@ kn@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/wscons/wsevent.c | 6 | ||||
| -rw-r--r-- | sys/dev/wscons/wskbd.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsmouse.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c index 8518bfc56e1..1b21796da9c 100644 --- a/sys/dev/wscons/wsevent.c +++ b/sys/dev/wscons/wsevent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsevent.c,v 1.20 2019/05/22 18:52:14 anton Exp $ */ +/* $OpenBSD: wsevent.c,v 1.21 2019/08/08 02:19:18 cheloha Exp $ */ /* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */ /* @@ -162,8 +162,8 @@ wsevent_read(struct wseventvar *ev, struct uio *uio, int flags) return (EWOULDBLOCK); } ev->wanted = 1; - error = tsleep(ev, PWSEVENT | PCATCH, - "wsevent_read", 0); + error = tsleep_nsec(ev, PWSEVENT | PCATCH, + "wsevent_read", INFSLP); if (error) { splx(s); return (error); diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index d5d68f6ded4..120b0476afd 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.98 2019/05/22 19:13:34 anton Exp $ */ +/* $OpenBSD: wskbd.c,v 1.99 2019/08/08 02:19:18 cheloha Exp $ */ /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */ /* @@ -613,7 +613,7 @@ wskbd_detach(struct device *self, int flags) evar->put = 0; WSEVENT_WAKEUP(evar); /* Wait for processes to go away. */ - if (tsleep(sc, PZERO, "wskdet", hz * 60)) + if (tsleep_nsec(sc, PZERO, "wskdet", SEC_TO_NSEC(60))) printf("wskbd_detach: %s didn't detach\n", sc->sc_base.me_dv.dv_xname); } diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index 42ba954b0bd..585b0733f89 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouse.c,v 1.55 2019/05/24 06:05:38 anton Exp $ */ +/* $OpenBSD: wsmouse.c,v 1.56 2019/08/08 02:19:18 cheloha Exp $ */ /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */ /* @@ -271,7 +271,7 @@ wsmouse_detach(struct device *self, int flags) evar->put = 0; WSEVENT_WAKEUP(evar); /* Wait for processes to go away. */ - if (tsleep(sc, PZERO, "wsmdet", hz * 60)) + if (tsleep_nsec(sc, PZERO, "wsmdet", SEC_TO_NSEC(60))) printf("wsmouse_detach: %s didn't detach\n", sc->sc_base.me_dv.dv_xname); } |