Changeset 25eec4e in mainline for kernel/generic/src/console/console.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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:

Merge mainline chages.

File:

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

kernel/generic/src/console/console.c

@@ -52 +52 @@
 #include <errno.h>
 #include <str.h>
+#include <abi/klog.h>
 
 #define KLOG_PAGES    8
@@ -335 +336 @@
  *
  */
-sysarg_t sys_klog(int fd, const void *buf, size_t size)
+sysarg_t sys_klog(int cmd, const void *buf, size_t size)
 {
         char *data;
         int rc;
-        
+
+        switch (cmd) {
+        case KLOG_UPDATE:
+                klog_update(NULL);
+                return EOK;
+        case KLOG_WRITE:
+        case KLOG_COMMAND:
+                break;
+        default:
+                return ENOTSUP;
+        }
+
         if (size > PAGE_SIZE)
                 return (sysarg_t) ELIMIT;
@@ -355 +367 @@
                 data[size] = 0;
                 
-                printf("%s", data);
+                switch (cmd) {
+                case KLOG_WRITE:
+                        printf("%s", data);
+                        break;
+                case KLOG_COMMAND:
+                        if (!stdin)
+                                break;
+                        for (unsigned int i = 0; i < size; i++)
+                                indev_push_character(stdin, data[i]);
+                        indev_push_character(stdin, '\n');
+                        break;
+                }
+
                 free(data);
-        } else
-                klog_update(NULL);
-        
+        }
+
         return size;
 }