Changeset 3e828ea in mainline for kernel/generic/src/ipc/ops/datawrite.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/generic/src/ipc/ops/datawrite.c (modified) (3 diffs)

kernel/generic/src/ipc/ops/datawrite.c

@@ -43 +43 @@
 static errno_t request_preprocess(call_t *call, phone_t *phone)
 {
-        uintptr_t src = ipc_get_arg1(&call->data);
+        uspace_addr_t src = ipc_get_arg1(&call->data);
         size_t size = ipc_get_arg2(&call->data);
 
@@ -59 +59 @@
         if (!call->buffer)
                 return ENOMEM;
-        errno_t rc = copy_from_uspace(call->buffer, (void *) src, size);
+        errno_t rc = copy_from_uspace(call->buffer, src, size);
         if (rc != EOK) {
                 /*
@@ -77 +77 @@
         if (!ipc_get_retval(&answer->data)) {
                 /* The recipient agreed to receive data. */
-                uintptr_t dst = (uintptr_t)ipc_get_arg1(&answer->data);
-                size_t size = (size_t)ipc_get_arg2(&answer->data);
-                size_t max_size = (size_t)ipc_get_arg2(olddata);
+                uspace_addr_t dst = ipc_get_arg1(&answer->data);
+                size_t size = ipc_get_arg2(&answer->data);
+                size_t max_size = ipc_get_arg2(olddata);
 
                 if (size <= max_size) {
-                        errno_t rc = copy_to_uspace((void *) dst,
+                        errno_t rc = copy_to_uspace(dst,
                             answer->buffer, size);
                         if (rc)