@@ -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
 };
 

@@ -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