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

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

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

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

@@ -43 +43 @@
 static errno_t request_preprocess(call_t *call, phone_t *phone)
 {
-        size_t size = IPC_GET_ARG2(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)
-                        IPC_SET_ARG2(call->data, DATA_XFER_LIMIT);
+                        ipc_set_arg2(&call->data, DATA_XFER_LIMIT);
                 else
                         return ELIMIT;
@@ -61 +61 @@
         assert(!answer->buffer);
 
-        if (!IPC_GET_RETVAL(answer->data)) {
+        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);
-                size_t max_size = IPC_GET_ARG2(*olddata);
-                size_t size = IPC_GET_ARG2(answer->data);
+                uintptr_t src = ipc_get_arg1(&answer->data);
+                uintptr_t dst = ipc_get_arg1(olddata);
+                size_t max_size = ipc_get_arg2(olddata);
+                size_t size = ipc_get_arg2(&answer->data);
 
                 if (size && size <= max_size) {
@@ -73 +73 @@
                          * information is not lost.
                          */
-                        IPC_SET_ARG1(answer->data, dst);
+                        ipc_set_arg1(&answer->data, dst);
 
                         answer->buffer = malloc(size);
                         if (!answer->buffer) {
-                                IPC_SET_RETVAL(answer->data, ENOMEM);
+                                ipc_set_retval(&answer->data, ENOMEM);
                                 return EOK;
                         }
@@ -83 +83 @@
                             (void *) src, size);
                         if (rc) {
-                                IPC_SET_RETVAL(answer->data, rc);
+                                ipc_set_retval(&answer->data, rc);
                                 /*
                                  * answer->buffer will be cleaned up in
@@ -91 +91 @@
                         }
                 } else if (!size) {
-                        IPC_SET_RETVAL(answer->data, EOK);
+                        ipc_set_retval(&answer->data, EOK);
                 } else {
-                        IPC_SET_RETVAL(answer->data, ELIMIT);
+                        ipc_set_retval(&answer->data, ELIMIT);
                 }
         }
@@ -103 +103 @@
 {
         if (answer->buffer) {
-                uintptr_t dst = IPC_GET_ARG1(answer->data);
-                size_t size = IPC_GET_ARG2(answer->data);
+                uintptr_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);
                 if (rc)
-                        IPC_SET_RETVAL(answer->data, rc);
+                        ipc_set_retval(&answer->data, rc);
         }