Changeset 29e7cc7 in mainline for kernel/genarch/src/drivers/dsrln/dsrlnout.c

Timestamp:

2025-04-18T15:14:10Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (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 branch 'upstream/master' into helenraid

File:

• kernel/genarch/src/drivers/dsrln/dsrlnout.c (modified) (1 diff)

kernel/genarch/src/drivers/dsrln/dsrlnout.c

@@ -49 +49 @@
 } dsrlnout_instance_t;
 
-static void dsrlnout_putuchar(outdev_t *dev, const char32_t ch)
+static void dsrlnout_write(outdev_t *dev, const char *s, size_t n)
 {
         dsrlnout_instance_t *instance = (dsrlnout_instance_t *) dev->data;
 
-        if ((!instance->parea.mapped) || (console_override)) {
-                if (ascii_check(ch))
-                        pio_write_8(instance->base, ch);
-                else
-                        pio_write_8(instance->base, U_SPECIAL);
+        if (instance->parea.mapped && !console_override)
+                return;
+
+        const char *top = s + n;
+        assert(top >= s);
+
+        for (; s < top; s++) {
+                if (*s == '\n')
+                        pio_write_8(instance->base, '\r');
+
+                pio_write_8(instance->base, (uint8_t) *s);
         }
 }
 
 static outdev_operations_t dsrlndev_ops = {
-        .write = dsrlnout_putuchar,
+        .write = dsrlnout_write,
         .redraw = NULL,
         .scroll_up = NULL,