Changes in kernel/genarch/src/fb/fb.c [b9c7425:19490ce] in mainline

File:

• kernel/genarch/src/fb/fb.c (modified) (4 diffs)

kernel/genarch/src/fb/fb.c

@@ -458 +458 @@
  *
  */
-bool fb_init(fb_properties_t *props)
-{
-        ASSERT(props);
-        ASSERT(props->x > 0);
-        ASSERT(props->y > 0);
-        ASSERT(props->scan > 0);
-        
+void fb_init(fb_properties_t *props)
+{
         switch (props->visual) {
         case VISUAL_INDIRECT_8:
@@ -511 +506 @@
                 break;
         default:
-                LOG("Unsupported visual.");
-                return false;
+                panic("Unsupported visual.");
         }
         
@@ -542 +536 @@
         size_t glyphsize = FONT_GLYPHS * glyphbytes;
         
+        backbuf = (uint16_t *) malloc(bbsize, 0);
+        if (!backbuf)
+                panic("Unable to allocate backbuffer.");
+        
+        glyphs = (uint8_t *) malloc(glyphsize, 0);
+        if (!glyphs)
+                panic("Unable to allocate glyphs.");
+        
+        bgscan = malloc(bgscanbytes, 0);
+        if (!bgscan)
+                panic("Unable to allocate background pixel.");
+        
+        memsetw(backbuf, cols * rows, 0);
+        
+        glyphs_render();
+        
         fb_addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
-        if (!fb_addr) {
-                LOG("Unable to map framebuffer.");
-                return false;
-        }
-        
-        backbuf = (uint16_t *) malloc(bbsize, 0);
-        if (!backbuf) {
-                LOG("Unable to allocate backbuffer.");
-                return false;
-        }
-        
-        glyphs = (uint8_t *) malloc(glyphsize, 0);
-        if (!glyphs) {
-                free(backbuf);
-                LOG("Unable to allocate glyphs.");
-                return false;
-        }
-        
-        bgscan = malloc(bgscanbytes, 0);
-        if (!bgscan) {
-                free(glyphs);
-                free(backbuf);
-                LOG("Unable to allocate background pixel.");
-                return false;
-        }
-        
-        memsetw(backbuf, cols * rows, 0);
-        glyphs_render();
         
         sysinfo_set_item_val("fb", NULL, true);
@@ -583 +565 @@
         
         outdev_initialize("fb", &fb_console, &fb_ops);
-        stdout_wire(&fb_console);
-        
-        return true;
+        stdout = &fb_console;
 }