Changeset e28175d in mainline for kernel/generic/src/ipc/ops/dataread.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

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

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

@@ -63 +63 @@
         if (!ipc_get_retval(&answer->data)) {
                 /* The recipient agreed to send data. */
-                uintptr_t src = ipc_get_arg1(&answer->data);
-                uintptr_t dst = ipc_get_arg1(olddata);
+                uspace_addr_t src = ipc_get_arg1(&answer->data);
+                uspace_addr_t dst = ipc_get_arg1(olddata);
                 size_t max_size = ipc_get_arg2(olddata);
                 size_t size = ipc_get_arg2(&answer->data);
@@ -81 +81 @@
                         }
                         errno_t rc = copy_from_uspace(answer->buffer,
-                            (void *) src, size);
+                            src, size);
                         if (rc) {
                                 ipc_set_retval(&answer->data, rc);
@@ -103 +103 @@
 {
         if (answer->buffer) {
-                uintptr_t dst = ipc_get_arg1(&answer->data);
+                uspace_addr_t dst = ipc_get_arg1(&answer->data);
                 size_t size = ipc_get_arg2(&answer->data);
                 errno_t rc;
 
-                rc = copy_to_uspace((void *) dst, answer->buffer, size);
+                rc = copy_to_uspace(dst, answer->buffer, size);
                 if (rc)
                         ipc_set_retval(&answer->data, rc);