Module Name: src
Committed By: hans
Date: Tue Mar 4 16:18:27 UTC 2025
Modified Files:
src/sys/dev/dec: dzkbd.c
Log Message:
dzkbd: perform keyboard initialization again for console keyboards
Also, initialize dzkbd_console_internal properly. Makes keyboard type
detection work on framebuffer console on VAXstations. Not tested on
pmax, but unlikely to cause issues there.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/dec/dzkbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.32 src/sys/dev/dec/dzkbd.c:1.33
--- src/sys/dev/dec/dzkbd.c:1.32 Wed Feb 14 12:49:47 2024
+++ src/sys/dev/dec/dzkbd.c Tue Mar 4 16:18:27 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.32 2024/02/14 12:49:47 tsutsui Exp $ */
+/* $NetBSD: dzkbd.c,v 1.33 2025/03/04 16:18:27 hans Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.32 2024/02/14 12:49:47 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.33 2025/03/04 16:18:27 hans Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,23 +160,20 @@ dzkbd_attach(device_t parent, device_t s
isconsole = (daa->daa_flags & DZKBD_CONSOLE);
- if (isconsole) {
+ if (isconsole)
dzi = &dzkbd_console_internal;
- } else {
- dzi = malloc(sizeof(struct dzkbd_internal),
- M_DEVBUF, M_WAITOK);
- dzi->dzi_ks.attmt.sendchar = dzkbd_sendchar;
- dzi->dzi_ks.attmt.cookie = ls;
- }
+ else
+ dzi = malloc(sizeof(struct dzkbd_internal), M_DEVBUF, M_WAITOK);
+
+ dzi->dzi_ks.attmt.sendchar = dzkbd_sendchar;
+ dzi->dzi_ks.attmt.cookie = ls;
dzi->dzi_ls = ls;
dzkbd->sc_itl = dzi;
aprint_normal("\n");
- if (!isconsole) {
- DELAY(100000);
- lk201_init(&dzi->dzi_ks);
- }
+ DELAY(100000);
+ lk201_init(&dzi->dzi_ks);
/* XXX should identify keyboard ID here XXX */
/* XXX layout and the number of LED is varying XXX */
