Changeset ab87db5 in mainline for uspace/lib/c/generic/async/server.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:

• uspace/lib/c/generic/async/server.c (modified) (13 diffs)

uspace/lib/c/generic/async/server.c

@@ -546 +546 @@
         errno_t rc = mpsc_send(conn->msg_channel, call);
 
-        if (IPC_GET_IMETHOD(*call) == IPC_M_PHONE_HUNGUP) {
+        if (ipc_get_imethod(call) == IPC_M_PHONE_HUNGUP) {
                 /* Close the channel, but let the connection fibril answer. */
                 mpsc_close(conn->msg_channel);
@@ -656 +656 @@
         }
 
-        ht_link_t *link = hash_table_find(&notification_hash_table,
-            &IPC_GET_IMETHOD(*call));
+        sysarg_t imethod = ipc_get_imethod(call);
+        ht_link_t *link = hash_table_find(&notification_hash_table, &imethod);
         if (!link) {
                 /* Invalid notification. */
@@ -871 +871 @@
 
                 memset(call, 0, sizeof(ipc_call_t));
-                IPC_SET_IMETHOD(*call, IPC_M_PHONE_HUNGUP);
+                ipc_set_imethod(call, IPC_M_PHONE_HUNGUP);
                 call->cap_handle = CAP_NIL;
         }
@@ -944 +944 @@
 
         /* New connection */
-        if (IPC_GET_IMETHOD(*call) == IPC_M_CONNECT_ME_TO) {
+        if (ipc_get_imethod(call) == IPC_M_CONNECT_ME_TO) {
                 connection_t *conn = calloc(1, sizeof(*conn));
                 if (!conn) {
@@ -951 +951 @@
                 }
 
-                iface_t iface = (iface_t) IPC_GET_ARG1(*call);
+                iface_t iface = (iface_t) ipc_get_arg1(call);
 
                 // TODO: Currently ignores all ports but the first one.
@@ -1221 +1221 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_SHARE_IN)
+        if (ipc_get_imethod(call) != IPC_M_SHARE_IN)
                 return false;
 
-        *size = (size_t) IPC_GET_ARG1(*call);
+        *size = (size_t) ipc_get_arg1(call);
         return true;
 }
@@ -1276 +1276 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_SHARE_OUT)
+        if (ipc_get_imethod(call) != IPC_M_SHARE_OUT)
                 return false;
 
-        *size = (size_t) IPC_GET_ARG2(*call);
-        *flags = (unsigned int) IPC_GET_ARG3(*call);
+        *size = (size_t) ipc_get_arg2(call);
+        *flags = (unsigned int) ipc_get_arg3(call);
         return true;
 }
@@ -1329 +1329 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_DATA_READ)
+        if (ipc_get_imethod(call) != IPC_M_DATA_READ)
                 return false;
 
         if (size)
-                *size = (size_t) IPC_GET_ARG2(*call);
+                *size = (size_t) ipc_get_arg2(call);
 
         return true;
@@ -1488 +1488 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_DATA_WRITE)
+        if (ipc_get_imethod(call) != IPC_M_DATA_WRITE)
                 return false;
 
         if (size)
-                *size = (size_t) IPC_GET_ARG2(*call);
+                *size = (size_t) ipc_get_arg2(call);
 
         return true;
@@ -1732 +1732 @@
         async_get_call(&call);
 
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(call);
-
-        if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) ||
-            !CAP_HANDLE_VALID((phandle))) {
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(&call);
+
+        if ((ipc_get_imethod(&call) != IPC_M_CONNECT_TO_ME) ||
+            !cap_handle_valid((phandle))) {
                 async_answer_0(&call, EINVAL);
                 return NULL;
@@ -1776 +1776 @@
 async_sess_t *async_callback_receive_start(exch_mgmt_t mgmt, ipc_call_t *call)
 {
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(*call);
-
-        if ((IPC_GET_IMETHOD(*call) != IPC_M_CONNECT_TO_ME) ||
-            !CAP_HANDLE_VALID((phandle)))
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(call);
+
+        if ((ipc_get_imethod(call) != IPC_M_CONNECT_TO_ME) ||
+            !cap_handle_valid((phandle)))
                 return NULL;
 
@@ -1803 +1803 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_STATE_CHANGE_AUTHORIZE)
+        if (ipc_get_imethod(call) != IPC_M_STATE_CHANGE_AUTHORIZE)
                 return false;
 
@@ -1813 +1813 @@
         assert(call);
 
-        return async_answer_1(call, EOK, CAP_HANDLE_RAW(other_exch->phone));
+        return async_answer_1(call, EOK, cap_handle_raw(other_exch->phone));
 }