Changeset 39e1b9a in mainline for kernel/genarch

Timestamp:

2025-04-17T15:37:05Z (8 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

250a435

Parents:

690ad20

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-14 16:54:54)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-17 15:37:05)

Message:

Convert console output devices to batch printing

Location:

kernel/genarch/src

Files:

• drivers/ega/ega.c (modified) (3 diffs)
• drivers/ns16550/ns16550.c (modified) (1 diff)
• drivers/pl011/pl011.c (modified) (2 diffs)
• fb/fb.c (modified) (4 diffs)

kernel/genarch/src/drivers/ega/ega.c

@@ -69 +69 @@
         uint8_t *backbuf;
         ioport8_t *base;
+        mbstate_t mbstate;
 } ega_instance_t;
 
-static void ega_putuchar(outdev_t *, char32_t);
+static void ega_write(outdev_t *, const char *, size_t);
 static void ega_redraw(outdev_t *);
 
 static outdev_operations_t egadev_ops = {
-        .write = ega_putuchar,
+        .write = ega_write,
         .redraw = ega_redraw,
         .scroll_up = NULL,
@@ -538 +539 @@
 }
 
-static void ega_putuchar(outdev_t *dev, char32_t ch)
-{
-        ega_instance_t *instance = (ega_instance_t *) dev->data;
-
-        irq_spinlock_lock(&instance->lock, true);
-
+static void _putuchar(ega_instance_t *instance, char32_t ch)
+{
         switch (ch) {
         case '\n':
@@ -564 +561 @@
         ega_check_cursor(instance);
         ega_move_cursor(instance);
+}
+
+static void ega_write(outdev_t *dev, const char *s, size_t n)
+{
+        ega_instance_t *instance = (ega_instance_t *) dev->data;
+
+        irq_spinlock_lock(&instance->lock, true);
+
+        size_t offset = 0;
+        char32_t ch;
+
+        while ((ch = str_decode_r(s, &offset, n, U_SPECIAL, &instance->mbstate)))
+                _putuchar(instance, ch);
 
         irq_spinlock_unlock(&instance->lock, true);

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -112 +112 @@
 }
 
-static void ns16550_putuchar(outdev_t *dev, char32_t ch)
+static void ns16550_write(outdev_t *dev, const char *s, size_t n)
 {
         ns16550_instance_t *instance = (ns16550_instance_t *) dev->data;
 
-        if ((!instance->parea.mapped) || (console_override)) {
-                if (ch == '\n')
+        if (instance->parea.mapped && !console_override)
+                return;
+
+        const char *top = s + n;
+        assert(top >= s);
+
+        for (; s < top; s++) {
+                if (*s == '\n')
                         ns16550_sendb(instance, '\r');
 
-                if (ascii_check(ch))
-                        ns16550_sendb(instance, (uint8_t) ch);
-                else
-                        ns16550_sendb(instance, U_SPECIAL);
+                ns16550_sendb(instance, (uint8_t) *s);
         }
 }
 
 static outdev_operations_t ns16550_ops = {
-        .write = ns16550_putuchar,
+        .write = ns16550_write,
         .redraw = NULL
 };

kernel/genarch/src/drivers/pl011/pl011.c

@@ -56 +56 @@
 }
 
-static void pl011_uart_putuchar(outdev_t *dev, char32_t ch)
+static void pl011_uart_write(outdev_t *dev, const char *s, size_t n)
 {
         pl011_uart_t *uart = dev->data;
@@ -64 +64 @@
                 return;
 
-        if (!ascii_check(ch))
-                pl011_uart_sendb(uart, U_SPECIAL);
-        else {
-                if (ch == '\n')
-                        pl011_uart_sendb(uart, (uint8_t) '\r');
-                pl011_uart_sendb(uart, (uint8_t) ch);
+        const char *top = s + n;
+        assert(top >= s);
+
+        for (; s < top; s++) {
+                if (*s == '\n')
+                        pl011_uart_sendb(uart, '\r');
+
+                pl011_uart_sendb(uart, (uint8_t) *s);
         }
 }
 
 static outdev_operations_t pl011_uart_ops = {
-        .write = pl011_uart_putuchar,
+        .write = pl011_uart_write,
         .redraw = NULL,
         .scroll_up = NULL,

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_putuchar(outdev_t *, char32_t);
+static void fb_write(outdev_t *, const char *, size_t);
 static void fb_redraw(outdev_t *);
 static void fb_scroll_up(outdev_t *);
@@ -129 +132 @@
 
 static outdev_operations_t fbdev_ops = {
-        .write = fb_putuchar,
+        .write = fb_write,
         .redraw = fb_redraw,
         .scroll_up = fb_scroll_up,
@@ -418 +421 @@
  *
  */
-static void fb_putuchar(outdev_t *dev, char32_t ch)
-{
-        fb_instance_t *instance = (fb_instance_t *) dev->data;
-        spinlock_lock(&instance->lock);
-
+static void _putuchar(fb_instance_t *instance, char32_t ch)
+{
         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(' '),
@@ -459 +455 @@
                 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);
 }