Module Name: src
Committed By: jakllsch
Date: Mon Jan 27 23:11:50 UTC 2014
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Log Message:
Stopgap to prevent genfb from stealing console. Revisit later.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/pci/pci_machdep.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/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.64 src/sys/arch/x86/pci/pci_machdep.c:1.65
--- src/sys/arch/x86/pci/pci_machdep.c:1.64 Sun Jan 26 10:54:24 2014
+++ src/sys/arch/x86/pci/pci_machdep.c Mon Jan 27 23:11:50 2014
@@ -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 @@ device_pci_register(device_t dev, void *
}
#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);
