Hi,

Attached is a patch to genfb to make it possible to have serial console
but still have genfb enabled.  I'm slightly worried this will break
genfb console on non-x86 machines however, so I'd like some testing.
At the very least a list of machines that need testing would be useful.

        Jonathan Kollasch
Index: sys/dev/wsfb/genfb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/wsfb/genfb.c,v
retrieving revision 1.51
diff -d -u -a -p -r1.51 genfb.c
--- sys/dev/wsfb/genfb.c	9 Oct 2013 17:20:54 -0000	1.51
+++ sys/dev/wsfb/genfb.c	30 Dec 2013 14:12:59 -0000
@@ -99,6 +99,7 @@ genfb_init(struct genfb_softc *sc)
 	printf(prop_dictionary_externalize(dict));
 #endif
 	prop_dictionary_get_bool(dict, "is_console", &console);
+	console = console && (genfb_is_console() != 0);
 
 	if (!prop_dictionary_get_uint32(dict, "width", &sc->sc_width)) {
 		GPRINTF("no width property\n");
@@ -205,6 +206,7 @@ genfb_attach(struct genfb_softc *sc, str
 
 	dict = device_properties(sc->sc_dev);
 	prop_dictionary_get_bool(dict, "is_console", &console);
+	console = console && (genfb_is_console() != 0);
 
 	if (prop_dictionary_get_uint16(dict, "cursor-row", &crow) == false)
 		crow = 0;

Reply via email to