Changeset b60c582 in mainline for kernel/arch/ia64/src/ski/ski.c

Timestamp:

2009-04-03T08:02:30Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2398ee9

Parents:

9be1d58

Message:

update for string changes

File:

• kernel/arch/ia64/src/ski/ski.c (modified) (3 diffs)

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

@@ -42 +42 @@
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
+#include <string.h>
 #include <arch.h>
 
@@ -49 +50 @@
 static bool kbd_disabled;
 
+static void ski_do_putchar(const wchar_t ch)
+{
+        asm volatile (
+                "mov r15 = %[cmd]\n"
+                "mov r32 = %[ch]\n"   /* r32 is in0 */
+                "break 0x80000\n"  /* modifies r8 */
+                :
+                : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch)
+                : "r15", "in0", "r8"
+        );
+}
+
 /** Display character on debug console
  *
@@ -57 +70 @@
  * @param ch Character to be printed.
  */
-static void ski_putchar(outdev_t *d, const char ch, bool silent)
+static void ski_putchar(outdev_t *d, const wchar_t ch, bool silent)
 {
         if (!silent) {
-                asm volatile (
-                        "mov r15 = %0\n"
-                        "mov r32 = %1\n"   /* r32 is in0 */
-                        "break 0x80000\n"  /* modifies r8 */
-                        :
-                        : "i" (SKI_PUTCHAR), "r" (ch)
-                        : "r15", "in0", "r8"
-                );
-                
-                if (ch == '\n')
-                        ski_putchar(d, '\r', false);
+                if (ascii_check(ch)) {
+                        if (ch == '\n')
+                                ski_do_putchar('\r');
+                        
+                        ski_do_putchar(ch);
+                } else
+                        ski_do_putchar(invalch);
         }
 }