[src/trunk]: src/sys/arch/x86/pci Stopgap to prevent genfb from stealing cons...

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

details:   https://anonhg.NetBSD.org/src/rev/99d1d6abc80c
branches:  trunk
changeset: 326383:99d1d6abc80c
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Jan 27 23:11:50 2014 +0000

description:
Stopgap to prevent genfb from stealing console.  Revisit later.

diffstat:

 sys/arch/x86/pci/pci_machdep.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r bde9f8137768 -r 99d1d6abc80c sys/arch/x86/pci/pci_machdep.c
--- a/sys/arch/x86/pci/pci_machdep.c    Mon Jan 27 21:37:17 2014 +0000
+++ b/sys/arch/x86/pci/pci_machdep.c    Mon Jan 27 23:11:50 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.64 2014/01/26 10:54:24 msaitoh Exp $ */
+/*     $NetBSD: pci_machdep.c,v 1.65 2014/01/27 23:11:50 jakllsch Exp $        */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.64 2014/01/26 10:54:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.65 2014/01/27 23:11:50 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -938,6 +938,13 @@
                                }
 #endif
                        }
+#if 1 && NWSDISPLAY > 0 && NGENFB > 0
+                       /* XXX */
+                       if (device_is_a(dev, "genfb")) {
+                               prop_dictionary_set_bool(dict, "is_console",
+                                   genfb_is_console());
+                       } else
+#endif
                        prop_dictionary_set_bool(dict, "is_console", true);
 
                        prop_dictionary_set_bool(dict, "clear-screen", false);