Changeset bb97118 in mainline for uspace/lib/c

Timestamp:

2019-02-06T13:25:12Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

eb13ef8

Parents:

d066259

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 13:29:26)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)

Message:

Convert CAP_HANDLE_RAW and CAP_HANDLE_VALID into functions

Location:

uspace/lib/c/generic

Files:

• async/client.c (modified) (1 diff)
• async/server.c (modified) (3 diffs)
• ipc.c (modified) (7 diffs)
• irq.c (modified) (1 diff)

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

@@ -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));
 }
 

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

@@ -1735 +1735 @@
 
         if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) ||
-            !CAP_HANDLE_VALID((phandle))) {
+            !cap_handle_valid((phandle))) {
                 async_answer_0(&call, EINVAL);
                 return NULL;
@@ -1779 +1779 @@
 
         if ((IPC_GET_IMETHOD(*call) != IPC_M_CONNECT_TO_ME) ||
-            !CAP_HANDLE_VALID((phandle)))
+            !cap_handle_valid((phandle)))
                 return NULL;
 
@@ -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));
 }
 

uspace/lib/c/generic/ipc.c

@@ -71 +71 @@
 {
         return __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST,
-            CAP_HANDLE_RAW(phandle), imethod, arg1, arg2, arg3,
+            cap_handle_raw(phandle), imethod, arg1, arg2, arg3,
             (sysarg_t) label);
 }
@@ -106 +106 @@
 
         return __SYSCALL3(SYS_IPC_CALL_ASYNC_SLOW,
-            CAP_HANDLE_RAW(phandle), (sysarg_t) &data,
+            cap_handle_raw(phandle), (sysarg_t) &data,
             (sysarg_t) label);
 }
@@ -130 +130 @@
 {
         return (errno_t) __SYSCALL6(SYS_IPC_ANSWER_FAST,
-            CAP_HANDLE_RAW(chandle), (sysarg_t) retval, arg1, arg2, arg3, arg4);
+            cap_handle_raw(chandle), (sysarg_t) retval, arg1, arg2, arg3, arg4);
 }
 
@@ -160 +160 @@
 
         return (errno_t) __SYSCALL2(SYS_IPC_ANSWER_SLOW,
-            CAP_HANDLE_RAW(chandle), (sysarg_t) &data);
+            cap_handle_raw(chandle), (sysarg_t) &data);
 }
 
@@ -186 +186 @@
 errno_t ipc_hangup(cap_phone_handle_t phandle)
 {
-        return (errno_t) __SYSCALL1(SYS_IPC_HANGUP, CAP_HANDLE_RAW(phandle));
+        return (errno_t) __SYSCALL1(SYS_IPC_HANGUP, cap_handle_raw(phandle));
 }
 
@@ -210 +210 @@
 {
         return (errno_t) __SYSCALL6(SYS_IPC_FORWARD_FAST,
-            CAP_HANDLE_RAW(chandle), CAP_HANDLE_RAW(phandle), imethod, arg1,
+            cap_handle_raw(chandle), cap_handle_raw(phandle), imethod, arg1,
             arg2, mode);
 }
@@ -228 +228 @@
 
         return (errno_t) __SYSCALL4(SYS_IPC_FORWARD_SLOW,
-            CAP_HANDLE_RAW(chandle), CAP_HANDLE_RAW(phandle), (sysarg_t) &data,
+            cap_handle_raw(chandle), cap_handle_raw(phandle), (sysarg_t) &data,
             mode);
 }

uspace/lib/c/generic/irq.c

@@ -83 +83 @@
 {
         return (errno_t) __SYSCALL1(SYS_IPC_IRQ_UNSUBSCRIBE,
-            CAP_HANDLE_RAW(cap));
+            cap_handle_raw(cap));
 }