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

kernel/genarch/src/drivers/s3c24xx/uart.c

@@ -49 +49 @@
 #include <str.h>
 
-static void s3c24xx_uart_sendb(outdev_t *dev, uint8_t byte)
+static void s3c24xx_uart_sendb(s3c24xx_uart_t *uart, uint8_t byte)
 {
-        s3c24xx_uart_t *uart =
-            (s3c24xx_uart_t *) dev->data;
-
         /* Wait for space becoming available in Tx FIFO. */
         while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_TX_FULL) != 0)
@@ -61 +58 @@
 }
 
-static void s3c24xx_uart_putuchar(outdev_t *dev, char32_t ch)
+static void s3c24xx_uart_write(outdev_t *dev, const char *s, size_t n)
 {
-        s3c24xx_uart_t *uart =
-            (s3c24xx_uart_t *) dev->data;
+        s3c24xx_uart_t *uart = dev->data;
 
-        if ((!uart->parea.mapped) || (console_override)) {
-                if (!ascii_check(ch)) {
-                        s3c24xx_uart_sendb(dev, U_SPECIAL);
-                } else {
-                        if (ch == '\n')
-                                s3c24xx_uart_sendb(dev, (uint8_t) '\r');
-                        s3c24xx_uart_sendb(dev, (uint8_t) ch);
-                }
+        /* If the userspace owns the console, do not output anything. */
+        if (uart->parea.mapped && !console_override)
+                return;
+
+        const char *top = s + n;
+        assert(top >= s);
+
+        for (; s < top; s++) {
+                if (*s == '\n')
+                        s3c24xx_uart_sendb(uart, '\r');
+
+                s3c24xx_uart_sendb(uart, (uint8_t) *s);
         }
 }
@@ -94 +94 @@
 
 static outdev_operations_t s3c24xx_uart_ops = {
-        .write = s3c24xx_uart_putuchar,
+        .write = s3c24xx_uart_write,
         .redraw = NULL,
         .scroll_up = NULL,