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

kernel/arch/riscv64/src/drivers/ucb.c

@@ -41 +41 @@
 static volatile uint64_t *fromhost;
 
-static outdev_operations_t htifdev_ops = {
-        .write = htif_putuchar,
-        .redraw = NULL,
-        .scroll_up = NULL,
-        .scroll_down = NULL
-};
-
 static void poll_fromhost()
 {
@@ -56 +49 @@
         *fromhost = 0;
 }
+
+static void htif_cmd(uint8_t device, uint8_t cmd, uint64_t payload)
+{
+        uint64_t val = (((uint64_t) device) << 56) |
+            (((uint64_t) cmd) << 48) |
+            (payload & UINT64_C(0xffffffffffff));
+
+        while (*tohost)
+                poll_fromhost();
+
+        *tohost = val;
+}
+
+static void htif_write(outdev_t *dev, const char *s, size_t n)
+{
+        const char *top = s + n;
+        assert(top >= s);
+
+        for (; s < top; s++) {
+                if (*s == '\n')
+                        htif_cmd(HTIF_DEVICE_CONSOLE, HTIF_CONSOLE_PUTC, '\r');
+
+                htif_cmd(HTIF_DEVICE_CONSOLE, HTIF_CONSOLE_PUTC, (uint8_t) *s);
+        }
+}
+
+static outdev_operations_t htifdev_ops = {
+        .write = htif_write,
+        .redraw = NULL,
+        .scroll_up = NULL,
+        .scroll_down = NULL
+};
 
 void htif_init(volatile uint64_t *tohost_addr, volatile uint64_t *fromhost_addr)
@@ -72 +97 @@
         return htifdev;
 }
-
-static void htif_cmd(uint8_t device, uint8_t cmd, uint64_t payload)
-{
-        uint64_t val = (((uint64_t) device) << 56) |
-            (((uint64_t) cmd) << 48) |
-            (payload & UINT64_C(0xffffffffffff));
-
-        while (*tohost)
-                poll_fromhost();
-
-        *tohost = val;
-}
-
-void htif_putuchar(outdev_t *dev, const char32_t ch)
-{
-        if (ascii_check(ch))
-                htif_cmd(HTIF_DEVICE_CONSOLE, HTIF_CONSOLE_PUTC, ch);
-        else
-                htif_cmd(HTIF_DEVICE_CONSOLE, HTIF_CONSOLE_PUTC, U_SPECIAL);
-}