summaryrefslogtreecommitdiff
path: root/sys/dev/wscons/wsmux.c
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2000-08-01 13:51:20 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2000-08-01 13:51:20 +0000
commite6c966b615696f7a8f4d3c2c3fda5dcaed7d3f67 (patch)
tree42de716832f0c4a3c4e616390572a4a8d679dbd2 /sys/dev/wscons/wsmux.c
parent389a0a4582e6890e967b7827708a1462222bcaf5 (diff)
update wscons, nothing serious, mostly api fixes for us; from netbsd through aaron@
Diffstat (limited to 'sys/dev/wscons/wsmux.c')
-rw-r--r--sys/dev/wscons/wsmux.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index f9243a1025c..996bc3c9083 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: wsmux.c,v 1.1 2000/05/16 23:49:12 mickey Exp $ */
-/* $NetBSD: wsmux.c,v 1.8 1999/11/08 10:10:25 augustss Exp $ */
+/* $OpenBSD: wsmux.c,v 1.2 2000/08/01 13:51:18 mickey Exp $ */
+/* $NetBSD: wsmux.c,v 1.9 2000/05/28 10:33:14 takemura Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -353,7 +353,7 @@ wsmux_create(name, unit)
sc = malloc(sizeof *sc, M_DEVBUF, M_NOWAIT);
if (!sc)
return (0);
- bzero(sc, sizeof *sc);
+ memset(sc, 0, sizeof *sc);
LIST_INIT(&sc->sc_reals);
snprintf(sc->sc_dv.dv_xname, sizeof sc->sc_dv.dv_xname,
"%s%d", name, unit);
@@ -601,6 +601,13 @@ wsmuxdoioctl(dv, cmd, data, flag, p)
DPRINTF(("wsmuxdoioctl: save rawkbd = %d\n", sc->sc_rawkbd));
break;
#endif
+ case FIOASYNC:
+ sc->sc_events.async = *(int *)data != 0;
+ return (0);
+ case TIOCSPGRP:
+ if (*(int *)data != sc->sc_events.io->p_pgid)
+ return (EPERM);
+ return (0);
default:
break;
}