Module Name: src
Committed By: macallan
Date: Thu Jul 14 11:10:02 UTC 2022
Modified Files:
src/sys/arch/macppc/conf: std.macppc std.macppc.g5
Log Message:
default to apple layout for both adb and usb keyboards
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/conf/std.macppc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/conf/std.macppc.g5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/conf/std.macppc
diff -u src/sys/arch/macppc/conf/std.macppc:1.25 src/sys/arch/macppc/conf/std.macppc:1.26
--- src/sys/arch/macppc/conf/std.macppc:1.25 Sat Aug 29 23:00:10 2020
+++ src/sys/arch/macppc/conf/std.macppc Thu Jul 14 11:10:02 2022
@@ -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 @@ options INTSTK=0x2000
# 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"
Index: src/sys/arch/macppc/conf/std.macppc.g5
diff -u src/sys/arch/macppc/conf/std.macppc.g5:1.3 src/sys/arch/macppc/conf/std.macppc.g5:1.4
--- src/sys/arch/macppc/conf/std.macppc.g5:1.3 Thu Dec 11 05:42:18 2008
+++ src/sys/arch/macppc/conf/std.macppc.g5 Thu Jul 14 11:10:02 2022
@@ -16,5 +16,7 @@ options EXEC_SCRIPT # shell script supp
options INTSTK=0x2000
+options UKBD_LAYOUT="(KB_US | KB_APPLE)"
+
# Atheros HAL options
include "external/isc/atheros_hal/conf/std.ath_hal"
