Changeset 86ffa27f in mainline for kernel/genarch/src/fb/fb.c

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/genarch/src/fb/fb.c

@@ -82 +82 @@
         SPINLOCK_DECLARE(lock);
         
+        parea_t parea;
+        
         uint8_t *addr;
         uint16_t *backbuf;
@@ -109 +111 @@
 } fb_instance_t;
 
-static void fb_putchar(outdev_t *dev, wchar_t ch, bool silent);
+static void fb_putchar(outdev_t *dev, wchar_t ch);
 static void fb_redraw_internal(fb_instance_t *instance);
 static void fb_redraw(outdev_t *dev);
@@ -215 +217 @@
  *
  */
-static void logo_hide(fb_instance_t *instance, bool silent)
+static void logo_hide(fb_instance_t *instance)
 {
         instance->ylogo = 0;
@@ -221 +223 @@
         instance->rowtrim = instance->rows;
         
-        if (!silent)
+        if ((!instance->parea.mapped) || (console_override))
                 fb_redraw_internal(instance);
 }
@@ -229 +231 @@
  */
 static void glyph_draw(fb_instance_t *instance, uint16_t glyph,
-    unsigned int col, unsigned int row, bool silent, bool overlay)
+    unsigned int col, unsigned int row, bool overlay)
 {
         unsigned int x = COL2X(col);
@@ -236 +238 @@
         
         if (y >= instance->ytrim)
-                logo_hide(instance, silent);
+                logo_hide(instance);
         
         if (!overlay)
                 instance->backbuf[BB_POS(instance, col, row)] = glyph;
         
-        if (!silent) {
+        if ((!instance->parea.mapped) || (console_override)) {
                 for (yd = 0; yd < FONT_SCANLINES; yd++)
                         memcpy(&instance->addr[FB_POS(instance, x, y + yd + instance->ylogo)],
@@ -253 +255 @@
  *
  */
-static void screen_scroll(fb_instance_t *instance, bool silent)
+static void screen_scroll(fb_instance_t *instance)
 {
         if (instance->ylogo > 0) {
-                logo_hide(instance, silent);
+                logo_hide(instance);
                 return;
         }
         
-        if (!silent) {
+        if ((!instance->parea.mapped) || (console_override)) {
                 unsigned int row;
                 
@@ -298 +300 @@
 }
 
-static void cursor_put(fb_instance_t *instance, bool silent)
+static void cursor_put(fb_instance_t *instance)
 {
         unsigned int col = instance->position % instance->cols;
         unsigned int row = instance->position / instance->cols;
         
-        glyph_draw(instance, fb_font_glyph(U_CURSOR), col, row, silent, true);
-}
-
-static void cursor_remove(fb_instance_t *instance, bool silent)
+        glyph_draw(instance, fb_font_glyph(U_CURSOR), col, row, true);
+}
+
+static void cursor_remove(fb_instance_t *instance)
 {
         unsigned int col = instance->position % instance->cols;
@@ -312 +314 @@
         
         glyph_draw(instance, instance->backbuf[BB_POS(instance, col, row)],
-            col, row, silent, true);
+            col, row, true);
 }
 
@@ -362 +364 @@
  *
  */
-static void fb_putchar(outdev_t *dev, wchar_t ch, bool silent)
+static void fb_putchar(outdev_t *dev, wchar_t ch)
 {
         fb_instance_t *instance = (fb_instance_t *) dev->data;
@@ -369 +371 @@
         switch (ch) {
         case '\n':
-                cursor_remove(instance, silent);
+                cursor_remove(instance);
                 instance->position += instance->cols;
                 instance->position -= instance->position % instance->cols;
                 break;
         case '\r':
-                cursor_remove(instance, silent);
+                cursor_remove(instance);
                 instance->position -= instance->position % instance->cols;
                 break;
         case '\b':
-                cursor_remove(instance, silent);
+                cursor_remove(instance);
                 if (instance->position % instance->cols)
                         instance->position--;
                 break;
         case '\t':
-                cursor_remove(instance, silent);
+                cursor_remove(instance);
                 do {
                         glyph_draw(instance, fb_font_glyph(' '),
                             instance->position % instance->cols,
-                            instance->position / instance->cols, silent, false);
+                            instance->position / instance->cols, false);
                         instance->position++;
                 } while ((instance->position % 8)
@@ -395 +397 @@
                 glyph_draw(instance, fb_font_glyph(ch),
                     instance->position % instance->cols,
-                    instance->position / instance->cols, silent, false);
+                    instance->position / instance->cols, false);
                 instance->position++;
         }
@@ -401 +403 @@
         if (instance->position >= instance->cols * instance->rows) {
                 instance->position -= instance->cols;
-                screen_scroll(instance, silent);
-        }
-        
-        cursor_put(instance, silent);
+                screen_scroll(instance);
+        }
+        
+        cursor_put(instance);
         
         spinlock_unlock(&instance->lock);
@@ -555 +557 @@
         
         spinlock_initialize(&instance->lock, "*fb.instance.lock");
+        
         instance->rgb_conv = rgb_conv;
         instance->pixelbytes = pixelbytes;
@@ -623 +626 @@
         glyphs_render(instance);
         
+        link_initialize(&instance->parea.link);
+        instance->parea.pbase = props->addr;
+        instance->parea.frames = SIZE2FRAMES(fbsize);
+        instance->parea.unpriv = false;
+        instance->parea.mapped = false;
+        ddi_parea_register(&instance->parea);
+        
         if (!fb_exported) {
                 /*
-                 * This is the necessary evil until the userspace driver is entirely
-                 * self-sufficient.
+                 * We export the kernel framebuffer for uspace usage.
+                 * This is used in the case the uspace framebuffer
+                 * driver is not self-sufficient.
                  */
                 sysinfo_set_item_val("fb", NULL, true);