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

  */
 /** @file
  */
 #include <genarch/fb/font-8x16.h>
+#include <genarch/fb/logo-196x66.h>
 #include <genarch/fb/visuals.h>
 #include <genarch/fb/fb.h>
 #include <console/chardev.h>
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
 static parea_t fb_parea;
 static uint8_t *fb_addr;
 static uint8_t *backbuf;
 static uint8_t *glyphs;
-static void *bgpixel;
+static uint8_t *bgscan;
 static unsigned int xres;
 static unsigned int yres;
+static unsigned int ylogo;
+static unsigned int ytrim;
+static unsigned int rowtrim;
 static unsigned int scanline;
 static unsigned int glyphscanline;
 static unsigned int pixelbytes;
 static unsigned int glyphbytes;
+static unsigned int bgscanbytes;
 static unsigned int cols;
 static unsigned int rows;
 static unsigned int position = 0;
+ *
  */
 static void rgb_888(void *dst, uint32_t rgb)
+{
 #if defined(FB_INVERT_ENDIAN)
-    *((uint32_t *) dst)
+    ((uint8_t *) dst)[0] = RED(rgb, 8);
-        = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8)
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-        | (*((uint32_t *) dst) & 0xff0000);
+    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
 #else
-    *((uint32_t *) dst)
+    ((uint8_t *) dst)[0] = BLUE(rgb, 8);
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-        = (rgb & 0xffffff) | (*((uint32_t *) dst) & 0xff0000);
+    ((uint8_t *) dst)[2] = RED(rgb, 8);
 #endif
+}
 /** RGB 5:5:5 conversion
     *((uint8_t *) dst)
         = ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3));
+}
+/** Hide logo and refresh screen
+ *
+ */
+static void logo_hide(void)
+{
+    ylogo = 0;
+    ytrim = yres;
+    rowtrim = rows;
+    fb_redraw();
+}
 /** Draw character at given position
+ *
  */
-static void draw_glyph(uint8_t glyph, unsigned int col, unsigned int row)
+static void glyph_draw(uint8_t glyph, unsigned int col, unsigned int row)
+{
     unsigned int x = COL2X(col);
     unsigned int y = ROW2Y(row);
     unsigned int yd;
+    if (y >= ytrim)
+        logo_hide();
     backbuf[BB_POS(col, row)] = glyph;
     for (yd = 0; yd < FONT_SCANLINES; yd++)
-        memcpy(&fb_addr[FB_POS(x, y + yd)],
+        memcpy(&fb_addr[FB_POS(x, y + yd + ylogo)],
             &glyphs[GLYPH_POS(glyph, yd)], glyphscanline);
+}
 /** Scroll screen down by one row
+ *
+ *
  */
-static void scroll_screen(void)
+static void screen_scroll(void)
+{
+    if (ylogo > 0)
+        logo_hide();
     unsigned int row;
     for (row = 0; row < rows; row++) {
         unsigned int y = ROW2Y(row);
         unsigned int yd;
+}
 static void cursor_put(void)
+{
-    draw_glyph(CURSOR, position % cols, position / cols);
+    glyph_draw(CURSOR, position % cols, position / cols);
+}
 static void cursor_remove(void)
+{
-    draw_glyph(0, position % cols, position / cols);
+    glyph_draw(0, position % cols, position / cols);
+}
 /** Print character to screen
+ *
             position--;
         break;
     case '\t':
         cursor_remove();
         do {
-            draw_glyph((uint8_t) ' ', position % cols, position / cols);
+            glyph_draw((uint8_t) ' ', position % cols, position / cols);
             position++;
         } while ((position % 8) && (position < cols * rows));
         break;
     default:
-        draw_glyph((uint8_t) ch, position % cols, position / cols);
+        glyph_draw((uint8_t) ch, position % cols, position / cols);
         position++;
+    }
     if (position >= cols * rows) {
         position -= cols;
-        scroll_screen();
+        screen_scroll();
+    }
     cursor_put();
     spinlock_unlock(&fb_lock);
+ *
  * Convert glyphs from device independent font
  * description to current visual representation.
+ *
  */
-static void render_glyphs(void)
+static void glyphs_render(void)
+{
+    /* Prerender glyphs */
     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);
+                    (fb_font[ROW2Y(glyph) + y] & (1 << (7 - x))) ? FG_COLOR : BG_COLOR);
+        }
+    }
+    /* Prerender background scanline */
+    unsigned int x;
+    for (x = 0; x < xres; x++)
-    rgb_conv(bgpixel, BG_COLOR);
+        rgb_conv(&bgscan[x * pixelbytes], BG_COLOR);
+}
 /** Refresh the screen
+ *
  */
 void fb_redraw(void)
+{
+    if (ylogo > 0) {
+        unsigned int y;
+        for (y = 0; y < LOGO_HEIGHT; y++) {
+            unsigned int x;
+            for (x = 0; x < xres; x++)
+                rgb_conv(&fb_addr[FB_POS(x, y)],
+                    (x < LOGO_WIDTH) ? fb_logo[y * LOGO_WIDTH + x] : LOGO_COLOR);
+        }
+    }
     unsigned int row;
-    for (row = 0; row < rows; row++) {
+    for (row = 0; row < rowtrim; row++) {
-        unsigned int y = ROW2Y(row);
+        unsigned int y = ylogo + ROW2Y(row);
         unsigned int yd;
         for (yd = 0; yd < FONT_SCANLINES; yd++) {
             unsigned int x;
             unsigned int col;
+        }
+    }
     if (COL2X(cols) < xres) {
         unsigned int y;
+        unsigned int size = (xres - COL2X(cols)) * pixelbytes;
-        for (y = 0; y < yres; y++) {
+        for (y = ylogo; y < yres; y++)
-            unsigned int x;
-            for (x = COL2X(cols); x < xres; x++)
-                memcpy(&fb_addr[FB_POS(x, y)], bgpixel, pixelbytes);
+            memcpy(&fb_addr[FB_POS(COL2X(cols), y)], bgscan, size);
-        }
+    }
-    if (ROW2Y(rows) < yres) {
+    if (ROW2Y(rowtrim) < yres) {
         unsigned int y;
-        for (y = ROW2Y(rows); y < yres; y++) {
+        for (y = ROW2Y(rowtrim); y < yres; y++)
-            unsigned int x;
-            for (x = 0; x < xres; x++)
-                memcpy(&fb_addr[FB_POS(x, y)], bgpixel, pixelbytes);
+            memcpy(&fb_addr[FB_POS(0, y)], bgscan, bgscanbytes);
-        }
+    }
+}
 /** Initialize framebuffer as a chardev output device
     xres = props->x;
     yres = props->y;
     scanline = props->scan;
-    cols = xres / FONT_WIDTH;
+    cols = X2COL(xres);
+    rows = Y2ROW(yres);
+    if (yres > ylogo) {
+        ylogo = LOGO_HEIGHT;
+        rowtrim = rows - Y2ROW(ylogo);
-    rows = yres / FONT_SCANLINES;
+        if (ylogo % FONT_SCANLINES > 0)
+            rowtrim--;
+        ytrim = ROW2Y(rowtrim);
+    } else {
+        ylogo = 0;
+        ytrim = yres;
+        rowtrim = rows;
+    }
     glyphscanline = FONT_WIDTH * pixelbytes;
-    glyphbytes = glyphscanline * FONT_SCANLINES;
+    glyphbytes = ROW2Y(glyphscanline);
+    bgscanbytes = xres * pixelbytes;
     unsigned int fbsize = scanline * yres;
     unsigned int bbsize = cols * rows;
     unsigned int glyphsize = FONT_GLYPHS * glyphbytes;
     glyphs = (uint8_t *) malloc(glyphsize, 0);
     if (!glyphs)
         panic("Unable to allocate glyphs.\n");
-    bgpixel = malloc(pixelbytes, 0);
+    bgscan = malloc(bgscanbytes, 0);
-    if (!bgpixel)
+    if (!bgscan)
         panic("Unable to allocate background pixel.\n");
     memsetb(backbuf, bbsize, 0);
-    memsetb(glyphs, glyphsize, 0);
-    memsetb(bgpixel, pixelbytes, 0);
-    render_glyphs();
+    glyphs_render();
     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) fb_addr;

Subversion Repositories HelenOS

(root)/trunk/kernel/genarch/src/fb/fb.c – Rev 3709 → 3710