Changes in kernel/genarch/src/fb/fb.c [eb2187c4:e037cf37] in mainline

File:

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

kernel/genarch/src/fb/fb.c

@@ -45 +45 @@
 #include <align.h>
 #include <panic.h>
-#include <memw.h>
+#include <mem.h>
 #include <config.h>
 #include <bitops.h>
@@ -81 +81 @@
         ((glyph) * (instance)->glyphbytes + (y) * (instance)->glyphscanline)
 
-#define TAB_WIDTH 8
-
 typedef void (*rgb_conv_t)(void *, uint32_t);
 
@@ -101 +99 @@
 
         /** Number of rows that fit on framebuffer */
-        unsigned int screen_rows;
+        unsigned int rowtrim;
 
         unsigned int scanline;
@@ -123 +121 @@
         /** Current backbuffer position */
         unsigned int position;
-
-        /** Partial character between writes */
-        mbstate_t mbstate;
-
-        unsigned int row;
-        unsigned int column;
 } fb_instance_t;
 
-static void fb_write(outdev_t *, const char *, size_t);
+static void fb_putuchar(outdev_t *, char32_t);
 static void fb_redraw(outdev_t *);
 static void fb_scroll_up(outdev_t *);
@@ -137 +129 @@
 
 static outdev_operations_t fbdev_ops = {
-        .write = fb_write,
+        .write = fb_putuchar,
         .redraw = fb_redraw,
         .scroll_up = fb_scroll_up,
@@ -255 +247 @@
 
         unsigned int rel_row = row - instance->offset_row;
-        if (rel_row >= instance->screen_rows)
+        if (rel_row >= instance->rowtrim)
                 return;
 
@@ -273 +265 @@
 {
         if ((!instance->parea.mapped) || (console_override)) {
-                for (unsigned int rel_row = 0; rel_row < instance->screen_rows; rel_row++) {
+                for (unsigned int rel_row = 0; rel_row < instance->rowtrim; rel_row++) {
                         unsigned int y = ROW2Y(rel_row);
                         unsigned int row = rel_row + instance->offset_row;
@@ -322 +314 @@
 static void cursor_put(fb_instance_t *instance)
 {
-        unsigned int col = instance->column;
-        unsigned int row = instance->row;
+        unsigned int col = instance->position % instance->cols;
+        unsigned int row = instance->position / instance->cols;
 
         glyph_draw(instance, fb_font_glyph(U_CURSOR), col, row, true);
@@ -330 +322 @@
 static void cursor_remove(fb_instance_t *instance)
 {
-        unsigned int col = instance->column;
-        unsigned int row = instance->row;
+        unsigned int col = instance->position % instance->cols;
+        unsigned int row = instance->position / instance->cols;
 
         glyph_draw(instance, instance->backbuf[BB_POS(instance, col, row)],
@@ -381 +373 @@
 static void fb_redraw_internal(fb_instance_t *instance)
 {
-        for (unsigned int rel_row = 0; rel_row < instance->screen_rows; rel_row++) {
+        for (unsigned int rel_row = 0; rel_row < instance->rowtrim; rel_row++) {
                 unsigned int y = ROW2Y(rel_row);
                 unsigned int row = rel_row + instance->offset_row;
@@ -412 +404 @@
         }
 
-        if (ROW2Y(instance->screen_rows) < instance->yres) {
+        if (ROW2Y(instance->rowtrim) < instance->yres) {
                 unsigned int y;
 
-                for (y = ROW2Y(instance->screen_rows); y < instance->yres; y++)
+                for (y = ROW2Y(instance->rowtrim); y < instance->yres; y++)
                         memcpy(&instance->addr[FB_POS(instance, 0, y)],
                             instance->bgscan, instance->bgscanbytes);
@@ -421 +413 @@
 }
 
-static void _advance_row(fb_instance_t *instance)
-{
-        instance->column = 0;
-        instance->row++;
-}
-
-static void _advance_column(fb_instance_t *instance)
-{
-        instance->column++;
-        if (instance->column == instance->cols)
-                _advance_row(instance);
-}
-
 /** Print character to screen
  *
@@ -439 +418 @@
  *
  */
-static void _putuchar(fb_instance_t *instance, char32_t ch)
-{
+static void fb_putuchar(outdev_t *dev, char32_t ch)
+{
+        fb_instance_t *instance = (fb_instance_t *) dev->data;
+        spinlock_lock(&instance->lock);
+
         switch (ch) {
         case '\n':
-                _advance_row(instance);
+                cursor_remove(instance);
+                instance->position += instance->cols;
+                instance->position -= instance->position % instance->cols;
                 break;
         case '\r':
-                instance->column = 0;
+                cursor_remove(instance);
+                instance->position -= instance->position % instance->cols;
                 break;
         case '\b':
-                if (instance->column > 0)
-                        instance->column--;
+                cursor_remove(instance);
+                if (instance->position % instance->cols)
+                        instance->position--;
                 break;
         case '\t':
+                cursor_remove(instance);
                 do {
                         glyph_draw(instance, fb_font_glyph(' '),
-                            instance->column,
-                            instance->row, false);
-                        _advance_column(instance);
-                } while (instance->column % TAB_WIDTH != 0);
+                            instance->position % instance->cols,
+                            instance->position / instance->cols, false);
+                        instance->position++;
+                } while (((instance->position % instance->cols) % 8 != 0) &&
+                    (instance->position < instance->cols * instance->rows));
                 break;
         default:
                 glyph_draw(instance, fb_font_glyph(ch),
-                    instance->column,
-                    instance->row, false);
-                _advance_column(instance);
-        }
-
-        while (instance->row >= instance->rows) {
-                instance->row--;
+                    instance->position % instance->cols,
+                    instance->position / instance->cols, false);
+                instance->position++;
+        }
+
+        if (instance->position >= instance->cols * instance->rows) {
+                instance->position -= instance->cols;
                 screen_scroll(instance);
         }
-}
-
-static void fb_write(outdev_t *dev, const char *s, size_t n)
-{
-        fb_instance_t *instance = (fb_instance_t *) dev->data;
-
-        spinlock_lock(&instance->lock);
-        cursor_remove(instance);
-
-        size_t offset = 0;
-        char32_t ch;
-
-        while ((ch = str_decode_r(s, &offset, n, U_SPECIAL, &instance->mbstate)))
-                _putuchar(instance, ch);
 
         cursor_put(instance);
+
         spinlock_unlock(&instance->lock);
 }
@@ -498 +473 @@
         spinlock_lock(&instance->lock);
 
-        if (instance->offset_row >= instance->screen_rows / 2)
-                instance->offset_row -= instance->screen_rows / 2;
+        if (instance->offset_row >= instance->rowtrim / 2)
+                instance->offset_row -= instance->rowtrim / 2;
         else
                 instance->offset_row = 0;
@@ -517 +492 @@
         spinlock_lock(&instance->lock);
 
-        if (instance->offset_row + instance->screen_rows / 2 <=
-            instance->rows - instance->screen_rows)
-                instance->offset_row += instance->screen_rows / 2;
+        if (instance->offset_row + instance->rowtrim / 2 <=
+            instance->rows - instance->rowtrim)
+                instance->offset_row += instance->rowtrim / 2;
         else
-                instance->offset_row = instance->rows - instance->screen_rows;
+                instance->offset_row = instance->rows - instance->rowtrim;
 
         fb_redraw_internal(instance);
@@ -640 +615 @@
         instance->scanline = props->scan;
 
-        instance->screen_rows = Y2ROW(instance->yres);
+        instance->rowtrim = Y2ROW(instance->yres);
 
         instance->cols = X2COL(instance->xres);
-        instance->rows = FB_PAGES * instance->screen_rows;
-
-        instance->start_row = instance->rows - instance->screen_rows;
+        instance->rows = FB_PAGES * instance->rowtrim;
+
+        instance->start_row = instance->rows - instance->rowtrim;
         instance->offset_row = instance->start_row;
-        instance->row = instance->start_row;
-        instance->column = 0;
+        instance->position = instance->start_row * instance->cols;
 
         instance->glyphscanline = FONT_WIDTH * instance->pixelbytes;
@@ -659 +633 @@
 
         instance->addr = (uint8_t *) km_map((uintptr_t) props->addr, fbsize,
-            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_WRITE_COMBINE);
+            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE);
         if (!instance->addr) {
                 LOG("Unable to map framebuffer.");