Changeset b50b5af2 in mainline for kernel/arch/ia32/src/drivers/vesa.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/ia32/src/drivers/vesa.c (modified) (5 diffs)

kernel/arch/ia32/src/drivers/vesa.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -40 +40 @@
 #include <genarch/fb/visuals.h>
 #include <arch/drivers/vesa.h>
+#include <console/chardev.h>
+#include <console/console.h>
 #include <putchar.h>
 #include <mm/page.h>
@@ -66 +68 @@
 uint8_t vesa_blue_pos;
 
-int vesa_present(void)
+bool vesa_init(void)
 {
-        if ((vesa_width != 0xffff) && (vesa_height != 0xffff))
-                return true;
+        if ((vesa_width == 0xffff) || (vesa_height == 0xffff))
+                return false;
         
-        return false;
-}
-
-void vesa_init(void)
-{
-        unsigned int visual;
+        visual_t visual;
         
         switch (vesa_bpp) {
@@ -97 +94 @@
                 break;
         default:
-                panic("Unsupported bits per pixel.");
+                LOG("Unsupported bits per pixel.");
+                return false;
         }
         
@@ -108 +106 @@
                 .visual = visual,
         };
-        fb_init(&vesa_props);
-}
-
-void vesa_redraw(void)
-{
-        fb_redraw();
+        
+        outdev_t *fbdev = fb_init(&vesa_props);
+        if (!fbdev)
+                return false;
+        
+        stdout_wire(fbdev);
+        return true;
 }