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

Timestamp:

2009-08-21T14:12:45Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0e6dce8, b50b5af2, e5792d1

Parents:

90c8b8d

Message:

kernel output devices now suport multiple instances (except ski and sgcn, which respect the same interface, but behave as singletons)
if more than one output device gets initialized, the output is cloned to all of them
get rid of arch_grab_console() and arch_release_console() (output devices can implement a generic "redraw" method, input devices respect the "silent" global variable)
related cleanups and modifications

File:

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

kernel/generic/src/console/console.c

@@ -71 +71 @@
 
 /** Kernel log spinlock */
-SPINLOCK_INITIALIZE(klog_lock);
+SPINLOCK_STATIC_INITIALIZE_NAME(klog_lock, "*klog_lock");
 
 /** Physical memory area used for klog buffer */
@@ -84 +84 @@
 
 static void stdout_write(outdev_t *dev, wchar_t ch, bool silent);
+static void stdout_redraw(outdev_t *dev);
 
 static outdev_operations_t stdout_ops = {
-        .write = stdout_write
+        .write = stdout_write,
+        .redraw = stdout_redraw
 };
 
@@ -122 +124 @@
         for (cur = dev->list.next; cur != &dev->list; cur = cur->next) {
                 outdev_t *sink = list_get_instance(cur, outdev_t, link);
-                sink->op->write(sink, ch, silent);
+                if ((sink) && (sink->op->write))
+                        sink->op->write(sink, ch, silent);
+        }
+}
+
+static void stdout_redraw(outdev_t *dev)
+{
+        link_t *cur;
+        
+        for (cur = dev->list.next; cur != &dev->list; cur = cur->next) {
+                outdev_t *sink = list_get_instance(cur, outdev_t, link);
+                if ((sink) && (sink->op->redraw))
+                        sink->op->redraw(sink);
         }
 }
@@ -156 +170 @@
         
         silent = false;
-        arch_grab_console();
+        if ((stdout) && (stdout->op->redraw))
+                stdout->op->redraw(stdout);
         
         /* Force the console to print the prompt */
@@ -165 +180 @@
 void release_console(void)
 {
+        // FIXME arch_release_console
         silent = true;
-        arch_release_console();
 }