Module Name: src
Committed By: macallan
Date: Wed Mar 13 21:18:35 UTC 2013
Modified Files:
src/sys/arch/evbmips/loongson: gdium_machdep.c
Log Message:
make sure device properties for genfb or voyagerfb actually get set
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/loongson/gdium_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/evbmips/loongson/gdium_machdep.c
diff -u src/sys/arch/evbmips/loongson/gdium_machdep.c:1.5 src/sys/arch/evbmips/loongson/gdium_machdep.c:1.6
--- src/sys/arch/evbmips/loongson/gdium_machdep.c:1.5 Sat Oct 27 17:17:50 2012
+++ src/sys/arch/evbmips/loongson/gdium_machdep.c Wed Mar 13 21:18:35 2013
@@ -240,6 +240,20 @@ gdium_device_register(device_t dev, void
static int gkey_chain_pos = 0;
static device_t lastparent = NULL;
+ if (device_is_a(dev, "genfb") || device_is_a(dev, "voyagerfb")) {
+ dict = device_properties(dev);
+ /*
+ * this is a hack
+ * is_console needs to be checked against reality
+ */
+ prop_dictionary_set_bool(dict, "is_console", 1);
+ prop_dictionary_set_uint32(dict, "width", 1024);
+ prop_dictionary_set_uint32(dict, "height", 600);
+ prop_dictionary_set_uint32(dict, "depth", 16);
+ prop_dictionary_set_uint32(dict, "linebytes", 2048);
+ if (fb_addr != 0)
+ prop_dictionary_set_uint32(dict, "address", fb_addr);
+ }
if (device_parent(dev) != lastparent && gkey_chain_pos != 0)
return;
@@ -284,21 +298,6 @@ gdium_device_register(device_t dev, void
break;
}
- if (device_is_a(dev, "genfb") || device_is_a(dev, "voyagerfb")) {
- dict = device_properties(dev);
- /*
- * this is a hack
- * is_console needs to be checked against reality
- */
- prop_dictionary_set_bool(dict, "is_console", 1);
- prop_dictionary_set_uint32(dict, "width", 1024);
- prop_dictionary_set_uint32(dict, "height", 600);
- prop_dictionary_set_uint32(dict, "depth", 16);
- prop_dictionary_set_uint32(dict, "linebytes", 2048);
- if (fb_addr != 0)
- prop_dictionary_set_uint32(dict, "address", fb_addr);
- }
-
return;
advance:
