Changes in kernel/generic/src/ipc/ops/datawrite.c [aafed15:5a5269d] in mainline

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);
-        size_t size = IPC_GET_ARG2(call->data);
+        uspace_addr_t src = ipc_get_arg1(&call->data);
+        size_t size = ipc_get_arg2(&call->data);
 
         if (size > DATA_XFER_LIMIT) {
-                int flags = IPC_GET_ARG3(call->data);
+                int flags = ipc_get_arg3(&call->data);
 
                 if (flags & IPC_XF_RESTRICT) {
                         size = DATA_XFER_LIMIT;
-                        IPC_SET_ARG2(call->data, size);
+                        ipc_set_arg2(&call->data, size);
                 } else
                         return ELIMIT;
@@ -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) {
                 /*
@@ -75 +75 @@
         assert(answer->buffer);
 
-        if (!IPC_GET_RETVAL(answer->data)) {
+        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)
-                                IPC_SET_RETVAL(answer->data, rc);
+                                ipc_set_retval(&answer->data, rc);
                 } else {
-                        IPC_SET_RETVAL(answer->data, ELIMIT);
+                        ipc_set_retval(&answer->data, ELIMIT);
                 }
         }