[src/trunk]: src/sys/dev/fdt Always set "is_console" property to true when WS...

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

details:   https://anonhg.NetBSD.org/src/rev/e2fc05d0def7
branches:  trunk
changeset: 828541:e2fc05d0def7
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Dec 18 19:06:32 2017 +0000

description:
Always set "is_console" property to true when WSDISPLAY_MULTICONS is defined

diffstat:

 sys/dev/fdt/simplefb.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 558a505ed05b -r e2fc05d0def7 sys/dev/fdt/simplefb.c
--- a/sys/dev/fdt/simplefb.c    Mon Dec 18 19:00:42 2017 +0000
+++ b/sys/dev/fdt/simplefb.c    Mon Dec 18 19:06:32 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: simplefb.c,v 1.2 2017/09/04 18:01:28 jmcneill Exp $ */
+/* $NetBSD: simplefb.c,v 1.3 2017/12/18 19:06:32 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -26,8 +26,10 @@
  * SUCH DAMAGE.
  */
 
+#include "opt_wsdisplay_compat.h"
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: simplefb.c,v 1.2 2017/09/04 18:01:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simplefb.c,v 1.3 2017/12/18 19:06:32 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -177,13 +179,16 @@
        ops.genfb_ioctl = simplefb_ioctl;
        ops.genfb_mmap = simplefb_mmap;
 
+#ifdef WSDISPLAY_MULTICONS
+       const bool is_console = true;
+#else
        const bool is_console = phandle == simplefb_console_phandle;
-
-       prop_dictionary_set_bool(dict, "is_console", is_console);
-
        if (is_console)
                aprint_normal_dev(sc->sc_gen.sc_dev,
                    "switching to framebuffer console\n");
+#endif
+
+       prop_dictionary_set_bool(dict, "is_console", is_console);
 
        genfb_attach(&sc->sc_gen, &ops);