Changeset bb97118 in mainline for kernel/generic/src/ipc/ops

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:

kernel/generic/src/ipc/ops

Files:

• conctmeto.c (modified) (2 diffs)
• concttome.c (modified) (3 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -68 +68 @@
         cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(call->data);
 
-        if (CAP_HANDLE_RAW(phandle) < 0)
+        if (cap_handle_raw(phandle) < 0)
                 return EOK;
 
@@ -113 +113 @@
 
         if (IPC_GET_RETVAL(answer->data)) {
-                if (CAP_HANDLE_RAW(phandle) >= 0) {
+                if (cap_handle_raw(phandle) >= 0) {
                         /*
                          * Cleanup the unpublished capability and drop

kernel/generic/src/ipc/ops/concttome.c

@@ -52 +52 @@
         }
         call->priv = (sysarg_t) pobj;
-        IPC_SET_ARG5(call->data, CAP_HANDLE_RAW(phandle));
+        IPC_SET_ARG5(call->data, cap_handle_raw(phandle));
         return 0;
 }
@@ -61 +61 @@
         kobject_t *pobj = (kobject_t *) answer->priv;
 
-        if (CAP_HANDLE_VALID(phandle)) {
+        if (cap_handle_valid(phandle)) {
                 kobject_put(pobj);
                 cap_free(TASK, phandle);
@@ -77 +77 @@
                 /* The connection was not accepted */
                 answer_cleanup(answer, olddata);
-        } else if (CAP_HANDLE_VALID(phandle)) {
+        } else if (cap_handle_valid(phandle)) {
                 /*
                  * The connection was accepted