Changeset 00a020d in mainline

Timestamp:

2009-08-20T16:42:40Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5360cf0

Parents:

824d6dd

Message:

declare unknown visual type and allow fb_init() to fail gracefully

Location:

kernel/genarch

Files:

• include/fb/fb.h (modified) (1 diff)
• include/fb/visuals.h (modified) (1 diff)
• src/fb/fb.c (modified) (4 diffs)

kernel/genarch/include/fb/fb.h

@@ -68 +68 @@
 
 void fb_redraw(void);
-void fb_init(fb_properties_t *props);
+bool fb_init(fb_properties_t *props);
 
 #endif

kernel/genarch/include/fb/visuals.h

@@ -37 +37 @@
 
 typedef enum {
+        VISUAL_UNKNOWN = 0,
         VISUAL_INDIRECT_8,
         VISUAL_RGB_5_5_5_LE,

kernel/genarch/src/fb/fb.c

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