Changes in uspace/lib/c/generic/async/client.c [4805495:fafb8e5] in mainline

File:

• uspace/lib/c/generic/async/client.c (modified) (6 diffs)

uspace/lib/c/generic/async/client.c

@@ -95 +95 @@
  */
 
-#define _LIBC_ASYNC_C_
+#define LIBC_ASYNC_C_
 #include <ipc/ipc.h>
 #include <async.h>
 #include "../private/async.h"
 #include "../private/ns.h"
-#undef _LIBC_ASYNC_C_
+#undef LIBC_ASYNC_C_
 
 #include <ipc/irq.h>
@@ -216 +216 @@
         fibril_rmutex_lock(&message_mutex);
 
-        msg->retval = IPC_GET_RETVAL(*data);
+        msg->retval = ipc_get_retval(data);
 
         /* Copy data inside lock, just in case the call was detached */
@@ -486 +486 @@
 
         if (r1)
-                *r1 = IPC_GET_ARG1(result);
+                *r1 = ipc_get_arg1(&result);
 
         if (r2)
-                *r2 = IPC_GET_ARG2(result);
+                *r2 = ipc_get_arg2(&result);
 
         if (r3)
-                *r3 = IPC_GET_ARG3(result);
+                *r3 = ipc_get_arg3(&result);
 
         if (r4)
-                *r4 = IPC_GET_ARG4(result);
+                *r4 = ipc_get_arg4(&result);
 
         if (r5)
-                *r5 = IPC_GET_ARG5(result);
+                *r5 = ipc_get_arg5(&result);
 
         return rc;
@@ -538 +538 @@
 
         if (r1)
-                *r1 = IPC_GET_ARG1(result);
+                *r1 = ipc_get_arg1(&result);
 
         if (r2)
-                *r2 = IPC_GET_ARG2(result);
+                *r2 = ipc_get_arg2(&result);
 
         if (r3)
-                *r3 = IPC_GET_ARG3(result);
+                *r3 = ipc_get_arg3(&result);
 
         if (r4)
-                *r4 = IPC_GET_ARG4(result);
+                *r4 = ipc_get_arg4(&result);
 
         if (r5)
-                *r5 = IPC_GET_ARG5(result);
+                *r5 = ipc_get_arg5(&result);
 
         return rc;
@@ -805 +805 @@
                 return rc;
 
-        *out_phone = (cap_phone_handle_t) IPC_GET_ARG5(result);
+        *out_phone = (cap_phone_handle_t) ipc_get_arg5(&result);
         return EOK;
 }
@@ -1260 +1260 @@
 {
         return async_req_5_0(exch, IPC_M_STATE_CHANGE_AUTHORIZE,
-            arg1, arg2, arg3, 0, CAP_HANDLE_RAW(other_exch->phone));
+            arg1, arg2, arg3, 0, cap_handle_raw(other_exch->phone));
 }