diff options
author | anton <anton@cvs.openbsd.org> | 2020-03-22 08:00:00 +0000 |
---|---|---|
committer | anton <anton@cvs.openbsd.org> | 2020-03-22 08:00:00 +0000 |
commit | 042cce97819897a2aaadbef0052e8e989c3fbfa6 (patch) | |
tree | 214a92c505cbe320ba680b689e41d6febd6d5bfd /sys | |
parent | d7775d1e9b7f219d93e5725dc0303f2c48a51d0b (diff) |
zap trailing whitespace
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/wscons/wsconsio.h | 10 | ||||
-rw-r--r-- | sys/dev/wscons/wsdisplay.c | 4 | ||||
-rw-r--r-- | sys/dev/wscons/wsemul_vt100.c | 4 | ||||
-rw-r--r-- | sys/dev/wscons/wsemul_vt100_subr.c | 4 | ||||
-rw-r--r-- | sys/dev/wscons/wskbd.c | 14 | ||||
-rw-r--r-- | sys/dev/wscons/wsmouse.c | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index 29fd7ba9bb7..6b72eb9c344 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.93 2020/03/03 22:03:04 kettenis Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.94 2020/03/22 07:59:59 anton Exp $ */ /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */ /* @@ -81,9 +81,9 @@ struct wscons_event { #define WSCONS_EVENT_MOUSE_DELTA_W 16 /* W delta amount */ #define WSCONS_EVENT_MOUSE_ABSOLUTE_W 17 /* (legacy, see below) */ #define WSCONS_EVENT_SYNC 18 -/* +/* * Following events are not real wscons_event but are used as parameters of the - * WSDISPLAYIO_WSMOUSED ioctl + * WSDISPLAYIO_WSMOUSED ioctl */ #define WSCONS_EVENT_WSMOUSED_ON 12 /* wsmoused(8) active */ #define WSCONS_EVENT_WSMOUSED_OFF 13 /* wsmoused(8) inactive */ @@ -456,7 +456,7 @@ struct wsdisplay_cmap { u_char *red; /* red color map elements */ u_char *green; /* green color map elements */ u_char *blue; /* blue color map elements */ -}; +}; #define WSDISPLAYIO_GETCMAP _IOW('W', 66, struct wsdisplay_cmap) #define WSDISPLAYIO_PUTCMAP _IOW('W', 67, struct wsdisplay_cmap) @@ -538,7 +538,7 @@ struct wsdisplay_burner { #define WSDISPLAY_BURN_OUTPUT 0x0008 }; #define WSDISPLAYIO_SBURNER _IOW('W', 81, struct wsdisplay_burner) -#define WSDISPLAYIO_GBURNER _IOR('W', 82, struct wsdisplay_burner) +#define WSDISPLAYIO_GBURNER _IOR('W', 82, struct wsdisplay_burner) /* * XXX WARNING diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index 61ccd2dae43..7bf8c016238 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay.c,v 1.135 2019/10/13 19:49:21 fcambus Exp $ */ +/* $OpenBSD: wsdisplay.c,v 1.136 2020/03/22 07:59:59 anton Exp $ */ /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */ /* @@ -2204,7 +2204,7 @@ wsdisplay_suspend_device(struct device *dev) struct wsdisplay_softc *sc = (struct wsdisplay_softc *)dev; struct wsscreen *scr; int active, idx, ret = 0, s; - + if ((active = wsdisplay_getactivescreen(sc)) == WSDISPLAY_NULLSCREEN) return; diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c index da58cab53ce..7c032293bb8 100644 --- a/sys/dev/wscons/wsemul_vt100.c +++ b/sys/dev/wscons/wsemul_vt100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemul_vt100.c,v 1.36 2017/08/10 09:12:32 fcambus Exp $ */ +/* $OpenBSD: wsemul_vt100.c,v 1.37 2020/03/22 07:59:59 anton Exp $ */ /* $NetBSD: wsemul_vt100.c,v 1.13 2000/04/28 21:56:16 mycroft Exp $ */ /* @@ -1190,7 +1190,7 @@ wsemul_vt100_output(void *cookie, const u_char *data, u_int count, int kernel) processed++; continue; } - + if (edp->state == VT100_EMUL_STATE_NORMAL || kernel) { rc = wsemul_vt100_output_normal(edp, instate, kernel); if (rc != 0) diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c index 1ce2963b5ef..bcde0e6f6c9 100644 --- a/sys/dev/wscons/wsemul_vt100_subr.c +++ b/sys/dev/wscons/wsemul_vt100_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemul_vt100_subr.c,v 1.21 2015/09/05 08:26:43 miod Exp $ */ +/* $OpenBSD: wsemul_vt100_subr.c,v 1.22 2020/03/22 07:59:59 anton Exp $ */ /* $NetBSD: wsemul_vt100_subr.c,v 1.7 2000/04/28 21:56:16 mycroft Exp $ */ /* @@ -221,7 +221,7 @@ wsemul_vt100_handle_csi(struct wsemul_vt100_emuldata *edp, long attr, bkgdattr; u_char c; int rc = 0; - + if (instate->inchar >= 0x100) c = 0x00; /* cause the switch below to end in default: */ else diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index c834dfbee9a..a923c05a0b1 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.100 2020/01/08 16:27:40 visa Exp $ */ +/* $OpenBSD: wskbd.c,v 1.101 2020/03/22 07:59:59 anton Exp $ */ /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */ /* @@ -435,7 +435,7 @@ wskbd_attach(struct device *parent, struct device *self, void *aux) sc->sc_keyrepeat_data = wskbd_default_keyrepeat_data; if (ap->console) { - KASSERT(wskbd_console_initted); + KASSERT(wskbd_console_initted); KASSERT(wskbd_console_device == NULL); wskbd_console_device = sc; @@ -489,7 +489,7 @@ wskbd_attach(struct device *parent, struct device *self, void *aux) #endif } -void +void wskbd_cnattach(const struct wskbd_consops *consops, void *conscookie, const struct wskbd_mapdata *mapdata) { @@ -638,7 +638,7 @@ wskbd_detach(struct device *self, int flags) void wskbd_input(struct device *dev, u_int type, int value) { - struct wskbd_softc *sc = (struct wskbd_softc *)dev; + struct wskbd_softc *sc = (struct wskbd_softc *)dev; #if NWSDISPLAY > 0 int num; #endif @@ -948,7 +948,7 @@ wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag, struct wseventvar *evar; int error; - /* + /* * Try the generic ioctls that the wskbd interface supports. */ switch (cmd) { @@ -1272,7 +1272,7 @@ wskbd_set_display(struct device *dv, struct device *displaydv) int error; DPRINTF(("%s: %s odisp=%p disp=%p cons=%d\n", __func__, - dv->dv_xname, sc->sc_displaydv, displaydv, + dv->dv_xname, sc->sc_displaydv, displaydv, sc->sc_isconsole)); if (sc->sc_isconsole) @@ -1347,7 +1347,7 @@ wskbd_cngetc(dev_t dev) if (num-- > 0) { ks = wskbd_console_data.t_symbols[pos++]; if (KS_GROUP(ks) == KS_GROUP_Ascii) - return (KS_VALUE(ks)); + return (KS_VALUE(ks)); } else { (*wskbd_console_data.t_consops->getc) (wskbd_console_data.t_consaccesscookie, diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index 0f0d4da1c60..5140f34bd3f 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouse.c,v 1.58 2020/01/08 16:27:41 visa Exp $ */ +/* $OpenBSD: wsmouse.c,v 1.59 2020/03/22 07:59:59 anton Exp $ */ /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */ /* @@ -143,7 +143,7 @@ void wsmouse_attach(struct device *, struct device *, void *); int wsmouse_detach(struct device *, int); int wsmouse_activate(struct device *, int); -int wsmouse_do_ioctl(struct wsmouse_softc *, u_long, caddr_t, +int wsmouse_do_ioctl(struct wsmouse_softc *, u_long, caddr_t, int, struct proc *); #if NWSMUX > 0 @@ -151,7 +151,7 @@ int wsmouse_mux_open(struct wsevsrc *, struct wseventvar *); int wsmouse_mux_close(struct wsevsrc *); #endif -int wsmousedoioctl(struct device *, u_long, caddr_t, int, +int wsmousedoioctl(struct device *, u_long, caddr_t, int, struct proc *); int wsmousedoopen(struct wsmouse_softc *, struct wseventvar *); |