Changeset 516ff92 in mainline for kernel/generic

Timestamp:

2009-01-31T21:27:18Z (17 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

Location:

kernel/generic

Files:

• include/console/chardev.h (modified) (1 diff)
• include/console/console.h (modified) (1 diff)
• include/syscall/syscall.h (modified) (1 diff)
• src/console/cmd.c (modified) (1 diff)
• src/console/console.c (modified) (7 diffs)
• src/syscall/syscall.c (modified) (2 diffs)

kernel/generic/include/console/chardev.h

@@ -51 +51 @@
         void (* resume)(struct chardev *);
         /** Write character to stream. */
-        void (* write)(struct chardev *, char c);
+        void (* write)(struct chardev *, char c, bool silent);
         /** Read character directly from device, assume interrupts disabled. */
         char (* read)(struct chardev *); 

kernel/generic/include/console/console.h

@@ -50 +50 @@
 extern void putchar(char c);
 
+extern void grab_console(void);
+extern void release_console(void);
+
 extern void arch_grab_console(void);
 extern void arch_release_console(void);

kernel/generic/include/syscall/syscall.h

@@ -80 +80 @@
         
         SYS_DEBUG_ENABLE_CONSOLE,
+        SYS_DEBUG_DISABLE_CONSOLE,
         SYS_IPC_CONNECT_KBOX,
         SYSCALL_END

kernel/generic/src/console/cmd.c

@@ -977 +977 @@
 {
         printf("The kernel will now relinquish the console.\n");
-        arch_release_console();
+        release_console();
         
         if ((kconsole_notify) && (kconsole_irq.notif_cfg.notify))

kernel/generic/src/console/console.c

@@ -66 +66 @@
 static size_t klog_uspace = 0;
 
+/**< Silent output */
+static bool silent = false;
+
 /**< Kernel log spinlock */
 SPINLOCK_INITIALIZE(klog_lock);
@@ -71 +74 @@
 /** Physical memory area used for klog buffer */
 static parea_t klog_parea;
-        
+
 /*
  * For now, we use 0 as INR.
@@ -143 +146 @@
         klog_inited = true;
         spinlock_unlock(&klog_lock);
+}
+
+void grab_console(void)
+{
+        silent = false;
+        arch_grab_console();
+}
+
+void release_console(void)
+{
+        silent = true;
+        arch_release_console();
 }
 
@@ -200 +215 @@
         index_t index = 0;
         char ch;
-
+        
         while (index < buflen) {
                 ch = _getc(chardev);
@@ -214 +229 @@
                 } 
                 putchar(ch);
-
+                
                 if (ch == '\n') { /* end of string => write 0, return */
                         buf[index] = '\0';
@@ -254 +269 @@
                 index_t i;
                 for (i = klog_len - klog_stored; i < klog_len; i++)
-                        stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE]);
+                        stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE], silent);
                 klog_stored = 0;
         }
@@ -266 +281 @@
         
         if (stdout->op->write)
-                stdout->op->write(stdout, c);
+                stdout->op->write(stdout, c, silent);
         else {
                 /* The character is just in the kernel log */

kernel/generic/src/syscall/syscall.c

@@ -93 +93 @@
 {
 #ifdef CONFIG_KCONSOLE
-        arch_grab_console();
+        grab_console();
         return true;
 #else
         return false;
 #endif
+}
+
+/** Tell kernel to relinquish keyboard/console access */
+static unative_t sys_debug_disable_console(void)
+{
+        release_console();
+        return true;
 }
 
@@ -185 +192 @@
         /* Debug calls */
         (syshandler_t) sys_debug_enable_console,
-
+        (syshandler_t) sys_debug_disable_console,
+        
         (syshandler_t) sys_ipc_connect_kbox
 };