Changeset a801688b in mainline

Timestamp:

2012-11-23T20:25:27Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ec85df0

Parents:

2f33fbc

Message:

Make the SYS_KLOG interface more generic.

• Define klog methods KLOG_WRITE, KLOG_UPDATE and KLOG_COMMAND.
• KLOG_COMMAND is to be used to feed commands to the kconsole thread.

Files:

• abi/include/klog.h (added)
• kernel/generic/include/console/console.h (modified) (1 diff)
• kernel/generic/src/console/console.c (modified) (2 diffs)
• uspace/lib/c/generic/io/klog.c (modified) (3 diffs)
• uspace/lib/c/include/stdio.h (modified) (2 diffs)

kernel/generic/include/console/console.h

@@ -67 +67 @@
 extern wchar_t getc(indev_t *indev);
 extern size_t gets(indev_t *indev, char *buf, size_t buflen);
-extern sysarg_t sys_klog(int fd, const void *buf, size_t size);
+extern sysarg_t sys_klog(int cmd, const void *buf, size_t size);
 
 extern void grab_console(void);

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;

uspace/lib/c/generic/io/klog.c

@@ -39 +39 @@
 #include <unistd.h>
 #include <errno.h>
+#include <abi/klog.h>
 #include <io/klog.h>
 #include <io/printf_core.h>
@@ -44 +45 @@
 size_t klog_write(const void *buf, size_t size)
 {
-        ssize_t ret = (ssize_t) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size);
+        ssize_t ret = (ssize_t) __SYSCALL3(SYS_KLOG, KLOG_WRITE, (sysarg_t) buf, size);
         
         if (ret >= 0)
@@ -54 +55 @@
 void klog_update(void)
 {
-        (void) __SYSCALL3(SYS_KLOG, 1, (uintptr_t) NULL, 0);
+        (void) __SYSCALL3(SYS_KLOG, KLOG_UPDATE, (uintptr_t) NULL, 0);
 }
 

uspace/lib/c/include/stdio.h

@@ -40 +40 @@
 #include <str.h>
 #include <io/verify.h>
+#include <abi/klog.h>
 
 #define EOF  (-1)
@@ -51 +52 @@
                 int _n = snprintf(_buf, sizeof(_buf), fmt, ##__VA_ARGS__); \
                 if (_n > 0) \
-                        (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) _buf, str_size(_buf)); \
+                        (void) __SYSCALL3(SYS_KLOG, KLOG_WRITE, (sysarg_t) _buf, str_size(_buf)); \
         }