Module Name: src
Committed By: jakllsch
Date: Sun Feb 16 17:55:58 UTC 2025
Modified Files:
src/sys/arch/macppc/conf: GENERIC GENERIC_601 MAMBO POWERMAC
POWERMAC_G5 POWERMAC_G5_11_2
Log Message:
Add and enable WSDISPLAY_CUSTOM_OUTPUT in macppc non-INSTALL kernels.
Indirectly addresses PR 59079 by allowing userland control of default
colors of wsemul wsdisplays.
To generate a diff of this commit:
cvs rdiff -u -r1.380 -r1.381 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/macppc/conf/MAMBO
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/macppc/conf/POWERMAC
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/macppc/conf/POWERMAC_G5
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/conf/POWERMAC_G5_11_2
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/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.380 src/sys/arch/macppc/conf/GENERIC:1.381
--- src/sys/arch/macppc/conf/GENERIC:1.380 Tue Apr 2 22:56:50 2024
+++ src/sys/arch/macppc/conf/GENERIC Sun Feb 16 17:55:57 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.380 2024/04/02 22:56:50 charlotte Exp $
+# $NetBSD: GENERIC,v 1.381 2025/02/16 17:55:57 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.380 $"
+#ident "GENERIC-$Revision: 1.381 $"
maxusers 32
@@ -144,6 +144,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
options FONT_GALLANT12x22
options FONT_QVSS8x15 # a smaller font for lower resolutions
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.32 src/sys/arch/macppc/conf/GENERIC_601:1.33
--- src/sys/arch/macppc/conf/GENERIC_601:1.32 Tue Apr 2 22:56:50 2024
+++ src/sys/arch/macppc/conf/GENERIC_601 Sun Feb 16 17:55:57 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.32 2024/04/02 22:56:50 charlotte Exp $
+# $NetBSD: GENERIC_601,v 1.33 2025/02/16 17:55:57 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.32 $"
+ident "GENERIC-$Revision: 1.33 $"
maxusers 32
@@ -166,6 +166,7 @@ options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
options WSDISPLAY_SCROLLSUPPORT
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
options FONT_GALLANT12x22
options FONT_QVSS8x15 # a smaller font for lower resolutions
options FONT_DROID_SANS_MONO12x22
Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.36 src/sys/arch/macppc/conf/MAMBO:1.37
--- src/sys/arch/macppc/conf/MAMBO:1.36 Mon Jan 29 18:27:13 2024
+++ src/sys/arch/macppc/conf/MAMBO Sun Feb 16 17:55:57 2025
@@ -6,7 +6,7 @@ include "arch/macppc/conf/std.macppc.g5
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.36 $"
+#ident "GENERIC-$Revision: 1.37 $"
maxusers 32
@@ -86,6 +86,7 @@ options MIIVERBOSE # verbose PHY autoco
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
options FONT_GALLANT12x22
# Optional Mac keyboard tweaks
Index: src/sys/arch/macppc/conf/POWERMAC
diff -u src/sys/arch/macppc/conf/POWERMAC:1.71 src/sys/arch/macppc/conf/POWERMAC:1.72
--- src/sys/arch/macppc/conf/POWERMAC:1.71 Mon Sep 16 07:11:08 2019
+++ src/sys/arch/macppc/conf/POWERMAC Sun Feb 16 17:55:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: POWERMAC,v 1.71 2019/09/16 07:11:08 macallan Exp $
+# $NetBSD: POWERMAC,v 1.72 2025/02/16 17:55:58 jakllsch Exp $
#
# POWERMAC config file
#
@@ -54,6 +54,7 @@ options PCIVERBOSE # verbose PCI device
#options ZS_TXDMA # Use dma on zs output
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
+options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
options FONT_GALLANT12x22
# Kernel root file system and dump configuration.
Index: src/sys/arch/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.58 src/sys/arch/macppc/conf/POWERMAC_G5:1.59
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.58 Tue Apr 2 22:56:50 2024
+++ src/sys/arch/macppc/conf/POWERMAC_G5 Sun Feb 16 17:55:58 2025
@@ -110,6 +110,7 @@ options WS_DEFAULT_FG=WSCOL_BLACK
options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
options FONT_GALLANT12x22
# Kernel root file system and dump configuration.
Index: src/sys/arch/macppc/conf/POWERMAC_G5_11_2
diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.25 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.26
--- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.25 Mon Jun 10 15:45:24 2024
+++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Sun Feb 16 17:55:58 2025
@@ -88,6 +88,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
options FONT_GALLANT12x22
# Kernel root file system and dump configuration.
