[src/trunk]: src Synchronize htdocs, manual, comments, and code so that enabl...

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

details:   https://anonhg.NetBSD.org/src/rev/b64702b9f1d4
branches:  trunk
changeset: 847136:b64702b9f1d4
user:      scole <scole%NetBSD.org@localhost>
date:      Wed Dec 11 21:04:47 2019 +0000

description:
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.

diffstat:

 share/man/man4/man4.macppc/platinumfb.4 |  6 +++---
 sys/arch/macppc/conf/GENERIC_601        |  8 ++++----
 sys/arch/macppc/conf/INSTALL_601        |  6 +++---
 sys/arch/macppc/dev/platinumfb.c        |  9 ++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

diffs (109 lines):

diff -r 375d1bc0e28a -r b64702b9f1d4 share/man/man4/man4.macppc/platinumfb.4
--- a/share/man/man4/man4.macppc/platinumfb.4   Wed Dec 11 21:00:11 2019 +0000
+++ b/share/man/man4/man4.macppc/platinumfb.4   Wed Dec 11 21:04:47 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: platinumfb.4,v 1.4 2016/09/15 15:25:11 wiz Exp $
+.\" $NetBSD: platinumfb.4,v 1.5 2019/12/11 21:05:17 scole Exp $
 .\"
 .\" Copyright (c) 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 14, 2016
+.Dd December 11, 2019
 .Dt PLATINUMFB 4 macppc
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 This driver should support console output (with rastor ops) and X
 (in unaccelerated modes).
 .Pp
-It may be required to set the output-device to 'screen' in Open Firmware.
+It may be required to set the output-device to 'platinum' in Open Firmware.
 .Sh SEE ALSO
 .Xr wsdisplay 4 ,
 .Xr rasops 9
diff -r 375d1bc0e28a -r b64702b9f1d4 sys/arch/macppc/conf/GENERIC_601
--- a/sys/arch/macppc/conf/GENERIC_601  Wed Dec 11 21:00:11 2019 +0000
+++ b/sys/arch/macppc/conf/GENERIC_601  Wed Dec 11 21:04:47 2019 +0000
@@ -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 @@
 
 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 @@
 # 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
diff -r 375d1bc0e28a -r b64702b9f1d4 sys/arch/macppc/conf/INSTALL_601
--- a/sys/arch/macppc/conf/INSTALL_601  Wed Dec 11 21:00:11 2019 +0000
+++ b/sys/arch/macppc/conf/INSTALL_601  Wed Dec 11 21:04:47 2019 +0000
@@ -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 @@
 # 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
diff -r 375d1bc0e28a -r b64702b9f1d4 sys/arch/macppc/dev/platinumfb.c
--- a/sys/arch/macppc/dev/platinumfb.c  Wed Dec 11 21:00:11 2019 +0000
+++ b/sys/arch/macppc/dev/platinumfb.c  Wed Dec 11 21:04:47 2019 +0000
@@ -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 @@
        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 @@
                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;
                }
        }