[src/trunk]: src/sys/arch/macppc/conf default to apple layout for both adb an...

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

details:   https://anonhg.NetBSD.org/src/rev/b18fb16b54c7
branches:  trunk
changeset: 368472:b18fb16b54c7
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Jul 14 11:10:02 2022 +0000

description:
default to apple layout for both adb and usb keyboards

diffstat:

 sys/arch/macppc/conf/std.macppc    |  7 +++++--
 sys/arch/macppc/conf/std.macppc.g5 |  2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r bfa40cc21454 -r b18fb16b54c7 sys/arch/macppc/conf/std.macppc
--- a/sys/arch/macppc/conf/std.macppc   Thu Jul 14 07:42:11 2022 +0000
+++ b/sys/arch/macppc/conf/std.macppc   Thu Jul 14 11:10:02 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.macppc,v 1.25 2020/08/29 23:00:10 macallan Exp $
+#      $NetBSD: std.macppc,v 1.26 2022/07/14 11:10:02 macallan Exp $
 #
 # Standard/required options for NetBSD/macppc.
 
@@ -21,7 +21,10 @@
 # HID devices - for them to coexist on the same mux we tell the adbkbd driver
 # pose as a USB keyboard
 options        ADBKBD_EMUL_USB
-options        UKBD_LAYOUT="(KB_US | KB_APPLE)"  # for ukbd driver
+
+# default to console switching using Command-Fn, for tradition 
+options        ADBKBD_LAYOUT="(KB_US | KB_APPLE)"
+options        UKBD_LAYOUT="(KB_US | KB_APPLE)"
 
 # Atheros HAL options
 include "external/isc/atheros_hal/conf/std.ath_hal"
diff -r bfa40cc21454 -r b18fb16b54c7 sys/arch/macppc/conf/std.macppc.g5
--- a/sys/arch/macppc/conf/std.macppc.g5        Thu Jul 14 07:42:11 2022 +0000
+++ b/sys/arch/macppc/conf/std.macppc.g5        Thu Jul 14 11:10:02 2022 +0000
@@ -16,5 +16,7 @@
 
 options        INTSTK=0x2000
 
+options        UKBD_LAYOUT="(KB_US | KB_APPLE)"
+
 # Atheros HAL options
 include "external/isc/atheros_hal/conf/std.ath_hal"