WebSVN – HelenOS – Diff – /trunk/kernel/genarch/src/fb/fb.c

  */
 /** @file
  */
 #include <genarch/fb/font-8x16.h>
+#include <genarch/fb/visuals.h>
 #include <genarch/fb/fb.h>
 #include <console/chardev.h>
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
 #include <mm/slab.h>
 static int dboffset;
 static unsigned int xres = 0;
 static unsigned int yres = 0;
 static unsigned int scanline = 0;
-static unsigned int bitspp = 0;
 static unsigned int pixelbytes = 0;
 #ifdef FB_INVERT_COLORS
 static bool invert_colors = true;
 #else
 static bool invert_colors = false;
+{
     return invert_colors ? ~color : color;
+}
 /* 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;
 #if defined(FB_INVERT_ENDIAN)
     scr[0] = RED(rgb, 8);
     scr[1] = GREEN(rgb, 8);
     scr[1] = GREEN(rgb, 8);
     scr[0] = BLUE(rgb, 8);
 #endif
+}
-static int byte3_rgb(void *src)
+static int byte888_rgb(void *src)
+{
     uint8_t *scr = src;
 #if defined(FB_INVERT_ENDIAN)
     return scr[0] << 16 | scr[1] << 8 | scr[2];
 #else
     return scr[2] << 16 | scr[1] << 8 | scr[0];
 #endif
+}
+/**  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 */
     *((uint16_t *) dst) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5);
+}
 /** 16-bit depth (5:6:5) */
-static int byte2_rgb(void *src)
+static int byte565_rgb(void *src)
+{
     int color = *(uint16_t *)(src);
     return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
+}
  * will most likely use a color palette. The color appearance
  * will be pretty random and depend on the default installed
  * palette. This could be fixed by supporting custom palette
  * and setting it to simulate the 8-bit truecolor.
  */
-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);
+}
 /** Return pixel color - 8-bit depth (color palette/3:2:3)
+ *
- * See the comment for rgb_1byte().
+ * See the comment for rgb_byte().
  */
-static int byte1_rgb(void *src)
+static int byte8_rgb(void *src)
+{
     int color = *(uint8_t *)src;
     return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
+}
+{
     uint8_t *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
     int firstsz;
     if (dbbuffer) {
-        memcpy(&dbbuffer[dboffset * scanline], blankline, FONT_SCANLINES * scanline);
+        memcpy(&dbbuffer[dboffset * scanline], blankline, ROW_BYTES);
         dboffset = (dboffset + FONT_SCANLINES) % yres;
         firstsz = yres - dboffset;
         memcpy(fbaddress, &dbbuffer[scanline * dboffset], firstsz * scanline);
 };
 /** Initialize framebuffer as a chardev output device
+ *
- * @param addr  Physical address of the framebuffer
+ * @param addr   Physical address of the framebuffer
- * @param x     Screen width in pixels
+ * @param x      Screen width in pixels
- * @param y     Screen height in pixels
+ * @param y      Screen height in pixels
- * @param bpp   Bits per pixel (8, 16, 24, 32)
- * @param scan  Bytes per one scanline
+ * @param scan   Bytes per one scanline
- * @param align Request alignment for 24bpp mode.
+ * @param visual Color model
+ *
  */
-void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan, bool align)
+void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int scan, unsigned int visual)
+{
-    switch (bpp) {
+    switch (visual) {
-    case 8:
+    case VISUAL_INDIRECT_8:
-        rgb2scr = rgb_1byte;
+        rgb2scr = rgb_byte8;
-        scr2rgb = byte1_rgb;
+        scr2rgb = byte8_rgb;
         pixelbytes = 1;
         break;
+    case VISUAL_RGB_5_5_5:
+        rgb2scr = rgb_byte555;
+        scr2rgb = byte555_rgb;
+        pixelbytes = 2;
-    case 16:
+        break;
+    case VISUAL_RGB_5_6_5:
-        rgb2scr = rgb_2byte;
+        rgb2scr = rgb_byte565;
-        scr2rgb = byte2_rgb;
+        scr2rgb = byte565_rgb;
         pixelbytes = 2;
         break;
-    case 24:
+    case VISUAL_RGB_8_8_8:
-        rgb2scr = rgb_3byte;
+        rgb2scr = rgb_byte888;
-        scr2rgb = byte3_rgb;
+        scr2rgb = byte888_rgb;
-        if (align)
-            pixelbytes = 4;
+        pixelbytes = 3;
-        else
+        break;
+    case VISUAL_RGB_8_8_8_0:
+        rgb2scr = rgb_byte888;
+        scr2rgb = byte888_rgb;
-            pixelbytes = 3;
+        pixelbytes = 4;
         break;
-    case 32:
+    case VISUAL_RGB_0_8_8_8:
-        rgb2scr = rgb_4byte;
+        rgb2scr = rgb_byte0888;
-        scr2rgb = byte4_rgb;
+        scr2rgb = byte0888_rgb;
         pixelbytes = 4;
         break;
     default:
-        panic("Unsupported bpp.\n");
+        panic("Unsupported visual.\n");
+    }
     unsigned int fbsize = scan * y;
     /* Map the framebuffer */
     fbaddress = (uint8_t *) hw_map((uintptr_t) addr, fbsize);
     xres = x;
     yres = y;
-    bitspp = bpp;
     scanline = scan;
     rows = y / FONT_SCANLINES;
     columns = x / COL_WIDTH;
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 1);
     sysinfo_set_item_val("fb.width", NULL, xres);
     sysinfo_set_item_val("fb.height", NULL, yres);
-    sysinfo_set_item_val("fb.bpp", NULL, bpp);
-    sysinfo_set_item_val("fb.bpp-align", NULL, align);
     sysinfo_set_item_val("fb.scanline", NULL, scan);
+    sysinfo_set_item_val("fb.visual", NULL, visual);
     sysinfo_set_item_val("fb.address.physical", NULL, addr);
     sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
     /* Allocate double buffer */
     unsigned int order = fnzb(SIZE2FRAMES(ALIGN_UP(fbsize, FRAME_SIZE))) + 1;

Subversion Repositories HelenOS

(root)/trunk/kernel/genarch/src/fb/fb.c – Rev 1991 → 1993