WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/genarch/ Rev 3706 and /trunk/kernel/genarch/ Rev 3707

Ignore whitespace Rev 3706 → Rev 3707

 /trunk/kernel/genarch/include/fb/font-8x16.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,11 → 35,14
 #ifndef KERN_FONT_8X16_H_
 #define KERN_FONT_8X16_H_
-#define FONT_GLIPHS     256
-#define FONT_SCANLINES  16
+#define FONT_GLYPHS      256
+#define FONT_WIDTH       8
+#define FONT_SCANLINES   16
-extern unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES];
+#include <arch/types.h>
+extern uint8_t fb_font[FONT_GLYPHS * FONT_SCANLINES];
 #endif
 /** @}

 /trunk/kernel/genarch/include/fb/visuals.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,15 → 35,15
 #ifndef KERN_VISUALS_H_
 #define KERN_VISUALS_H_
-#define VISUAL_INDIRECT_8   0
+#define VISUAL_INDIRECT_8   0
-#define VISUAL_RGB_5_5_5    1
-#define VISUAL_RGB_5_6_5    2
-#define VISUAL_RGB_8_8_8    3
-#define VISUAL_RGB_8_8_8_0  4
-#define VISUAL_RGB_0_8_8_8  5
+#define VISUAL_RGB_5_5_5    1
+#define VISUAL_RGB_5_6_5    2
+#define VISUAL_RGB_8_8_8    3
+#define VISUAL_RGB_8_8_8_0  4
+#define VISUAL_RGB_0_8_8_8  5
-#define VISUAL_BGR_0_8_8_8  6
+#define VISUAL_BGR_0_8_8_8  6
 #endif

 /trunk/kernel/genarch/include/fb/fb.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,6 → 65,8
 } fb_properties_t;
 SPINLOCK_EXTERN(fb_lock);
+void fb_redraw(void);
 void fb_init(fb_properties_t *props);
 #endif

/trunk/kernel/genarch/src/fb/helenos.xbm
File deleted

 /trunk/kernel/genarch/src/fb/fb.c
 ,4 → 1,5
 /*
+ * Copyright (c) 2008 Martin Decky
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
  *
 ,7 → 27,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,6 → 40,7
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
 #include <mm/slab.h>
+#include <align.h>
 #include <panic.h>
 #include <memstr.h>
 #include <config.h>
 ,137 → 49,109
 #include <ddi/ddi.h>
 #include <arch/types.h>
-#include "helenos.xbm"
+SPINLOCK_INITIALIZE(fb_lock);
-static parea_t fb_parea;        /**< Physical memory area for fb. */
+/**< Physical memory area for fb. */
+static parea_t fb_parea;
-SPINLOCK_INITIALIZE(fb_lock);
+static uint8_t *fb_addr;
+static uint8_t *backbuf;
+static uint8_t *glyphs;
-static uint8_t *fbaddress = NULL;
+static void *bgpixel;
-static uint8_t *blankline = NULL;
-static uint8_t *dbbuffer = NULL;    /* Buffer for fast scrolling console */
-static index_t dboffset;
+static unsigned int xres;
+static unsigned int yres;
-static unsigned int xres = 0;
-static unsigned int yres = 0;
-static unsigned int scanline = 0;
-static unsigned int pixelbytes = 0;
-#ifdef FB_INVERT_COLORS
-static bool invert_colors = true;
-#else
-static bool invert_colors = false;
-#endif
+static unsigned int scanline;
+static unsigned int glyphscanline;
+static unsigned int pixelbytes;
+static unsigned int glyphbytes;
+static unsigned int cols;
+static unsigned int rows;
 static unsigned int position = 0;
-static unsigned int columns = 0;
-static unsigned int rows = 0;
-#define COL_WIDTH   8
-#define ROW_BYTES   (scanline * FONT_SCANLINES)
+#define BG_COLOR     0x000080
+#define FG_COLOR     0xffff00
-#define BGCOLOR     0x000080
-#define FGCOLOR     0xffff00
-#define LOGOCOLOR   0x2020b0
+#define CURSOR       219
-#define RED(x, bits)    ((x >> (8 + 8 + 8 - bits)) & ((1 << bits) - 1))
-#define GREEN(x, bits)  ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
-#define BLUE(x, bits)   ((x >> (8 - bits)) & ((1 << bits) - 1))
+#define RED(x, bits)         ((x >> (8 + 8 + 8 - bits)) & ((1 << bits) - 1))
+#define GREEN(x, bits)       ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
+#define BLUE(x, bits)        ((x >> (8 - bits)) & ((1 << bits) - 1))
-#define POINTPOS(x, y)  ((y) * scanline + (x) * pixelbytes)
+#define COL2X(col)           ((col) * FONT_WIDTH)
+#define ROW2Y(row)           ((row) * FONT_SCANLINES)
-/***************************************************************/
-/* Pixel specific fuctions */
+#define X2COL(x)             ((x) / FONT_WIDTH)
+#define Y2ROW(y)             ((y) / FONT_SCANLINES)
-static void (*rgb2scr)(void *, int);
-static int (*scr2rgb)(void *);
+#define FB_POS(x, y)         ((y) * scanline + (x) * pixelbytes)
+#define BB_POS(col, row)     ((row) * cols + (col))
+#define GLYPH_POS(glyph, y)  ((glyph) * glyphbytes + (y) * glyphscanline)
-static inline int COLOR(int color)
-{
-    return invert_colors ? ~color : color;
-}
-/* Conversion routines between different color representations */
-static void rgb_byte0888(void *dst, int rgb)
-{
-    *((int *) dst) = rgb;
-}
+static void (*rgb_conv)(void *, uint32_t);
-static int byte0888_rgb(void *src)
-{
-    return (*((int *) src)) & 0xffffff;
-}
-static void bgr_byte0888(void *dst, int rgb)
+/** ARGB 8:8:8:8 conversion
+ *
+ */
+static void rgb_0888(void *dst, uint32_t rgb)
 {
-    *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 |
-        RED(rgb, 8);
+    *((uint32_t *) dst) = rgb & 0xffffff;
 }
-static int byte0888_bgr(void *src)
+/** ABGR 8:8:8:8 conversion
+ *
+ */
+static void bgr_0888(void *dst, uint32_t rgb)
 {
-    int color = *(uint32_t *)(src);
-    return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) |
-        ((color >> 16) & 0xff);
+    *((uint32_t *) dst)
+        = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8);
 }
-static void rgb_byte888(void *dst, int rgb)
+/** BGR 8:8:8 conversion
+ *
+ */
+static void rgb_888(void *dst, uint32_t rgb)
 {
-    uint8_t *scr = (uint8_t *) dst;
 #if defined(FB_INVERT_ENDIAN)
-    scr[0] = RED(rgb, 8);
-    scr[1] = GREEN(rgb, 8);
-    scr[2] = BLUE(rgb, 8);
+    *((uint32_t *) dst)
+        = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8)
+        | (*((uint32_t *) dst) & 0xff0000);
 #else
-    scr[2] = RED(rgb, 8);
-    scr[1] = GREEN(rgb, 8);
-    scr[0] = BLUE(rgb, 8);
+    *((uint32_t *) dst)
+        = (rgb & 0xffffff) | (*((uint32_t *) dst) & 0xff0000);
 #endif
 }
-static int byte888_rgb(void *src)
-{
-    uint8_t *scr = (uint8_t *) 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)
+/** RGB 5:5:5 conversion
+ *
+ */
+static void rgb_555(void *dst, uint32_t 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, 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_byte565(void *dst, int rgb)
+/** RGB 5:6:5 conversion
+ *
+ */
+static void rgb_565(void *dst, uint32_t 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);
-}
-/** Put pixel - 8-bit depth (color palette/3:2:3, inverted)
+/** RGB 3:2:3
  *
  * Even though we try 3:2:3 color scheme here, an 8-bit framebuffer
  * will most likely use a color palette. The color appearance
 ,7 → 159,7
  * palette. This could be fixed by supporting custom palette
  * and setting it to simulate the 8-bit truecolor.
  *
- * Currently we set the palette on the sparc64 port.
+ * Currently we set the palette on the ia32 and sparc64 port.
  *
  * Note that the byte is being inverted by this function. The reason is
  * that we would like to use a color palette where the white color code
 ,207 → 167,84
  * use these codes for black and white and prevent to set codes
  * 0 and 255 to other colors.
  */
-static void rgb_byte8(void *dst, int rgb)
+static void rgb_323(void *dst, uint32_t rgb)
 {
-    *((uint8_t *) dst) = 255 - (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)
+/** Draw character at given position
  *
- * See the comment for rgb_byte().
  */
-static int byte8_rgb(void *src)
+static void draw_glyph(uint8_t glyph, unsigned int col, unsigned int row)
 {
-    int color = 255 - (*(uint8_t *)src);
-    return (((color >> 5) & 0x7) << (16 + 5)) |
-        (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
+    unsigned int x = COL2X(col);
+    unsigned int y = ROW2Y(row);
+    unsigned int yd;
+    backbuf[BB_POS(col, row)] = glyph;
+    for (yd = 0; yd < FONT_SCANLINES; yd++)
+        memcpy(&fb_addr[FB_POS(x, y + yd)],
+            &glyphs[GLYPH_POS(glyph, yd)], glyphscanline);
 }
-static void putpixel(unsigned int x, unsigned int y, int color)
-{
-    (*rgb2scr)(&fbaddress[POINTPOS(x, y)], COLOR(color));
-    if (dbbuffer) {
-        int dline = (y + dboffset) % yres;
-        (*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)(&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);
-        if (dbbuffer)
-            memcpy(&dbbuffer[scanline * y], blankline,
-                xres * pixelbytes);
-    }
-}
-/** Scroll screen one row up */
+/** Scroll screen down by one row
+ *
+ *
+ */
 static void scroll_screen(void)
 {
-    if (dbbuffer) {
-        count_t first;
+    unsigned int row;
+    for (row = 0; row < rows; row++) {
+        unsigned int y = ROW2Y(row);
+        unsigned int yd;
-        /* Clear the last row */
-        memcpy(&dbbuffer[dboffset * scanline], blankline, ROW_BYTES);
-        dboffset = (dboffset + FONT_SCANLINES) % yres;
-        first = yres - dboffset;
-        /* Move all rows one row up */
-        if (xres * pixelbytes == scanline) {
-            memcpy(fbaddress, &dbbuffer[dboffset * scanline],
-                first * scanline);
-            memcpy(&fbaddress[first * scanline], dbbuffer,
-                dboffset * scanline);
-        } else {
-            /*
-             * When the scanline is bigger than number of bytes
-             * in the X-resolution, chances are that the
-             * frame buffer memory past the X-resolution is special
-             * in some way. For example, the SUNW,ffb framebuffer
-             * wraps this area around the beginning of the same
-             * line. To avoid troubles, copy only memory as
-             * specified by the resolution.
-             */
-            unsigned int i;
-            for (i = 0; i < first; i++)
-                memcpy(&fbaddress[i * scanline],
-                    &dbbuffer[(dboffset + i) * scanline],
-                    xres * pixelbytes);
-            for (i = 0; i < dboffset; i++)
-                memcpy(&fbaddress[(first + i) * scanline],
-                    &dbbuffer[i * scanline], xres * pixelbytes);
+        for (yd = 0; yd < FONT_SCANLINES; yd++) {
+            unsigned int x;
+            unsigned int col;
+            for (col = 0, x = 0; col < cols; col++, x += FONT_WIDTH) {
+                uint8_t glyph;
+                if (row < rows - 1) {
+                    if (backbuf[BB_POS(col, row)] == backbuf[BB_POS(col, row + 1)])
+                        continue;
+                    glyph = backbuf[BB_POS(col, row + 1)];
+                } else
+                    glyph = 0;
+                memcpy(&fb_addr[FB_POS(x, y + yd)],
+                    &glyphs[GLYPH_POS(glyph, yd)], glyphscanline);
+            }
         }
-    } else {
-        uint8_t *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
-        if (xres * pixelbytes == scanline) {
-            /* Move all rows one row up */
-            memcpy((void *) fbaddress,
-                (void *) &fbaddress[ROW_BYTES],
-                scanline * yres - ROW_BYTES);
-            /* Clear the last row */
-            memcpy((void *) lastline, (void *) blankline,
-                ROW_BYTES);
-        } else {
-            /*
-             * See the comment in the dbbuffer case.
-             */
-            unsigned int i;
-            /* Move all rows one row up */
-            for (i = 0; i < yres - FONT_SCANLINES; i++)
-                memcpy(&fbaddress[i * scanline],
-                    &fbaddress[(i + FONT_SCANLINES) * scanline],
-                    xres * pixelbytes);
-            /* Clear the last row */
-            for (i = 0; i < FONT_SCANLINES; i++)
-                memcpy(&lastline[i * scanline],
-                    &blankline[i * scanline],
-                    xres * pixelbytes);
-        }
     }
+    memcpy(backbuf, backbuf + cols, cols * (rows - 1));
+    memsetb(&backbuf[BB_POS(0, rows - 1)], cols, 0);
 }
-static void invert_pixel(unsigned int x, unsigned int y)
+static void cursor_put(void)
 {
-    putpixel(x, y, ~getpixel(x, y));
+    draw_glyph(CURSOR, position % cols, position / cols);
 }
-/** Draw one line of glyph at a given position */
-static void draw_glyph_line(unsigned int glline, unsigned int x, unsigned int y)
+static void cursor_remove(void)
 {
-    unsigned int i;
-    for (i = 0; i < 8; i++)
-        if (glline & (1 << (7 - i))) {
-            putpixel(x + i, y, FGCOLOR);
-        } else
-            putpixel(x + i, y, BGCOLOR);
+    draw_glyph(0, position % cols, position / cols);
 }
-/***************************************************************/
-/* Character-console functions */
-/** Draw character at given position */
-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);
-}
-/** 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);
-}
-/** Draw character at default position */
-static void draw_char(char chr)
-{
-    draw_glyph(chr, position % columns, position / columns);
-}
-static void draw_logo(unsigned int startx, unsigned int starty)
-{
-    unsigned int x;
-    unsigned int y;
-    unsigned int byte;
-    unsigned int rowbytes;
-    rowbytes = (helenos_width - 1) / 8 + 1;
-    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));
-        }
-}
-/***************************************************************/
-/* Stdout specific functions */
-static void invert_cursor(void)
-{
-    invert_char(position % columns, position / columns);
-}
 /** Print character to screen
  *
- *  Emulate basic terminal commands
+ * Emulate basic terminal commands.
+ *
  */
 static void fb_putchar(chardev_t *dev, char ch)
 {
 ,37 → 252,37
     switch (ch) {
     case '\n':
-        invert_cursor();
-        position += columns;
-        position -= position % columns;
+        cursor_remove();
+        position += cols;
+        position -= position % cols;
         break;
     case '\r':
-        invert_cursor();
-        position -= position % columns;
+        cursor_remove();
+        position -= position % cols;
         break;
     case '\b':
-        invert_cursor();
-        if (position % columns)
+        cursor_remove();
+        if (position % cols)
             position--;
         break;
     case '\t':
-        invert_cursor();
+        cursor_remove();
         do {
-            draw_char(' ');
+            draw_glyph((uint8_t) ' ', position % cols, position / cols);
             position++;
-        } while ((position % 8) && position < columns * rows);
+        } while ((position % 8) && (position < cols * rows));
         break;
     default:
-        draw_char(ch);
+        draw_glyph((uint8_t) ch, position % cols, position / cols);
         position++;
     }
-    if (position >= columns * rows) {
-        position -= columns;
+    if (position >= cols * rows) {
+        position -= cols;
         scroll_screen();
     }
-    invert_cursor();
+    cursor_put();
     spinlock_unlock(&fb_lock);
 }
 ,46 → 293,116
 };
+/** Render glyphs
+ *
+ * Convert glyphs from device independent font
+ * description to current visual representation.
+ *
+ */
+static void render_glyphs(void)
+{
+    unsigned int glyph;
+    for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
+        unsigned int y;
+        for (y = 0; y < FONT_SCANLINES; y++) {
+            unsigned int x;
+            for (x = 0; x < FONT_WIDTH; x++)
+                rgb_conv(&glyphs[GLYPH_POS(glyph, y) + x * pixelbytes],
+                    (fb_font[glyph * FONT_SCANLINES + y] & (1 << (7 - x))) ? FG_COLOR : BG_COLOR);
+        }
+    }
+    rgb_conv(bgpixel, BG_COLOR);
+}
+/** Refresh the screen
+ *
+ */
+void fb_redraw(void)
+{
+    unsigned int row;
+    for (row = 0; row < rows; row++) {
+        unsigned int y = ROW2Y(row);
+        unsigned int yd;
+        for (yd = 0; yd < FONT_SCANLINES; yd++) {
+            unsigned int x;
+            unsigned int col;
+            for (col = 0, x = 0; col < cols; col++, x += FONT_WIDTH)
+                memcpy(&fb_addr[FB_POS(x, y + yd)],
+                &glyphs[GLYPH_POS(backbuf[BB_POS(col, row)], yd)],
+                glyphscanline);
+        }
+    }
+    if (COL2X(cols) < xres) {
+        unsigned int y;
+        for (y = 0; y < yres; y++) {
+            unsigned int x;
+            for (x = COL2X(cols); x < xres; x++)
+                memcpy(&fb_addr[FB_POS(x, y)], bgpixel, pixelbytes);
+        }
+    }
+    if (ROW2Y(rows) < yres) {
+        unsigned int y;
+        for (y = ROW2Y(rows); y < yres; y++) {
+            unsigned int x;
+            for (x = 0; x < xres; x++)
+                memcpy(&fb_addr[FB_POS(x, y)], bgpixel, pixelbytes);
+        }
+    }
+}
 /** Initialize framebuffer as a chardev output device
  *
- * @param props     Properties of the framebuffer device.
+ * @param addr   Physical address of the framebuffer
+ * @param x      Screen width in pixels
+ * @param y      Screen height in pixels
+ * @param scan   Bytes per one scanline
+ * @param visual Color model
+ *
  */
 void fb_init(fb_properties_t *props)
 {
     switch (props->visual) {
     case VISUAL_INDIRECT_8:
-        rgb2scr = rgb_byte8;
-        scr2rgb = byte8_rgb;
+        rgb_conv = rgb_323;
         pixelbytes = 1;
         break;
     case VISUAL_RGB_5_5_5:
-        rgb2scr = rgb_byte555;
-        scr2rgb = byte555_rgb;
+        rgb_conv = rgb_555;
         pixelbytes = 2;
         break;
     case VISUAL_RGB_5_6_5:
-        rgb2scr = rgb_byte565;
-        scr2rgb = byte565_rgb;
+        rgb_conv = rgb_565;
         pixelbytes = 2;
         break;
     case VISUAL_RGB_8_8_8:
-        rgb2scr = rgb_byte888;
-        scr2rgb = byte888_rgb;
+        rgb_conv = rgb_888;
         pixelbytes = 3;
         break;
     case VISUAL_RGB_8_8_8_0:
-        rgb2scr = rgb_byte888;
-        scr2rgb = byte888_rgb;
+        rgb_conv = rgb_888;
         pixelbytes = 4;
         break;
     case VISUAL_RGB_0_8_8_8:
-        rgb2scr = rgb_byte0888;
-        scr2rgb = byte0888_rgb;
+        rgb_conv = rgb_0888;
         pixelbytes = 4;
         break;
     case VISUAL_BGR_0_8_8_8:
-        rgb2scr = bgr_byte0888;
-        scr2rgb = byte0888_bgr;
+        rgb_conv = bgr_0888;
         pixelbytes = 4;
         break;
     default:
 ,60 → 409,56
         panic("Unsupported visual.\n");
     }
-    unsigned int fbsize = props->scan * props->y;
-    /* Map the framebuffer */
-    fbaddress = (uint8_t *) hw_map((uintptr_t) props->addr,
-        fbsize + props->offset);
-    fbaddress += props->offset;
     xres = props->x;
     yres = props->y;
     scanline = props->scan;
-    rows = props->y / FONT_SCANLINES;
-    columns = props->x / COL_WIDTH;
+    cols = xres / FONT_WIDTH;
+    rows = yres / FONT_SCANLINES;
+    glyphscanline = FONT_WIDTH * pixelbytes;
+    glyphbytes = glyphscanline * FONT_SCANLINES;
+    unsigned int fbsize = scanline * yres;
+    unsigned int bbsize = cols * rows;
+    unsigned int glyphsize = FONT_GLYPHS * glyphbytes;
+    backbuf = (uint8_t *) malloc(bbsize, 0);
+    if (!backbuf)
+        panic("Unable to allocate backbuffer.\n");
+    glyphs = (uint8_t *) malloc(glyphsize, 0);
+    if (!glyphs)
+        panic("Unable to allocate glyphs.\n");
+    bgpixel = malloc(pixelbytes, 0);
+    if (!bgpixel)
+        panic("Unable to allocate background pixel.\n");
+    memsetb(backbuf, bbsize, 0);
+    memsetb(glyphs, glyphsize, 0);
+    memsetb(bgpixel, pixelbytes, 0);
+    render_glyphs();
+    fb_addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
     fb_parea.pbase = (uintptr_t) props->addr + props->offset;
-    fb_parea.vbase = (uintptr_t) fbaddress;
+    fb_parea.vbase = (uintptr_t) fb_addr;
     fb_parea.frames = SIZE2FRAMES(fbsize);
     fb_parea.cacheable = false;
     ddi_parea_register(&fb_parea);
     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.scanline", NULL, props->scan);
+    sysinfo_set_item_val("fb.scanline", NULL, scanline);
     sysinfo_set_item_val("fb.visual", NULL, props->visual);
     sysinfo_set_item_val("fb.address.physical", NULL, props->addr);
-    sysinfo_set_item_val("fb.offset", NULL, props->offset);
-    sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
-    /* Allocate double buffer */
-    unsigned int order = fnzb(SIZE2FRAMES(fbsize) - 1) + 1;
-    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.");
-    unsigned int x, y;
-    for (y = 0; y < FONT_SCANLINES; y++)
-        for (x = 0; x < xres; x++)
-            (*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();
+    fb_redraw();
     chardev_initialize("fb", &framebuffer, &fb_ops);
     stdout = &framebuffer;
 }

 /trunk/kernel/genarch/src/fb/font-8x16.c
 ,7 → 34,7
 #include <genarch/fb/font-8x16.h>
-unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES] = {
+uint8_t fb_font[FONT_GLYPHS * FONT_SCANLINES] = {
     /* 0 0x00 '^@' */
 x00, /* 00000000 */

 /trunk/kernel/genarch/src/mm/asid.c
 ,7 → 32,7
 /**
  * @file
- * @brief   ASID management.
+ * @brief ASID management.
  *
  * Modern processor architectures optimize TLB utilization
  * by using ASIDs (a.k.a. memory contexts on sparc64 and

 /trunk/kernel/genarch/src/acpi/acpi.c
 ,8 → 49,12
 struct acpi_rsdt *acpi_rsdt = NULL;
 struct acpi_xsdt *acpi_xsdt = NULL;
-struct acpi_signature_map signature_map[] = {
-    { (uint8_t *)"APIC", (void *) &acpi_madt, "Multiple APIC Description Table" }
+struct acpi_signature_map signature_map[] = {
+    {
+        (uint8_t *) "APIC",
+        (void *) &acpi_madt,
+        "Multiple APIC Description Table"
+    }
 };
 static int rsdp_check(uint8_t *rsdp) {
 ,7 → 109,7
                 if (!acpi_sdt_check((uint8_t *) h))
                     goto next;
                 *signature_map[j].sdt_ptr = h;
-                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                LOG("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
             }
         }
 next:
 ,7 → 130,7
                 if (!acpi_sdt_check((uint8_t *) h))
                     goto next;
                 *signature_map[j].sdt_ptr = h;
-                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                LOG("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
             }
         }
 next:
 ,7 → 164,7
     return;
 rsdp_found:
-    printf("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
+    LOG("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
     acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address;
     if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((uintptr_t) acpi_rsdp->xsdt_address);

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3706 → Rev 3707