Changes in kernel/generic/src/console/console.c [a71c158:98000fb] in mainline

File:

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

kernel/generic/src/console/console.c

@@ -71 +71 @@
 
 /** Kernel log spinlock */
-SPINLOCK_STATIC_INITIALIZE_NAME(klog_lock, "*klog_lock");
+SPINLOCK_INITIALIZE(klog_lock);
 
 /** Physical memory area used for klog buffer */
 static parea_t klog_parea;
-
-static indev_t stdin_sink;
-static outdev_t stdout_source;
 
 static indev_operations_t stdin_ops = {
@@ -83 +80 @@
 };
 
-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,
-        .redraw = stdout_redraw
-};
-
 /** Silence output */
 bool silent = false;
@@ -101 +90 @@
 {
         if (stdin == NULL) {
-                indev_initialize("stdin", &stdin_sink, &stdin_ops);
-                stdin = &stdin_sink;
+                stdin = malloc(sizeof(indev_t), FRAME_ATOMIC);
+                if (stdin != NULL)
+                        indev_initialize("stdin", stdin, &stdin_ops);
         }
         
         return stdin;
-}
-
-void stdout_wire(outdev_t *outdev)
-{
-        if (stdout == NULL) {
-                outdev_initialize("stdout", &stdout_source, &stdout_ops);
-                stdout = &stdout_source;
-        }
-        
-        list_append(&outdev->link, &stdout->list);
-}
-
-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) {
-                outdev_t *sink = list_get_instance(cur, outdev_t, link);
-                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);
-        }
 }
 
@@ -170 +128 @@
         
         silent = false;
-        if ((stdout) && (stdout->op->redraw))
-                stdout->op->redraw(stdout);
+        arch_grab_console();
         
         /* Force the console to print the prompt */
@@ -180 +137 @@
 void release_console(void)
 {
-        // FIXME arch_release_console
         silent = true;
+        arch_release_console();
 }