[src/trunk]: src/sys/dev/adb defparam and use ADBKBD_LAYOUT, default to KB_US...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f3aacd94ac0b
branches:  trunk
changeset: 975547:f3aacd94ac0b
user:      macallan <macallan%NetBSD.org@localhost>
date:      Mon Aug 31 17:54:18 2020 +0000

description:
defparam and use ADBKBD_LAYOUT, default to KB_US|KB_APPLE for tradition

diffstat:

 sys/dev/adb/adb_kbd.c |  10 +++++-----
 sys/dev/adb/files.adb |   3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r da85cf4dd6b1 -r f3aacd94ac0b sys/dev/adb/adb_kbd.c
--- a/sys/dev/adb/adb_kbd.c     Mon Aug 31 17:51:56 2020 +0000
+++ b/sys/dev/adb/adb_kbd.c     Mon Aug 31 17:54:18 2020 +0000
@@ -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_mapdata adbkbd_keymapdata = {
        akbd_keydesctab,
-#ifdef AKBD_LAYOUT
-       AKBD_LAYOUT,
+#ifdef ADBKBD_LAYOUT
+       ADBKBD_LAYOUT,
 #else
-       KB_US,
+       KB_US | KB_APPLE,
 #endif
 };
 
diff -r da85cf4dd6b1 -r f3aacd94ac0b sys/dev/adb/files.adb
--- a/sys/dev/adb/files.adb     Mon Aug 31 17:51:56 2020 +0000
+++ b/sys/dev/adb/files.adb     Mon Aug 31 17:54:18 2020 +0000
@@ -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 @@
 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