Changeset 1787e527 in mainline for kernel/generic/src/console/console.c

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• kernel/generic/src/console/console.c (modified) (6 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 */
 static parea_t klog_parea;
+
+static indev_t stdin_sink;
+static outdev_t stdout_source;
 
 static indev_operations_t stdin_ops = {
@@ -80 +83 @@
 };
 
+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;
@@ -90 +101 @@
 {
         if (stdin == NULL) {
-                stdin = malloc(sizeof(indev_t), FRAME_ATOMIC);
-                if (stdin != NULL)
-                        indev_initialize("stdin", stdin, &stdin_ops);
+                indev_initialize("stdin", &stdin_sink, &stdin_ops);
+                stdin = &stdin_sink;
         }
         
         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);
+        }
 }
 
@@ -128 +170 @@
         
         silent = false;
-        arch_grab_console();
+        if ((stdout) && (stdout->op->redraw))
+                stdout->op->redraw(stdout);
         
         /* Force the console to print the prompt */
@@ -137 +180 @@
 void release_console(void)
 {
+        // FIXME arch_release_console
         silent = true;
-        arch_release_console();
 }
 
@@ -276 +319 @@
         
         if (size > PAGE_SIZE)
-                return ELIMIT;
+                return (unative_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return ENOMEM;
+                        return (unative_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return rc;
+                        return (unative_t) rc;
                 }
                 data[size] = 0;