Changeset bb97118 in mainline for kernel

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

Files:

• cap/cap.c (modified) (5 diffs)
• ipc/ipc.c (modified) (1 diff)
• ipc/ops/conctmeto.c (modified) (2 diffs)
• ipc/ops/concttome.c (modified) (3 diffs)
• ipc/sysipc.c (modified) (1 diff)

kernel/generic/src/cap/cap.c

@@ -98 +98 @@
 {
         cap_t *cap = hash_table_get_inst(item, cap_t, caps_link);
-        return hash_mix(CAP_HANDLE_RAW(cap->handle));
+        return hash_mix(cap_handle_raw(cap->handle));
 }
 
@@ -104 +104 @@
 {
         cap_handle_t *handle = (cap_handle_t *) key;
-        return hash_mix(CAP_HANDLE_RAW(*handle));
+        return hash_mix(cap_handle_raw(*handle));
 }
 
@@ -232 +232 @@
         assert(mutex_locked(&task->cap_info->lock));
 
-        if ((CAP_HANDLE_RAW(handle) < CAPS_START) ||
-            (CAP_HANDLE_RAW(handle) > CAPS_LAST))
+        if ((cap_handle_raw(handle) < CAPS_START) ||
+            (cap_handle_raw(handle) > CAPS_LAST))
                 return NULL;
         ht_link_t *link = hash_table_find(&task->cap_info->caps, &handle);
@@ -383 +383 @@
 void cap_free(task_t *task, cap_handle_t handle)
 {
-        assert(CAP_HANDLE_RAW(handle) >= CAPS_START);
-        assert(CAP_HANDLE_RAW(handle) <= CAPS_LAST);
+        assert(cap_handle_raw(handle) >= CAPS_START);
+        assert(cap_handle_raw(handle) <= CAPS_LAST);
 
         mutex_lock(&task->cap_info->lock);
@@ -392 +392 @@
 
         hash_table_remove_item(&task->cap_info->caps, &cap->caps_link);
-        ra_free(task->cap_info->handles, CAP_HANDLE_RAW(handle), 1);
+        ra_free(task->cap_info->handles, cap_handle_raw(handle), 1);
         slab_free(cap_cache, cap);
         mutex_unlock(&task->cap_info->lock);

kernel/generic/src/ipc/ipc.c

@@ -931 +931 @@
         mutex_lock(&phone->lock);
         if (phone->state != IPC_PHONE_FREE) {
-                printf("%-11d %7" PRIun " ", (int) CAP_HANDLE_RAW(cap->handle),
+                printf("%-11d %7" PRIun " ", (int) cap_handle_raw(cap->handle),
                     atomic_load(&phone->active_calls));
 

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

kernel/generic/src/ipc/sysipc.c

@@ -841 +841 @@
 
 error:
-        if (CAP_HANDLE_VALID(handle))
+        if (cap_handle_valid(handle))
                 cap_free(TASK, handle);