Changeset 2bc137c2 in mainline for uspace/fb/fb.c

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:

• uspace/fb/fb.c (modified) (12 diffs)

uspace/fb/fb.c

@@ -50 +50 @@
 #include <ipc/services.h>
 #include <kernel/errno.h>
+#include <kernel/genarch/fb/visuals.h>
 #include <async.h>
+#include <bool.h>
 
 #include "font-8x16.h"
@@ -148 +150 @@
 
 /* Conversion routines between different color representations */
-static void rgb_4byte(void *dst, int rgb)
+static void rgb_byte0888(void *dst, int rgb)
 {
         *(int *)dst = rgb;
 }
 
-static int byte4_rgb(void *src)
+static int byte0888_rgb(void *src)
 {
         return (*(int *)src) & 0xffffff;
 }
 
-static void rgb_3byte(void *dst, int rgb)
+static void rgb_byte888(void *dst, int rgb)
 {
         uint8_t *scr = dst;
@@ -172 +174 @@
 }
 
-static int byte3_rgb(void *src)
+static int byte888_rgb(void *src)
 {
         uint8_t *scr = src;
@@ -182 +184 @@
 }
 
+/**  16-bit depth (5:5:5) */
+static void rgb_byte555(void *dst, int rgb)
+{
+        /* 5-bit, 5-bits, 5-bits */ 
+        *((uint16_t *)(dst)) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 | BLUE(rgb, 5);
+}
+
+/** 16-bit depth (5:5:5) */
+static int byte555_rgb(void *src)
+{
+        int color = *(uint16_t *)(src);
+        return (((color >> 10) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x1f) << (8 + 3)) | ((color & 0x1f) << 3);
+}
+
 /**  16-bit depth (5:6:5) */
-static void rgb_2byte(void *dst, int rgb)
+static void rgb_byte565(void *dst, int rgb)
 {
         /* 5-bit, 6-bits, 5-bits */ 
@@ -190 +206 @@
 
 /** 16-bit depth (5:6:5) */
-static int byte2_rgb(void *src)
+static int byte565_rgb(void *src)
 {
         int color = *(uint16_t *)(src);
@@ -197 +213 @@
 
 /** Put pixel - 8-bit depth (3:2:3) */
-static void rgb_1byte(void *dst, int rgb)
+static void rgb_byte8(void *dst, int rgb)
 {
         *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
@@ -203 +219 @@
 
 /** Return pixel color - 8-bit depth (3:2:3) */
-static int byte1_rgb(void *src)
+static int byte8_rgb(void *src)
 {
         int color = *(uint8_t *)src;
@@ -453 +469 @@
 /** Initialize framebuffer as a chardev output device
  *
- * @param addr Address of theframebuffer
- * @param xres Screen width in pixels
- * @param yres Screen height in pixels
- * @param bpp  Bits per pixel (8, 16, 24, 32)
- * @param scan Bytes per one scanline
- * @param align Alignment for 24bpp mode.
+ * @param addr          Address of theframebuffer
+ * @param xres          Screen width in pixels
+ * @param yres          Screen height in pixels
+ * @param visual        Bits per pixel (8, 16, 24, 32)
+ * @param scan          Bytes per one scanline
  * @param invert_colors Inverted colors.
  *
  */
-static void
-screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan,
-        int align, int invert_colors)
-{
-        switch (bpp) {
-        case 8:
-                screen.rgb2scr = rgb_1byte;
-                screen.scr2rgb = byte1_rgb;
+static bool screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int scan, unsigned int visual, bool invert_colors)
+{
+        switch (visual) {
+        case VISUAL_INDIRECT_8:
+                screen.rgb2scr = rgb_byte8;
+                screen.scr2rgb = byte8_rgb;
                 screen.pixelbytes = 1;
                 break;
-        case 16:
-                screen.rgb2scr = rgb_2byte;
-                screen.scr2rgb = byte2_rgb;
+        case VISUAL_RGB_5_5_5:
+                screen.rgb2scr = rgb_byte555;
+                screen.scr2rgb = byte555_rgb;
                 screen.pixelbytes = 2;
                 break;
-        case 24:
-                screen.rgb2scr = rgb_3byte;
-                screen.scr2rgb = byte3_rgb;
-                if (!align)
-                        screen.pixelbytes = 3;
-                else
-                        screen.pixelbytes = 4;
-                break;
-        case 32:
-                screen.rgb2scr = rgb_4byte;
-                screen.scr2rgb = byte4_rgb;
+        case VISUAL_RGB_5_6_5:
+                screen.rgb2scr = rgb_byte565;
+                screen.scr2rgb = byte565_rgb;
+                screen.pixelbytes = 2;
+                break;
+        case VISUAL_RGB_8_8_8:
+                screen.rgb2scr = rgb_byte888;
+                screen.scr2rgb = byte888_rgb;
+                screen.pixelbytes = 3;
+                break;
+        case VISUAL_RGB_8_8_8_0:
+                screen.rgb2scr = rgb_byte888;
+                screen.scr2rgb = byte888_rgb;
                 screen.pixelbytes = 4;
                 break;
+        case VISUAL_RGB_0_8_8_8:
+                screen.rgb2scr = rgb_byte0888;
+                screen.scr2rgb = byte0888_rgb;
+                screen.pixelbytes = 4;
+                break;
+        default:
+                return false;
         }
 
@@ -499 +521 @@
         
         /* Create first viewport */
-        viewport_create(0,0,xres,yres);
+        viewport_create(0, 0, xres, yres);
+        
+        return true;
 }
 
@@ -1227 +1251 @@
         unsigned int fb_width;
         unsigned int fb_height;
-        unsigned int fb_bpp;
-        unsigned int fb_bpp_align;
         unsigned int fb_scanline;
-        unsigned int fb_invert_colors;
+        unsigned int fb_visual;
+        bool fb_invert_colors;
         void *fb_addr;
         size_t asz;
@@ -1239 +1262 @@
         fb_width = sysinfo_value("fb.width");
         fb_height = sysinfo_value("fb.height");
-        fb_bpp = sysinfo_value("fb.bpp");
-        fb_bpp_align = sysinfo_value("fb.bpp-align");
         fb_scanline = sysinfo_value("fb.scanline");
+        fb_visual = sysinfo_value("fb.visual");
         fb_invert_colors = sysinfo_value("fb.invert-colors");
 
-        asz = fb_scanline*fb_height;
+        asz = fb_scanline * fb_height;
         fb_addr = as_get_mappable_page(asz);
         
@@ -1250 +1272 @@
                     AS_AREA_READ | AS_AREA_WRITE);
 
-        screen_init(fb_addr, fb_width, fb_height, fb_bpp, fb_scanline, fb_bpp_align, fb_invert_colors);
-        return 0;
+        if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual, fb_invert_colors))
+                return 0;
+        
+        return -1;
 }