Module Name: src
Committed By: scole
Date: Wed Dec 11 21:04:47 UTC 2019
Modified Files:
src/sys/arch/macppc/conf: GENERIC_601 INSTALL_601
src/sys/arch/macppc/dev: platinumfb.c
Log Message:
Synchronize htdocs, manual, comments, and code so that enabling the platinumfb
is done using "platinum" in openfirmware settings. Remove "screen" option
which was somewhat disingenuous.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/conf/INSTALL_601
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/platinumfb.c
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_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.24 src/sys/arch/macppc/conf/GENERIC_601:1.25
--- src/sys/arch/macppc/conf/GENERIC_601:1.24 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/macppc/conf/GENERIC_601 Wed Dec 11 21:04:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.24 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: GENERIC_601,v 1.25 2019/12/11 21:04:47 scole 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.24 $"
+ident "GENERIC-$Revision: 1.25 $"
maxusers 32
@@ -217,8 +217,8 @@ ahc* at pci? dev ? function ? # Adaptec
# official Macintosh firmware from 3Dfx. The others should work but are
# untested with OF 1.0.5
-# this will take over the console if output-device is set to 'screen' or
-# 'platinum'. It will provide a NetBSD console, but still won't work with OF
+# this will take over the console if output-device is set to 'platinum'.
+# It will provide a NetBSD console, but still won't work with OF
platinumfb0 at mainbus?
#gffb* at pci? function ? # NVIDIA GeForce2 MX
Index: src/sys/arch/macppc/conf/INSTALL_601
diff -u src/sys/arch/macppc/conf/INSTALL_601:1.3 src/sys/arch/macppc/conf/INSTALL_601:1.4
--- src/sys/arch/macppc/conf/INSTALL_601:1.3 Sun Dec 8 21:30:00 2019
+++ src/sys/arch/macppc/conf/INSTALL_601 Wed Dec 11 21:04:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_601,v 1.3 2019/12/08 21:30:00 scole Exp $
+# $NetBSD: INSTALL_601,v 1.4 2019/12/11 21:04:47 scole Exp $
#
# config file for INSTALL
#
@@ -82,8 +82,8 @@ ahc* at pci? dev ? function ? # Adaptec
# The only cards known to work ( so far ) are PCI Voodoo3s flashed with the
# official Macintosh firmware from 3Dfx. The others should work but are
# untested with OF 1.0.5
-# this will take over the console if output-device is set to 'screen' or
-# 'platinum'. It will provide a NetBSD console, but still won't work with OF
+# this will take over the console if output-device is set to 'platinum'.
+# It will provide a NetBSD console, but still won't work with OF
platinumfb0 at mainbus?
#gffb* at pci? function ? # NVIDIA GeForce2 MX
Index: src/sys/arch/macppc/dev/platinumfb.c
diff -u src/sys/arch/macppc/dev/platinumfb.c:1.3 src/sys/arch/macppc/dev/platinumfb.c:1.4
--- src/sys/arch/macppc/dev/platinumfb.c:1.3 Fri Sep 16 17:32:36 2016
+++ src/sys/arch/macppc/dev/platinumfb.c Wed Dec 11 21:04:47 2019
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.3 2016/09/16 17:32:36 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.4 2019/12/11 21:04:47 scole Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -569,8 +569,8 @@ platinumfb_init(device_t self)
int i;
/*
- * become console if OF variable "output-device" is "screen" or
- * contains "platinum", since normal OF video variables are unavailable
+ * become console if OF variable "output-device" contains "platinum",
+ * since normal OF video variables are unavailable
*/
int options;
char output_device[128];
@@ -582,8 +582,7 @@ platinumfb_init(device_t self)
aprint_error_dev(sc->sc_dev,
"could not get output-device prop, assuming not console\n");
} else {
- if (strstr(output_device,"platinum") ||
- strcmp(output_device,"screen") == 0 ) {
+ if (strstr(output_device,"platinum")) {
is_console = TRUE;
}
}
