Changeset c028b22 in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

kernel/generic/src/console/console.c

@@ -87 +87 @@
 };
 
-static void stdout_write(outdev_t *, wchar_t, bool);
+static void stdout_write(outdev_t *, wchar_t);
 static void stdout_redraw(outdev_t *);
 
@@ -95 +95 @@
 };
 
-/** Silence output */
-bool silent = false;
+/** Override kernel console lockout */
+bool console_override = false;
 
 /** Standard input and output character devices */
@@ -122 +122 @@
 }
 
-static void stdout_write(outdev_t *dev, wchar_t ch, bool silent)
-{
-        link_t *cur;
-        
-        for (cur = dev->list.next; cur != &dev->list; cur = cur->next) {
+static void stdout_write(outdev_t *dev, wchar_t ch)
+{
+        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, silent);
+                        sink->op->write(sink, ch);
         }
 }
@@ -135 +133 @@
 static void stdout_redraw(outdev_t *dev)
 {
-        link_t *cur;
-        
-        for (cur = dev->list.next; cur != &dev->list; cur = cur->next) {
+        list_foreach(dev->list, cur) {
                 outdev_t *sink = list_get_instance(cur, outdev_t, link);
                 if ((sink) && (sink->op->redraw))
@@ -160 +156 @@
         klog_parea.frames = SIZE2FRAMES(sizeof(klog));
         klog_parea.unpriv = false;
+        klog_parea.mapped = false;
         ddi_parea_register(&klog_parea);
         
@@ -171 +168 @@
 void grab_console(void)
 {
-        bool prev = silent;
-        
-        silent = false;
+        bool prev = console_override;
+        
+        console_override = true;
         if ((stdout) && (stdout->op->redraw))
                 stdout->op->redraw(stdout);
         
-        if ((stdin) && (prev)) {
+        if ((stdin) && (!prev)) {
                 /*
                  * Force the console to print the prompt.
@@ -187 +184 @@
 void release_console(void)
 {
-        // FIXME arch_release_console
-        silent = true;
-}
-
-/** Tell kernel to get keyboard/console access again */
-sysarg_t sys_debug_enable_console(void)
+        console_override = false;
+}
+
+/** Activate kernel console override */
+sysarg_t sys_debug_activate_console(void)
 {
 #ifdef CONFIG_KCONSOLE
@@ -200 +196 @@
         return false;
 #endif
-}
-
-/** Tell kernel to relinquish keyboard/console access */
-sysarg_t sys_debug_disable_console(void)
-{
-        release_console();
-        return true;
 }
 
@@ -293 +282 @@
                          */
                         spinlock_unlock(&klog_lock);
-                        stdout->op->write(stdout, tmp, silent);
+                        stdout->op->write(stdout, tmp);
                         spinlock_lock(&klog_lock);
                 }
@@ -321 +310 @@
                  * it should be no longer buffered.
                  */
-                stdout->op->write(stdout, ch, silent);
+                stdout->op->write(stdout, ch);
         } else {
                 /*