Changeset ab87db5 in mainline for uspace/srv/ns/ns.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:

• uspace/srv/ns/ns.c (modified) (6 diffs)

uspace/srv/ns/ns.c

@@ -55 +55 @@
         service_t service;
 
-        iface = IPC_GET_ARG1(*icall);
-        service = IPC_GET_ARG2(*icall);
+        iface = ipc_get_arg1(icall);
+        service = ipc_get_arg2(icall);
         if (service != 0) {
                 /*
@@ -76 +76 @@
 
                 async_get_call(&call);
-                if (!IPC_GET_IMETHOD(call))
+                if (!ipc_get_imethod(&call))
                         break;
 
@@ -84 +84 @@
                 service_t service;
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case NS_REGISTER:
-                        service = IPC_GET_ARG1(call);
-                        iface = IPC_GET_ARG2(call);
+                        service = ipc_get_arg1(&call);
+                        iface = ipc_get_arg2(&call);
 
                         /*
@@ -101 +101 @@
                         break;
                 case NS_REGISTER_BROKER:
-                        service = IPC_GET_ARG1(call);
+                        service = ipc_get_arg1(&call);
                         retval = ns_service_register_broker(service);
                         break;
@@ -109 +109 @@
                 case NS_TASK_WAIT:
                         id = (task_id_t)
-                            MERGE_LOUP32(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
+                            MERGE_LOUP32(ipc_get_arg1(&call), ipc_get_arg2(&call));
                         wait_for_task(id, &call);
                         continue;
@@ -120 +120 @@
                 default:
                         printf("%s: Method not supported (%" PRIun ")\n",
-                            NAME, IPC_GET_IMETHOD(call));
+                            NAME, ipc_get_imethod(&call));
                         retval = ENOTSUP;
                         break;