Changeset c2417bc in mainline for kernel/genarch/src/srln/srln.c

Timestamp:

2009-04-21T12:46:26Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f2d2c7ba

Parents:

44b7783

Message:

change the way how input devices are wired together according to ticket #44
(also the proposal ​http://lists.modry.cz/cgi-bin/private/helenos-devel/2009-March/002507.html)

File:

• kernel/genarch/src/srln/srln.c (modified) (3 diffs)

kernel/genarch/src/srln/srln.c

@@ -42 +42 @@
 #include <string.h>
 
-static indev_t srlnout;
-
-indev_operations_t srlnout_ops = {
+static indev_operations_t srln_raw_ops = {
         .poll = NULL
 };
@@ -50 +48 @@
 static void ksrln(void *arg)
 {
-        indev_t *in = (indev_t *) arg;
+        srln_instance_t *instance = (srln_instance_t *) arg;
         bool cr = false;
         uint32_t escape = 0;
         
         while (true) {
-                wchar_t ch = _getc(in);
+                wchar_t ch = indev_pop_character(&instance->raw);
                 
                 /* ANSI escape sequence processing */
@@ -123 +121 @@
                         ch = '\b';
                 
-                indev_push_character(stdin, ch);
+                indev_push_character(instance->sink, ch);
         }
 }
 
-void srln_init(indev_t *devin)
+srln_instance_t *srln_init(void)
 {
-        indev_initialize("srln", &srlnout, &srlnout_ops);
-        thread_t *thread
-            = thread_create(ksrln, devin, TASK, 0, "ksrln", false);
+        srln_instance_t *instance
+            = malloc(sizeof(srln_instance_t), FRAME_ATOMIC);
+        if (instance) {
+                instance->thread
+                        = thread_create(ksrln, (void *) instance, TASK, 0, "ksrln", false);
+                
+                if (!instance->thread) {
+                        free(instance);
+                        return NULL;
+                }
+                
+                instance->sink = NULL;
+                indev_initialize("srln", &instance->raw, &srln_raw_ops);
+        }
         
-        if (thread) {
-                stdin = &srlnout;
-                thread_ready(thread);
-        }
+        return instance;
+}
+
+indev_t *srln_wire(srln_instance_t *instance, indev_t *sink)
+{
+        ASSERT(instance);
+        ASSERT(sink);
+        
+        instance->sink = sink;
+        thread_ready(instance->thread);
+        
+        return &instance->raw;
 }