Changeset 6b03a3c in mainline for kernel/arch/ia64/src/drivers/ski.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/ia64/src/drivers/ski.c (modified) (3 diffs)

kernel/arch/ia64/src/drivers/ski.c

@@ -60 +60 @@
 };
 
-static void ski_putuchar(outdev_t *, const char32_t);
+static void ski_write(outdev_t *, const char *, size_t);
 
 static outdev_operations_t skidev_ops = {
-        .write = ski_putuchar,
+        .write = ski_write,
         .redraw = NULL,
         .scroll_up = NULL,
@@ -182 +182 @@
 }
 
-static void ski_do_putchar(char ch)
+static void ski_do_putchar(uint8_t ch)
 {
         asm volatile (
@@ -203 +203 @@
  *
  */
-static void ski_putuchar(outdev_t *dev, char32_t ch)
-{
+static void ski_write(outdev_t *dev, const char *s, size_t n)
+{
+        /* If the userspace owns the console, do not output anything. */
         if (ski_parea.mapped && !console_override)
                 return;
 
-        if (ascii_check(ch)) {
-                if (ch == '\n')
+        const char *top = s + n;
+        assert(top >= s);
+
+        for (; s < top; s++) {
+                if (*s == '\n')
                         ski_do_putchar('\r');
 
-                ski_do_putchar(ch);
-        } else {
-                ski_do_putchar('?');
+                ski_do_putchar((uint8_t) *s);
         }
 }