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

Timestamp:

2009-01-31T21:27:18Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4863e50b

Parents:

96a2e45

Message:

silent kernel console output when user space console is active

File:

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

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

@@ -57 +57 @@
 static bool kbd_disabled;
 
-static void ski_putchar(chardev_t *d, const char ch);
-static int32_t ski_getchar(void);
-
 /** Display character on debug console
  *
@@ -68 +65 @@
  * @param ch Character to be printed.
  */
-void ski_putchar(chardev_t *d, const char ch)
-{
-        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');
+static void ski_putchar(chardev_t *d, const char 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');
+        }
 }
 
@@ -92 +91 @@
  * @return ASCII code of pressed key or 0 if no key pressed.
  */
-int32_t ski_getchar(void)
+static int32_t ski_getchar(void)
 {
         uint64_t ch;