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

Timestamp:

2018-05-29T13:25:07Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fc0b2a8

Parents:

a57fa32

git-author:

Jiri Svoboda <jiri@…> (2018-05-28 17:24:17)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-29 13:25:07)

Message:

fputc, putchar vs. fputwc, putwchar.

File:

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

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

@@ -58 +58 @@
 static niagara_instance_t *instance = NULL;
 
-static void niagara_putchar(outdev_t *, const wchar_t);
+static void niagara_putwchar(outdev_t *, const wchar_t);
 
 /** Character device operations */
 static outdev_operations_t niagara_ops = {
-        .write = niagara_putchar,
+        .write = niagara_putwchar,
         .redraw = NULL,
         .scroll_up = NULL,
@@ -96 +96 @@
 
 /** Write a single character to the standard output. */
-static inline void do_putchar(const char c)
+static inline void do_putchar(char c)
 {
         /* Repeat until the buffer is non-full */
@@ -104 +104 @@
 
 /** Write a single character to the standard output. */
-static void niagara_putchar(outdev_t *dev, const wchar_t ch)
+static void niagara_putwchar(outdev_t *dev, wchar_t ch)
 {
         if ((!outbuf_parea.mapped) || (console_override)) {
-                do_putchar(ch);
-                if (ch == '\n')
-                        do_putchar('\r');
+                if (ascii_check(ch)) {
+                        do_putchar(ch);
+                        if (ch == '\n')
+                                do_putchar('\r');
+                } else {
+                        do_putchar('?');
+                }
         }
 }