Changeset b50b5af2 in mainline for kernel/arch/sparc64/src/drivers/scr.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/sparc64/src/drivers/scr.c (modified) (2 diffs)

kernel/arch/sparc64/src/drivers/scr.c

@@ -35 +35 @@
 #include <arch/drivers/scr.h>
 #include <genarch/ofw/ofw_tree.h>
+#include <genarch/ofw/pci.h>
+#include <genarch/ofw/sbus.h>
+#include <genarch/ofw/upa.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
+#include <console/chardev.h>
+#include <console/console.h>
 #include <arch/types.h>
 #include <string.h>
@@ -235 +240 @@
                 .visual = visual,
         };
-        fb_init(&props);
+        
+        outdev_t *fbdev = fb_init(&props);
+        if (fbdev)
+                stdout_wire(fbdev);
 }
 
-void scr_redraw(void)
-{
-        fb_redraw();
-}
-
 /** @}
  */