Changes in kernel/generic/src/console/console.c [0fe52ef:55b77d9] in mainline

File:

• kernel/generic/src/console/console.c (modified) (12 diffs)

kernel/generic/src/console/console.c

@@ -87 +87 @@
 };
 
-static void stdout_write(outdev_t *, wchar_t);
+static void stdout_write(outdev_t *, wchar_t, bool);
 static void stdout_redraw(outdev_t *);
 
@@ -95 +95 @@
 };
 
-/** Override kernel console lockout */
-bool console_override = false;
+/** Silence output */
+bool silent = false;
 
 /** Standard input and output character devices */
@@ -122 +122 @@
 }
 
-static void stdout_write(outdev_t *dev, wchar_t ch)
+static void stdout_write(outdev_t *dev, wchar_t ch, bool silent)
 {
         list_foreach(dev->list, cur) {
                 outdev_t *sink = list_get_instance(cur, outdev_t, link);
                 if ((sink) && (sink->op->write))
-                        sink->op->write(sink, ch);
+                        sink->op->write(sink, ch, silent);
         }
 }
@@ -156 +156 @@
         klog_parea.frames = SIZE2FRAMES(sizeof(klog));
         klog_parea.unpriv = false;
-        klog_parea.mapped = false;
         ddi_parea_register(&klog_parea);
         
@@ -168 +167 @@
 void grab_console(void)
 {
-        bool prev = console_override;
-        
-        console_override = true;
+        bool prev = silent;
+        
+        silent = false;
         if ((stdout) && (stdout->op->redraw))
                 stdout->op->redraw(stdout);
         
-        if ((stdin) && (!prev)) {
+        if ((stdin) && (prev)) {
                 /*
                  * Force the console to print the prompt.
@@ -184 +183 @@
 void release_console(void)
 {
-        console_override = false;
-}
-
-/** Activate kernel console override */
-sysarg_t sys_debug_activate_console(void)
+        // FIXME arch_release_console
+        silent = true;
+}
+
+/** Tell kernel to get keyboard/console access again */
+sysarg_t sys_debug_enable_console(void)
 {
 #ifdef CONFIG_KCONSOLE
@@ -196 +196 @@
         return false;
 #endif
+}
+
+/** Tell kernel to relinquish keyboard/console access */
+sysarg_t sys_debug_disable_console(void)
+{
+        release_console();
+        return true;
 }
 
@@ -248 +255 @@
 }
 
-void klog_update(void *event)
+void klog_update(void)
 {
         if (!atomic_get(&klog_inited))
@@ -282 +289 @@
                          */
                         spinlock_unlock(&klog_lock);
-                        stdout->op->write(stdout, tmp);
+                        stdout->op->write(stdout, tmp, silent);
                         spinlock_lock(&klog_lock);
                 }
@@ -310 +317 @@
                  * it should be no longer buffered.
                  */
-                stdout->op->write(stdout, ch);
+                stdout->op->write(stdout, ch, silent);
         } else {
                 /*
@@ -327 +334 @@
         /* Force notification on newline */
         if (ch == '\n')
-                klog_update(NULL);
+                klog_update();
 }
 
@@ -358 +365 @@
                 free(data);
         } else
-                klog_update(NULL);
+                klog_update();
         
         return size;