Module Name: src
Committed By: macallan
Date: Mon Aug 31 17:54:18 UTC 2020
Modified Files:
src/sys/dev/adb: adb_kbd.c files.adb
Log Message:
defparam and use ADBKBD_LAYOUT, default to KB_US|KB_APPLE for tradition
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/adb/adb_kbd.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/adb/files.adb
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/adb/adb_kbd.c
diff -u src/sys/dev/adb/adb_kbd.c:1.29 src/sys/dev/adb/adb_kbd.c:1.30
--- src/sys/dev/adb/adb_kbd.c:1.29 Sun Jun 9 14:18:29 2019
+++ src/sys/dev/adb/adb_kbd.c Mon Aug 31 17:54:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_kbd.c,v 1.29 2019/06/09 14:18:29 christos Exp $ */
+/* $NetBSD: adb_kbd.c,v 1.30 2020/08/31 17:54:18 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.29 2019/06/09 14:18:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.30 2020/08/31 17:54:18 macallan Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -139,10 +139,10 @@ struct wskbd_consops adbkbd_consops = {
struct wskbd_mapdata adbkbd_keymapdata = {
akbd_keydesctab,
-#ifdef AKBD_LAYOUT
- AKBD_LAYOUT,
+#ifdef ADBKBD_LAYOUT
+ ADBKBD_LAYOUT,
#else
- KB_US,
+ KB_US | KB_APPLE,
#endif
};
Index: src/sys/dev/adb/files.adb
diff -u src/sys/dev/adb/files.adb:1.9 src/sys/dev/adb/files.adb:1.10
--- src/sys/dev/adb/files.adb:1.9 Sun Sep 8 05:55:15 2019
+++ src/sys/dev/adb/files.adb Mon Aug 31 17:54:18 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: files.adb,v 1.9 2019/09/08 05:55:15 macallan Exp $
+# $NetBSD: files.adb,v 1.10 2020/08/31 17:54:18 macallan Exp $
#
# Apple Desktop Bus protocol and drivers
@@ -21,6 +21,7 @@ attach adbkbd at nadb
file dev/adb/adb_kbd.c adbkbd needs-flag
file dev/adb/adb_usb_map.c adbkbd
defflag opt_adbkbd.h ADBKBD_EMUL_USB
+defparam opt_adbkbd.h ADBKBD_LAYOUT
device adbbt : wskbddev
attach adbbt at nadb
