Changes in kernel/genarch/src/fb/fb.c [c43b89e8:adec5b45] in mainline

File:

• kernel/genarch/src/fb/fb.c (modified) (11 diffs)

kernel/genarch/src/fb/fb.c

@@ -35 +35 @@
 
 #include <genarch/fb/font-8x16.h>
+#include <genarch/fb/logo-196x66.h>
 #include <genarch/fb/fb.h>
 #include <console/chardev.h>
@@ -52 +53 @@
 #include <byteorder.h>
 
-#define BG_COLOR     0x001620
-#define FG_COLOR     0xf3cf65
+#define BG_COLOR     0x000080
+#define FG_COLOR     0xffff00
 #define INV_COLOR    0xaaaaaa
 
@@ -92 +93 @@
         unsigned int yres;
         
+        unsigned int ylogo;
+        unsigned int ytrim;
         unsigned int rowtrim;
         
@@ -210 +213 @@
 }
 
+/** Hide logo and refresh screen
+ *
+ */
+static void logo_hide(fb_instance_t *instance)
+{
+        instance->ylogo = 0;
+        instance->ytrim = instance->yres;
+        instance->rowtrim = instance->rows;
+        
+        if ((!instance->parea.mapped) || (console_override))
+                fb_redraw_internal(instance);
+}
+
 /** Draw character at given position
  *
@@ -220 +236 @@
         unsigned int yd;
         
+        if (y >= instance->ytrim)
+                logo_hide(instance);
+        
         if (!overlay)
                 instance->backbuf[BB_POS(instance, col, row)] = glyph;
@@ -225 +244 @@
         if ((!instance->parea.mapped) || (console_override)) {
                 for (yd = 0; yd < FONT_SCANLINES; yd++)
-                        memcpy(&instance->addr[FB_POS(instance, x, y + yd)],
+                        memcpy(&instance->addr[FB_POS(instance, x, y + yd + instance->ylogo)],
                             &instance->glyphs[GLYPH_POS(instance, glyph, yd)],
                             instance->glyphscanline);
@@ -237 +256 @@
 static void screen_scroll(fb_instance_t *instance)
 {
+        if (instance->ylogo > 0) {
+                logo_hide(instance);
+                return;
+        }
+        
         if ((!instance->parea.mapped) || (console_override)) {
                 unsigned int row;
@@ -366 +390 @@
                             instance->position / instance->cols, false);
                         instance->position++;
-                } while (((instance->position % instance->cols) % 8 != 0) &&
-                    (instance->position < instance->cols * instance->rows));
+                } while ((instance->position % 8)
+                    && (instance->position < instance->cols * instance->rows));
                 break;
         default:
@@ -388 +412 @@
 static void fb_redraw_internal(fb_instance_t *instance)
 {
+        if (instance->ylogo > 0) {
+                unsigned int y;
+                
+                for (y = 0; y < LOGO_HEIGHT; y++) {
+                        unsigned int x;
+                        
+                        for (x = 0; x < instance->xres; x++)
+                                instance->rgb_conv(&instance->addr[FB_POS(instance, x, y)],
+                                    (x < LOGO_WIDTH) ?
+                                    fb_logo[y * LOGO_WIDTH + x] :
+                                    LOGO_COLOR);
+                }
+        }
+        
         unsigned int row;
         
         for (row = 0; row < instance->rowtrim; row++) {
-                unsigned int y = ROW2Y(row);
+                unsigned int y = instance->ylogo + ROW2Y(row);
                 unsigned int yd;
                 
@@ -414 +452 @@
                     (instance->xres - COL2X(instance->cols)) * instance->pixelbytes;
                 
-                for (y = 0; y < instance->yres; y++)
+                for (y = instance->ylogo; y < instance->yres; y++)
                         memcpy(&instance->addr[FB_POS(instance, COL2X(instance->cols), y)],
                             instance->bgscan, size);
         }
         
-        if (ROW2Y(instance->rowtrim) < instance->yres) {
+        if (ROW2Y(instance->rowtrim) + instance->ylogo < instance->yres) {
                 unsigned int y;
                 
-                for (y = ROW2Y(instance->rowtrim); y < instance->yres; y++)
+                for (y = ROW2Y(instance->rowtrim) + instance->ylogo;
+                    y < instance->yres; y++)
                         memcpy(&instance->addr[FB_POS(instance, 0, y)],
                             instance->bgscan, instance->bgscanbytes);
@@ -528 +567 @@
         instance->rows = Y2ROW(instance->yres);
         
-        instance->rowtrim = instance->rows;
+        if (instance->yres > LOGO_HEIGHT) {
+                instance->ylogo = LOGO_HEIGHT;
+                instance->rowtrim = instance->rows - Y2ROW(instance->ylogo);
+                if (instance->ylogo % FONT_SCANLINES > 0)
+                        instance->rowtrim--;
+                instance->ytrim = ROW2Y(instance->rowtrim);
+        } else {
+                instance->ylogo = 0;
+                instance->ytrim = instance->yres;
+                instance->rowtrim = instance->rows;
+        }
         
         instance->glyphscanline = FONT_WIDTH * instance->pixelbytes;