Changes in kernel/genarch/src/fb/fb.c [39e1b9a:de96d3b] in mainline

File:

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

kernel/genarch/src/fb/fb.c

@@ -121 +121 @@
         /** Current backbuffer position */
         unsigned int position;
-
-        /** Partial character between writes */
-        mbstate_t mbstate;
 } 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 *);
@@ -132 +129 @@
 
 static outdev_operations_t fbdev_ops = {
-        .write = fb_write,
+        .write = fb_putuchar,
         .redraw = fb_redraw,
         .scroll_up = fb_scroll_up,
@@ -421 +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':
+                cursor_remove(instance);
                 instance->position += instance->cols;
                 instance->position -= instance->position % instance->cols;
                 break;
         case '\r':
+                cursor_remove(instance);
                 instance->position -= instance->position % instance->cols;
                 break;
         case '\b':
+                cursor_remove(instance);
                 if (instance->position % instance->cols)
                         instance->position--;
                 break;
         case '\t':
+                cursor_remove(instance);
                 do {
                         glyph_draw(instance, fb_font_glyph(' '),
@@ -455 +459 @@
                 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);
 }