Changeset 132ab5d1 in mainline for kernel/generic/src/log/log.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

kernel/generic/src/log/log.c

@@ -223 +223 @@
                 int rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
                 if (rc != EOK) {
-                        return rc;
+                        return EOF;
                 }
                 
@@ -294 +294 @@
  */
 sysarg_t sys_klog(sysarg_t operation, void *buf, size_t size,
-    sysarg_t level)
+    sysarg_t level, size_t *uspace_nread)
 {
         char *data;
@@ -376 +376 @@
                                 return (sysarg_t) rc;
                         
-                        return copied;
+                        return copy_to_uspace(uspace_nread, &copied, sizeof(copied));
+                        return EOK;
                 default:
                         return (sysarg_t) ENOTSUP;