WebSVN – HelenOS – Diff – /branches/dd/kernel/genarch/src/fb/fb.c

+}
 /* Conversion routines between different color representations */
 static void rgb_4byte(void *dst, int rgb)
+{
-    *(int *)dst = rgb;
+    *((int *) dst) = rgb;
+}
 static int byte4_rgb(void *src)
+{
-    return (*(int *)src) & 0xffffff;
+    return (*((int *) src)) & 0xffffff;
+}
 static void rgb_3byte(void *dst, int rgb)
+{
     uint8_t *scr = dst;
 /**  16-bit depth (5:6:5) */
 static void rgb_2byte(void *dst, int rgb)
+{
     /* 5-bit, 6-bits, 5-bits */
-    *((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5);
+    *((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)
+{
  * 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)
+{
-    *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
+    *((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().
     return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
+}
 static void putpixel(unsigned int x, unsigned int y, int color)
+{
-    (*rgb2scr)(&fbaddress[POINTPOS(x,y)], COLOR(color));
+    (*rgb2scr)(&fbaddress[POINTPOS(x, y)], COLOR(color));
     if (dbbuffer) {
         int dline = (y + dboffset) % yres;
-        (*rgb2scr)(&dbbuffer[POINTPOS(x,dline)], COLOR(color));
+        (*rgb2scr)(&dbbuffer[POINTPOS(x, dline)], COLOR(color));
+    }
+}
 /** Get pixel from viewport */
 static int getpixel(unsigned int x, unsigned int y)
+{
     if (dbbuffer) {
         int dline = (y + dboffset) % yres;
-        return COLOR((*scr2rgb)(&dbbuffer[POINTPOS(x,dline)]));
+        return COLOR((*scr2rgb)(&dbbuffer[POINTPOS(x, dline)]));
+    }
-    return COLOR((*scr2rgb)(&fbaddress[POINTPOS(x,y)]));
+    return COLOR((*scr2rgb)(&fbaddress[POINTPOS(x, y)]));
+}
 /** Fill screen with background color */
 static void clear_screen(void)
+{
     unsigned int y;
     for (y = 0; y < yres; y++) {
-        memcpy(&fbaddress[scanline*y], blankline, xres*pixelbytes);
+        memcpy(&fbaddress[scanline * y], blankline, xres * pixelbytes);
         if (dbbuffer)
-            memcpy(&dbbuffer[scanline*y], blankline, xres*pixelbytes);
+            memcpy(&dbbuffer[scanline * y], blankline, xres * pixelbytes);
+    }
+}
 /** Scroll screen one row up */
+{
     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, FONT_SCANLINES * scanline);
         dboffset = (dboffset + FONT_SCANLINES) % yres;
-        firstsz = yres-dboffset;
+        firstsz = yres - dboffset;
-        memcpy(fbaddress, &dbbuffer[scanline*dboffset], firstsz*scanline);
+        memcpy(fbaddress, &dbbuffer[scanline * dboffset], firstsz * scanline);
-        memcpy(&fbaddress[firstsz*scanline], dbbuffer, dboffset*scanline);
+        memcpy(&fbaddress[firstsz * scanline], dbbuffer, dboffset * scanline);
     } else {
         memcpy((void *) fbaddress, (void *) &fbaddress[ROW_BYTES], scanline * yres - ROW_BYTES);
         /* Clear last row */
         memcpy((void *) lastline, (void *) blankline, ROW_BYTES);
+    }
  * @param align Request alignment for 24bpp mode.
  */
 void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan, bool align)
+{
     switch (bpp) {
-    case 8:
+        case 8:
-        rgb2scr = rgb_1byte;
+            rgb2scr = rgb_1byte;
-        scr2rgb = byte1_rgb;
+            scr2rgb = byte1_rgb;
-        pixelbytes = 1;
+            pixelbytes = 1;
-        break;
+            break;
-    case 16:
+        case 16:
-        rgb2scr = rgb_2byte;
+            rgb2scr = rgb_2byte;
-        scr2rgb = byte2_rgb;
+            scr2rgb = byte2_rgb;
-        pixelbytes = 2;
+            pixelbytes = 2;
-        break;
+            break;
-    case 24:
+        case 24:
-        rgb2scr = rgb_3byte;
+            rgb2scr = rgb_3byte;
-        scr2rgb = byte3_rgb;
+            scr2rgb = byte3_rgb;
-        if (align)
+            if (align)
+                pixelbytes = 4;
+            else
+                pixelbytes = 3;
+            break;
+        case 32:
+            rgb2scr = rgb_4byte;
+            scr2rgb = byte4_rgb;
             pixelbytes = 4;
-        else
-            pixelbytes = 3;
-        break;
+            break;
-    case 32:
-        rgb2scr = rgb_4byte;
-        scr2rgb = byte4_rgb;
-        pixelbytes = 4;
-        break;
-    default:
+        default:
-        panic("Unsupported bpp.\n");
+            panic("Unsupported bpp.\n");
+    }
     unsigned int fbsize = scan * y;
     /* Map the framebuffer */
     sysinfo_set_item_val("fb.scanline", NULL, scan);
     sysinfo_set_item_val("fb.address.physical", NULL, addr);
     sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
     /* Allocate double buffer */
-    int totsize = scanline * yres;
-    int pages = SIZE2FRAMES(totsize);
+    unsigned int order = fnzb(SIZE2FRAMES(ALIGN_UP(fbsize, FRAME_SIZE))) + 1;
-    int order;
-    if (pages == 1)
-        order = 0;
-    else
-        order = fnzb(pages - 1) + 1;
-    dbbuffer = frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+    dbbuffer = (uint8_t * ) frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
     if (!dbbuffer)
         printf("Failed to allocate scroll buffer.\n");
     dboffset = 0;
     /* Initialized blank line */
     blankline = (uint8_t *) malloc(ROW_BYTES, FRAME_ATOMIC);
     if (!blankline)
         panic("Failed to allocate blank line for framebuffer.");
-    for (y=0; y < FONT_SCANLINES; y++) {
+    for (y = 0; y < FONT_SCANLINES; y++)
-        for (x=0; x < xres; x++) {
+        for (x = 0; x < xres; x++)
-            (*rgb2scr)(&blankline[POINTPOS(x,y)], COLOR(BGCOLOR));
+            (*rgb2scr)(&blankline[POINTPOS(x, y)], COLOR(BGCOLOR));
-        }
-    }
     clear_screen();
     /* Update size of screen to match text area */
     yres = rows * FONT_SCANLINES;
     draw_logo(xres - helenos_width, 0);
     invert_cursor();
     chardev_initialize("fb", &framebuffer, &fb_ops);
     stdout = &framebuffer;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/kernel/genarch/src/fb/fb.c @ 4688 – Rev 1981 → 1990