 @@ -1,14 +1,14 @@
-/*	$NetBSD: dzkbd.c,v 1.30 2021/08/07 16:19:10 thorpej Exp $	*/
+/*	$NetBSD: dzkbd.c,v 1.30.6.1 2024/02/17 16:17:17 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -35,27 +35,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.
+ *
  *	@(#)kbd.c	8.2 (Berkeley) 10/30/93
  */
 /*
  * LK200/LK400 keyboard attached to line 0 of the DZ*-11
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.30 2021/08/07 16:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.30.6.1 2024/02/17 16:17:17 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/intr.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 @@ -227,27 +227,27 @@ dzkbd_sendchar(void *v, u_char c)
 	dzputc(ls, c);
 	splx(s);
 	return (0);
+}
 static void
 dzkbd_cngetc(void *v, u_int *type, int *data)
+{
 	struct dzkbd_internal *dzi = v;
 	int c;
 	do {
 		c = dzgetc(dzi->dzi_ls);
-	} while (!lk201_decode(&dzi->dzi_ks, 0, c, type, data) == LKD_NODATA);
+	} while (lk201_decode(&dzi->dzi_ks, 0, c, type, data) == LKD_NODATA);
+}
 static void
 dzkbd_cnpollc(void *v, int on)
+{
 #if 0
 	struct dzkbd_internal *dzi = v;
 #endif
+}
 static void
 dzkbd_set_leds(void *v, int leds)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $ */
+/* $NetBSD: lk201_ws.c,v 1.10.50.1 2024/02/17 16:17:17 martin Exp $ */
 /*
  * Copyright (c) 1998
  *	Matthias Drochner.  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.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10.50.1 2024/02/17 16:17:17 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/dec/lk201reg.h>
 #include <dev/dec/lk201var.h>
 #include <dev/dec/wskbdmap_lk201.h> /* for {MIN,MAX}_LK201_KEY */
 #define send(lks, c) ((*((lks)->attmt.sendchar))((lks)->attmt.cookie, c))
 @@ -123,92 +123,85 @@ lk201_init(struct lk201_state *lks)
 int
 lk201_decode(struct lk201_state *lks, int wantmulti, int datain, u_int *type, int *dataout)
+{
 	int i, freeslot;
 	if (lks->waitack != 0) {
 		lks->ackdata = datain;
 		lks->waitack = 0;
 		return LKD_NODATA;
+	}
 	switch (datain) {
 #if 0
 	    case LK_KEY_UP:
 		for (i = 0; i < LK_KLL; i++)
 			lks->down_keys_list[i] = -1;
 		*type = WSCONS_EVENT_ALL_KEYS_UP;
 		return (1);
 #endif
 	    case LK_POWER_UP:
 		printf("lk201_decode: powerup detected\n");
 		lk201_init(lks);
-		return (0);
+		return LKD_NODATA;
 	    case LK_KDOWN_ERROR:
 	    case LK_POWER_ERROR:
 	    case LK_OUTPUT_ERROR:
 	    case LK_INPUT_ERROR:
 		printf("lk201_decode: error %x\n", datain);
 		/* FALLTHRU */
 	    case LK_KEY_REPEAT: /* autorepeat handled by wskbd */
 	    case LK_MODE_CHANGE: /* ignore silently */
-		return (0);
+		return LKD_NODATA;
+	}
 	if (datain == LK_KEY_UP) {
 		if (wantmulti) {
 			for (i = 0; i < LK_KLL; i++)
 				if (lks->down_keys_list[i] != -1) {
 					*type = WSCONS_EVENT_KEY_UP;
 					*dataout = lks->down_keys_list[i] -
 					    MIN_LK201_KEY;
 					lks->down_keys_list[i] = -1;
-					return (LKD_MORE);
+					return LKD_MORE;
+				}
-			return (LKD_NODATA);
+			return LKD_NODATA;
 		} else {
 			for (i = 0; i < LK_KLL; i++)
 				lks->down_keys_list[i] = -1;
 			*type = WSCONS_EVENT_ALL_KEYS_UP;
-			return (LKD_COMPLETE);
+			return LKD_COMPLETE;
+		}
 	} else if (datain < MIN_LK201_KEY || datain > MAX_LK201_KEY) {
 		printf("lk201_decode: %x\n", datain);
-		return (0);
+		return LKD_NODATA;
+	}
 	*dataout = datain - MIN_LK201_KEY;
 	freeslot = -1;
 	for (i = 0; i < LK_KLL; i++) {
 		if (lks->down_keys_list[i] == datain) {
 			*type = WSCONS_EVENT_KEY_UP;
 			lks->down_keys_list[i] = -1;
-			return (1);
+			return LKD_COMPLETE;
+		}
 		if (lks->down_keys_list[i] == -1 && freeslot == -1)
 			freeslot = i;
+	}
 	if (freeslot == -1) {
 		printf("lk201_decode: down(%d) no free slot\n", datain);
-		return (0);
+		return LKD_NODATA;
+	}
 	*type = WSCONS_EVENT_KEY_DOWN;
 	lks->down_keys_list[freeslot] = datain;
-	return (1);
+	return LKD_COMPLETE;
+}
 void
 lk201_bell(struct lk201_state *lks, struct wskbd_bell_data *bell)
+{
 	unsigned int vol;
 	if (bell->which & WSKBD_BELL_DOVOLUME) {
 		vol = 8 - bell->volume * 8 / 100;
 		if (vol > 7)
 			vol = 7;
 	} else
 		vol = 3;

 @@ -1,14 +1,14 @@
-/* $NetBSD: lk201var.h,v 1.7 2015/01/02 21:32:26 jklos Exp $ */
+/* $NetBSD: lk201var.h,v 1.7.50.1 2024/02/17 16:17:17 martin Exp $ */
 /*
  * Copyright (c) 1998
  *	Matthias Drochner.  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.
 @@ -44,17 +44,17 @@ struct lk201_state {
 #define LK_KLL 8
 	int down_keys_list[LK_KLL];
 	int bellvol;
 	int leds_state;
 	int kcvol;
 };
 int lk201_init(struct lk201_state *);
 int lk201_decode(struct lk201_state *, int, int, u_int *, int *);
 void lk201_bell(struct lk201_state *, struct wskbd_bell_data *);
 void lk201_set_leds(struct lk201_state *, int);
 void lk201_set_keyclick(struct lk201_state *, int);
 /* Values returned by lk201_decode */
 #define LKD_NODATA	0x00
 #define LKD_COMPLETE	0x01
 #define LKD_MORE	0x02