Changeset 6b03a3c in mainline for kernel/arch/sparc64/src/drivers/niagara.c

Timestamp:

2025-04-18T13:45:46Z (4 days ago)

Author:

GitHub <noreply@…>

Children:

9fc15f9

Parents:

94abc30c (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.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-18 13:45:46)

git-committer:

GitHub <noreply@…> (2025-04-18 13:45:46)

Message:

Merge branch 'HelenOS:master' into master

File:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (3 diffs)

kernel/arch/sparc64/src/drivers/niagara.c

@@ -57 +57 @@
 static niagara_instance_t *instance = NULL;
 
-static void niagara_putuchar(outdev_t *, const char32_t);
+static void niagara_write(outdev_t *, const char *, size_t);
 
 /** Character device operations */
 static outdev_operations_t niagara_ops = {
-        .write = niagara_putuchar,
+        .write = niagara_write,
         .redraw = NULL,
         .scroll_up = NULL,
@@ -95 +95 @@
 
 /** Write a single character to the standard output. */
-static inline void do_putchar(char c)
+static inline void do_putchar(uint8_t c)
 {
         /* Repeat until the buffer is non-full */
@@ -102 +102 @@
 }
 
-/** Write a single character to the standard output. */
-static void niagara_putuchar(outdev_t *dev, char32_t ch)
-{
-        if ((!outbuf_parea.mapped) || (console_override)) {
-                if (ascii_check(ch)) {
-                        do_putchar(ch);
-                        if (ch == '\n')
-                                do_putchar('\r');
-                } else {
-                        do_putchar('?');
-                }
+static void niagara_write(outdev_t *dev, const char *s, size_t n)
+{
+        /* If the userspace owns the console, do not output anything. */
+        if (outbuf_parea.mapped && !console_override)
+                return;
+
+        const char *top = s + n;
+        assert(top >= s);
+
+        for (; s < top; s++) {
+                if (*s == '\n')
+                        do_putchar('\r');
+
+                do_putchar((uint8_t) *s);
         }
 }