Module Name: src
Committed By: jmcneill
Date: Mon Dec 18 19:06:32 UTC 2017
Modified Files:
src/sys/dev/fdt: simplefb.c
Log Message:
Always set "is_console" property to true when WSDISPLAY_MULTICONS is defined
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/simplefb.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/dev/fdt/simplefb.c
diff -u src/sys/dev/fdt/simplefb.c:1.2 src/sys/dev/fdt/simplefb.c:1.3
--- src/sys/dev/fdt/simplefb.c:1.2 Mon Sep 4 18:01:28 2017
+++ src/sys/dev/fdt/simplefb.c Mon Dec 18 19:06:32 2017
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ simplefb_attach_genfb(struct simplefb_so
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);
