 @@ -1,14 +1,14 @@
-/* $NetBSD: wsbell.c,v 1.4 2017/06/12 07:12:49 pgoyette Exp $ */
+/* $NetBSD: wsbell.c,v 1.5 2017/06/13 00:42:27 nat Exp $ */
 /*-
  * Copyright (c) 2017 Nathanial Sloss <nathanialsloss@yahoo.com.au>
  * All rights reserved.
+ *
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -97,27 +97,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ms.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Keyboard Bell driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.4 2017/06/12 07:12:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.5 2017/06/13 00:42:27 nat Exp $");
 #if defined(_KERNEL_OPT)
 #include "wsmux.h"
 #endif
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/condvar.h>
 #include <sys/mutex.h>
 @@ -341,37 +341,26 @@ wsbelldoioctl(device_t dv, u_long cmd, v
 int
 wsbell_do_ioctl(struct wsbell_softc *sc, u_long cmd, void *data,
 		 int flag, struct lwp *l)
+{
 	struct wskbd_bell_data *ubdp, *kbdp;
 	if (sc->sc_dying)
 		return (EIO);
 	/*
 	 * Try the wsbell specific ioctls.
 	 */
 	switch (cmd) {
 #define	SETBELL(dstp, srcp, dfltp)					\
     do {								\
 	(dstp)->pitch = ((srcp)->which & WSKBD_BELL_DOPITCH) ?		\
 	    (srcp)->pitch : (dfltp)->pitch;				\
 	(dstp)->period = ((srcp)->which & WSKBD_BELL_DOPERIOD) ?	\
 	    (srcp)->period : (dfltp)->period;				\
 	(dstp)->volume = ((srcp)->which & WSKBD_BELL_DOVOLUME) ?	\
 	    (srcp)->volume : (dfltp)->volume;				\
 	(dstp)->which = WSKBD_BELL_DOALL;				\
     } while (0)
 	case WSKBDIO_SETBELL:
 		if ((flag & FWRITE) == 0)
 			return (EACCES);
 		kbdp = &sc->sc_bell_data;
 		ubdp = (struct wskbd_bell_data *)data;
 		SETBELL(kbdp, ubdp, kbdp);
 		return (0);
 	case WSKBDIO_GETBELL:
 		kbdp = &sc->sc_bell_data;
 		ubdp = (struct wskbd_bell_data *)data;
 		SETBELL(ubdp, kbdp, kbdp);
 		return (0);

 @@ -1,14 +1,14 @@
-/* $NetBSD: wsbelldata.h,v 1.1 2017/06/11 03:38:12 nat Exp $ */
+/* $NetBSD: wsbelldata.h,v 1.2 2017/06/13 00:42:27 nat Exp $ */
 /*-
  * Copyright (c) 2017 Nathanial Sloss <nathanialsloss@yahoo.com.au>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -25,19 +25,30 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef WSKBD_DEFAULT_BELL_PITCH
 #define	WSKBD_DEFAULT_BELL_PITCH	1500	/* 1500Hz */
 #endif
 #ifndef WSKBD_DEFAULT_BELL_PERIOD
 #define	WSKBD_DEFAULT_BELL_PERIOD	100	/* 100ms */
 #endif
 #ifndef WSKBD_DEFAULT_BELL_VOLUME
 #define	WSKBD_DEFAULT_BELL_VOLUME	50	/* 50% volume */
 #endif
 #define	SETBELL(dstp, srcp, dfltp)					\
     do {								\
 	(dstp)->pitch = ((srcp)->which & WSKBD_BELL_DOPITCH) ?		\
 	    (srcp)->pitch : (dfltp)->pitch;				\
 	(dstp)->period = ((srcp)->which & WSKBD_BELL_DOPERIOD) ?	\
 	    (srcp)->period : (dfltp)->period;				\
 	(dstp)->volume = ((srcp)->which & WSKBD_BELL_DOVOLUME) ?	\
 	    (srcp)->volume : (dfltp)->volume;				\
 	(dstp)->which = WSKBD_BELL_DOALL;				\
     } while (0)
 static struct wskbd_bell_data wskbd_default_bell_data = {
 	WSKBD_BELL_DOALL,
 	WSKBD_DEFAULT_BELL_PITCH,
 	WSKBD_DEFAULT_BELL_PERIOD,
 	WSKBD_DEFAULT_BELL_VOLUME,
 };

 @@ -1,14 +1,14 @@
-/* $NetBSD: wskbd.c,v 1.139 2017/06/11 03:38:12 nat Exp $ */
+/* $NetBSD: wskbd.c,v 1.140 2017/06/13 00:42:27 nat Exp $ */
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -95,27 +95,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kbd.c	8.2 (Berkeley) 10/30/93
  */
 /*
  * Keyboard driver (/dev/wskbd*).  Translates incoming bytes to ASCII or
  * to `wscons_events' and passes them up to the appropriate reader.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.139 2017/06/11 03:38:12 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.140 2017/06/13 00:42:27 nat Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_wsdisplay_compat.h"
 #endif
 #include "wsdisplay.h"
 #include "wskbd.h"
 #include "wsmux.h"
 #include <sys/param.h>
 #include <sys/conf.h>
 @@ -1049,37 +1049,26 @@ wskbd_displayioctl(device_t dev, u_long
 #ifdef WSDISPLAY_SCROLLSUPPORT
 	struct wskbd_scroll_data *usdp, *ksdp;
 #endif
 	struct wskbd_softc *sc = device_private(dev);
 	struct wskbd_bell_data *ubdp, *kbdp;
 	struct wskbd_keyrepeat_data *ukdp, *kkdp;
 	struct wskbd_map_data *umdp;
 	struct wskbd_mapdata md;
 	kbd_t enc;
 	void *tbuf;
 	int len, error;
 	switch (cmd) {
 #define	SETBELL(dstp, srcp, dfltp)					\
     do {								\
 	(dstp)->pitch = ((srcp)->which & WSKBD_BELL_DOPITCH) ?		\
 	    (srcp)->pitch : (dfltp)->pitch;				\
 	(dstp)->period = ((srcp)->which & WSKBD_BELL_DOPERIOD) ?	\
 	    (srcp)->period : (dfltp)->period;				\
 	(dstp)->volume = ((srcp)->which & WSKBD_BELL_DOVOLUME) ?	\
 	    (srcp)->volume : (dfltp)->volume;				\
 	(dstp)->which = WSKBD_BELL_DOALL;				\
     } while (0)
 	case WSKBDIO_BELL:
 		if ((flag & FWRITE) == 0)
 			return (EACCES);
 		return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
 		    WSKBDIO_COMPLEXBELL, (void *)&sc->sc_bell_data, flag, l));
 	case WSKBDIO_COMPLEXBELL:
 		if ((flag & FWRITE) == 0)
 			return (EACCES);
 		ubdp = (struct wskbd_bell_data *)data;
 		SETBELL(ubdp, ubdp, &sc->sc_bell_data);
 		return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
 		    WSKBDIO_COMPLEXBELL, (void *)ubdp, flag, l));