Changeset e1a27be in mainline for uspace/lib/c/generic/io

Timestamp:

2012-12-29T10:48:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb7 (diff), c928bb7 (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 changes

Location:

uspace/lib/c/generic/io

Files:

• chargrid.c (modified) (1 diff)
• io.c (modified) (1 diff)
• klog.c (modified) (3 diffs)
• window.c (modified) (1 diff)

uspace/lib/c/generic/io/chargrid.c

@@ -37 +37 @@
 #include <unistd.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <as.h>
 #include <io/chargrid.h>

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

@@ -39 +39 @@
 #include <str.h>
 #include <errno.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <malloc.h>
 #include <async.h>

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/generic/io/window.c

@@ -40 +40 @@
 #include <stdio.h>
 
-int win_register(async_sess_t *sess, service_id_t *in, service_id_t *out)
+int win_register(async_sess_t *sess, service_id_t *in, service_id_t *out, 
+    sysarg_t x_offset, sysarg_t y_offset)
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        int ret = async_req_0_2(exch, WINDOW_REGISTER, in, out);
+        int ret = async_req_2_2(exch, WINDOW_REGISTER, x_offset, y_offset, in, out);
         async_exchange_end(exch);