Changeset 0fa34dd in mainline for uspace/lib/c

Timestamp:

2012-12-02T16:36:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

11527051

Parents:

3e6a98c5 (diff), 4a5ba372 (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 non contentious changesets from lp:~jakub/helenos/klog.

• Removal of the amd64 and ia32 kernel debugger.
• Allow klog to feed kconsole commands to kernel's stdin.

Location:

uspace/lib/c

Files:

• generic/io/klog.c (modified) (3 diffs)
• include/io/klog.h (modified) (1 diff)
• include/stdio.h (modified) (2 diffs)

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);
+}
+
+void klog_command(const void *buf, size_t size)
+{
+        (void) __SYSCALL3(SYS_KLOG, KLOG_COMMAND, (sysarg_t) buf, (sysarg_t) size);
 }
 

uspace/lib/c/include/io/klog.h

@@ -42 +42 @@
 extern size_t klog_write(const void *, size_t);
 extern void klog_update(void);
+extern void klog_command(const void *, size_t);
 extern int klog_printf(const char *, ...)
     PRINTF_ATTRIBUTE(1, 2);

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)); \
         }