Changeset 2bc137c2 in mainline for kernel/arch/sparc64

Timestamp:

2006-11-22T12:36:59Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ccb0cbc

Parents:

33dc0ad

Message:

make framebuffer code more generic

File:

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

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

@@ -36 +36 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <genarch/fb/fb.h>
+#include <genarch/fb/visuals.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -76 +77 @@
         uint32_t fb_linebytes = 0;
         uint32_t fb_scanline = 0;
+        unsigned int visual;
 
         prop = ofw_tree_getprop(node, "width");
@@ -116 +118 @@
                         return;
                 }
-
-                if (fb_depth == 24)
+                
+                switch (fb_depth) {
+                case 8:
+                        fb_scanline = fb_linebytes * (fb_depth >> 3);
+                        visual = VISUAL_INDIRECT_8;
+                        break;
+                case 16:
+                        fb_scanline = fb_linebytes * (fb_depth >> 3);
+                        visual = VISUAL_RGB_5_6_5;
+                        break;
+                case 24:
                         fb_scanline = fb_linebytes * 4;
-                else
+                        visual = VISUAL_RGB_8_8_8_0;
+                        break;
+                case 32:
                         fb_scanline = fb_linebytes * (fb_depth >> 3);
+                        visual = VISUAL_RGB_0_8_8_8;
+                        break;
+                default:
+                        printf("Unsupported bits per pixel.\n");
+                        return;
+                }
                 
                 break;
         case SCR_FFB:   
-                fb_depth = 32;
                 fb_scanline = 8192;
+                visual = VISUAL_RGB_0_8_8_8;
 
                 ofw_upa_reg_t *reg = &((ofw_upa_reg_t *) prop->value)[FFB_REG_24BPP];
@@ -138 +157 @@
         }
 
-        fb_init(fb_addr, fb_width, fb_height, fb_depth, fb_scanline, true);
+        fb_init(fb_addr, fb_width, fb_height, fb_scanline, visual);
 }