diff options
| author | anton <anton@cvs.openbsd.org> | 2018-11-20 19:00:14 +0000 |
|---|---|---|
| committer | anton <anton@cvs.openbsd.org> | 2018-11-20 19:00:14 +0000 |
| commit | 37e5c274696398fc273e28a2a4b315838fd6bfcd (patch) | |
| tree | d1ad34b6dc3b47ab825fda0afcf090182ce9bd2b | |
| parent | c65f56c614dba82bfdbe175fa67b55c965e6c66f (diff) | |
No need for wscons to handle FIOSETOWN ioctl requests since sys_ioctl()
translates such requests into TIOCSPGRP.
ok visa@
| -rw-r--r-- | sys/dev/wscons/wskbd.c | 8 | ||||
| -rw-r--r-- | sys/dev/wscons/wsmouse.c | 9 | ||||
| -rw-r--r-- | sys/dev/wscons/wsmux.c | 8 |
3 files changed, 3 insertions, 22 deletions
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 9b26a5eef42..7cbe9a06663 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.92 2018/11/19 19:19:24 anton Exp $ */ +/* $OpenBSD: wskbd.c,v 1.93 2018/11/20 19:00:13 anton Exp $ */ /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */ /* @@ -957,12 +957,6 @@ wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag, sc->sc_base.me_evp->async = *(int *)data != 0; return (0); - case FIOSETOWN: - evar = sc->sc_base.me_evp; - if (evar == NULL) - return (EINVAL); - return (sigio_setown(&evar->sigio, *(int *)data)); - case TIOCSPGRP: if (*(int *)data < 0) return (EINVAL); diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index ec6c0dd0923..e26cad28f70 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouse.c,v 1.48 2018/11/19 19:19:24 anton Exp $ */ +/* $OpenBSD: wsmouse.c,v 1.49 2018/11/20 19:00:13 anton Exp $ */ /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */ /* @@ -482,7 +482,6 @@ wsmouse_do_ioctl(struct wsmouse_softc *sc, u_long cmd, caddr_t data, int flag, switch (cmd) { case FIOASYNC: - case FIOSETOWN: case TIOCSPGRP: if ((flag & FWRITE) == 0) return (EACCES); @@ -498,12 +497,6 @@ wsmouse_do_ioctl(struct wsmouse_softc *sc, u_long cmd, caddr_t data, int flag, sc->sc_base.me_evp->async = *(int *)data != 0; return (0); - case FIOSETOWN: - evar = sc->sc_base.me_evp; - if (evar == NULL) - return (EINVAL); - return (sigio_setown(&evar->sigio, *(int *)data)); - case TIOCSPGRP: if (*(int *)data < 0) return (EINVAL); diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c index 11710829475..16b57c880d6 100644 --- a/sys/dev/wscons/wsmux.c +++ b/sys/dev/wscons/wsmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmux.c,v 1.33 2018/11/19 19:19:24 anton Exp $ */ +/* $OpenBSD: wsmux.c,v 1.34 2018/11/20 19:00:13 anton Exp $ */ /* $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $ */ /* @@ -470,12 +470,6 @@ wsmux_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag, return (EINVAL); evar->async = *(int *)data != 0; return (0); - case FIOSETOWN: - DPRINTF(("%s: FIOSETOWN\n", sc->sc_base.me_dv.dv_xname)); - evar = sc->sc_base.me_evp; - if (evar == NULL) - return (EINVAL); - return (sigio_setown(&evar->sigio, *(int *)data)); case TIOCSPGRP: DPRINTF(("%s: TIOCSPGRP\n", sc->sc_base.me_dv.dv_xname)); if (*(int *)data < 0) |