Changeset ab87db5 in mainline for kernel/generic/src/mm/backend_user.c

Timestamp:

2019-02-23T17:16:01Z (6 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/mm/backend_user.c (modified) (3 diffs)

kernel/generic/src/mm/backend_user.c

@@ -119 +119 @@
 
         ipc_data_t data = { };
-        IPC_SET_IMETHOD(data, IPC_M_PAGE_IN);
-        IPC_SET_ARG1(data, upage - area->base);
-        IPC_SET_ARG2(data, PAGE_SIZE);
-        IPC_SET_ARG3(data, pager_info->id1);
-        IPC_SET_ARG4(data, pager_info->id2);
-        IPC_SET_ARG5(data, pager_info->id3);
+        ipc_set_imethod(&data, IPC_M_PAGE_IN);
+        ipc_set_arg1(&data, upage - area->base);
+        ipc_set_arg2(&data, PAGE_SIZE);
+        ipc_set_arg3(&data, pager_info->id1);
+        ipc_set_arg4(&data, pager_info->id2);
+        ipc_set_arg5(&data, pager_info->id3);
 
         errno_t rc = ipc_req_internal(pager_info->pager, &data, (sysarg_t) true);
@@ -136 +136 @@
         }
 
-        if (IPC_GET_RETVAL(data) != EOK)
+        if (ipc_get_retval(&data) != EOK)
                 return AS_PF_FAULT;
 
@@ -145 +145 @@
          */
 
-        uintptr_t frame = IPC_GET_ARG1(data);
+        uintptr_t frame = ipc_get_arg1(&data);
         page_mapping_insert(AS, upage, frame, as_area_get_flags(area));
         if (!used_space_insert(&area->used_space, upage, 1))