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

 #include <genarch/fb/fb.h>
 #include <console/chardev.h>
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
 #include <mm/slab.h>
-#include <align.h>
 #include <panic.h>
 #include <memstr.h>
 #include <config.h>
 #include <bitops.h>
 #include <print.h>
 #include <ddi/ddi.h>
+#include <arch/types.h>
+#include <typedefs.h>
 #include "helenos.xbm"
 static parea_t fb_parea;        /**< Physical memory area for fb. */
 SPINLOCK_INITIALIZE(fb_lock);
 static uint8_t *fbaddress = NULL;
 static uint8_t *blankline = NULL;
-static uint8_t *dbbuffer = NULL; /* Buffer for fast scrolling console */
+static uint8_t *dbbuffer = NULL;    /* Buffer for fast scrolling console */
-static int dboffset;
+static index_t dboffset;
 static unsigned int xres = 0;
 static unsigned int yres = 0;
 static unsigned int scanline = 0;
 static unsigned int pixelbytes = 0;
     return (*((int *) src)) & 0xffffff;
+}
 static void bgr_byte0888(void *dst, int rgb)
+{
-    *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 | RED(rgb, 8);
+    *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 | RED(rgb,
+);
+}
 static int byte0888_bgr(void *src)
+{
     int color = *(uint32_t *)(src);
-    return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | ((color >> 16) & 0xff);
+    return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | ((color
+        >> 16) & 0xff);
+}
 static void rgb_byte888(void *dst, int rgb)
+{
     uint8_t *scr = dst;
 /**  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);
+    *((uint16_t *) dst) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 | BLUE(rgb,
+);
+}
 /** 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);
+    return (((color >> 10) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x1f) <<
+        (8 + 3)) | ((color & 0x1f) << 3);
+}
 /**  16-bit depth (5:6:5) */
 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);
+    *((uint16_t *) dst) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb,        5);
+}
 /** 16-bit depth (5:6:5) */
 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);
+    return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) <<
+        (8 + 2)) | ((color & 0x1f) << 3);
+}
 /** Put pixel - 8-bit depth (color palette/3:2:3)
+ *
  * Even though we try 3:2:3 color scheme here, an 8-bit framebuffer
  * palette. This could be fixed by supporting custom palette
  * and setting it to simulate the 8-bit truecolor.
  */
 static void rgb_byte8(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,
+);
+}
 /** Return pixel color - 8-bit depth (color palette/3:2:3)
+ *
  * See the comment for rgb_byte().
  */
 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);
+    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));
     unsigned int y;
     for (y = 0; y < yres; y++) {
         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 */
 static void scroll_screen(void)
+{
-    uint8_t *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
-    int firstsz;
     if (dbbuffer) {
+        count_t first;
         memcpy(&dbbuffer[dboffset * scanline], blankline, ROW_BYTES);
         dboffset = (dboffset + FONT_SCANLINES) % yres;
-        firstsz = yres - dboffset;
+        first = yres - dboffset;
-        memcpy(fbaddress, &dbbuffer[scanline * dboffset], firstsz * scanline);
+        memcpy(fbaddress, &dbbuffer[scanline * dboffset], first *
+            scanline);
-        memcpy(&fbaddress[firstsz * scanline], dbbuffer, dboffset * scanline);
+        memcpy(&fbaddress[first * scanline], dbbuffer, dboffset *
+            scanline);
     } else {
+        uint8_t *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
-        memcpy((void *) fbaddress, (void *) &fbaddress[ROW_BYTES], scanline * yres - ROW_BYTES);
+        memcpy((void *) fbaddress, (void *) &fbaddress[ROW_BYTES],
+            scanline * yres - ROW_BYTES);
         /* Clear last row */
         memcpy((void *) lastline, (void *) blankline, ROW_BYTES);
+    }
+}
 static void draw_glyph(uint8_t glyph, unsigned int col, unsigned int row)
+{
     unsigned int y;
     for (y = 0; y < FONT_SCANLINES; y++)
-        draw_glyph_line(fb_font[glyph * FONT_SCANLINES + y], col * COL_WIDTH, row * FONT_SCANLINES + y);
+        draw_glyph_line(fb_font[glyph * FONT_SCANLINES + y], col *
+            COL_WIDTH, row * FONT_SCANLINES + y);
+}
 /** Invert character at given position */
 static void invert_char(unsigned int col, unsigned int row)
+{
     unsigned int x;
     unsigned int y;
     for (x = 0; x < COL_WIDTH; x++)
         for (y = 0; y < FONT_SCANLINES; y++)
-            invert_pixel(col * COL_WIDTH + x, row * FONT_SCANLINES + y);
+            invert_pixel(col * COL_WIDTH + x, row * FONT_SCANLINES +
+                y);
+}
 /** Draw character at default position */
 static void draw_char(char chr)
+{
     for (y = 0; y < helenos_height; y++)
         for (x = 0; x < helenos_width; x++) {
             byte = helenos_bits[rowbytes * y + x / 8];
             byte >>= x % 8;
             if (byte & 1)
-                putpixel(startx + x, starty + y, COLOR(LOGOCOLOR));
+                putpixel(startx + x, starty + y,
+                    COLOR(LOGOCOLOR));
+        }
+}
 /***************************************************************/
 /* Stdout specific functions */
  * @param y      Screen height in pixels
  * @param scan   Bytes per one scanline
  * @param visual Color model
+ *
  */
-void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int scan, unsigned int visual)
+void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int scan,
+    unsigned int visual)
+{
     switch (visual) {
     case VISUAL_INDIRECT_8:
         rgb2scr = rgb_byte8;
         scr2rgb = byte8_rgb;
     sysinfo_set_item_val("fb.address.color", NULL, PAGE_COLOR((uintptr_t)
         fbaddress));
     sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
     /* Allocate double buffer */
-    unsigned int order = fnzb(SIZE2FRAMES(ALIGN_UP(fbsize, FRAME_SIZE))) + 1;
+    unsigned int order = fnzb(SIZE2FRAMES(fbsize) - 1) + 1;
-    dbbuffer = (uint8_t * ) 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 */

Subversion Repositories HelenOS

(root)/trunk/kernel/genarch/src/fb/fb.c @ 2071 – Rev 2015 → 2054