Changeset b9c7425 in mainline for kernel/generic/src

Timestamp:

2009-08-20T20:03:41Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc7d44c

Parents:

e731b0d

Message:

prepare outdev_t devices (particularly stdout) to work as repreaters
stop messing with the stdout pointer directly, use stdout_wire() instead

Location:

kernel/generic/src/console

Files:

• chardev.c (modified) (2 diffs)
• console.c (modified) (2 diffs)

kernel/generic/src/console/chardev.c

@@ -33 +33 @@
  */
 
+#include <adt/list.h>
 #include <console/chardev.h>
 #include <synch/waitq.h>
@@ -134 +135 @@
         outdev->name = name;
         spinlock_initialize(&outdev->lock, "outdev");
+        link_initialize(&outdev->link);
+        list_initialize(&outdev->list);
         outdev->op = op;
 }

kernel/generic/src/console/console.c

@@ -76 +76 @@
 static parea_t klog_parea;
 
+static indev_t stdin_sink;
+static outdev_t stdout_source;
+
 static indev_operations_t stdin_ops = {
         .poll = NULL
 };
 
+static void stdout_write(outdev_t *dev, wchar_t ch, bool silent);
+
+static outdev_operations_t stdout_ops = {
+        .write = stdout_write
+};
+
 /** Silence output */
 bool silent = false;
@@ -90 +99 @@
 {
         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);
+                sink->op->write(sink, ch, silent);
+        }
 }