Changeset e68765e in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2017-08-20T16:58:10Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88db88d

Parents:

3f74275

Message:

Store capability's handle inside of it

File:

• kernel/generic/src/cap/cap.c (modified) (4 diffs)

kernel/generic/src/cap/cap.c

@@ -39 +39 @@
 #include <mm/slab.h>
 
-void cap_initialize(cap_t *cap)
+void cap_initialize(cap_t *cap, int handle)
 {
         cap->type = CAP_TYPE_INVALID;
+        cap->handle = handle;
         cap->can_reclaim = NULL;
 }
@@ -53 +54 @@
 {
         for (int i = 0; i < MAX_CAPS; i++)
-                cap_initialize(&task->caps[i]);
+                cap_initialize(&task->caps[i], i);
 }
 
@@ -84 +85 @@
                 if (cap->type > CAP_TYPE_ALLOCATED) {
                         if (cap->can_reclaim && cap->can_reclaim(cap))
-                                cap_initialize(cap);
+                                cap_initialize(cap, handle);
                 }
                 if (cap->type == CAP_TYPE_INVALID) {
@@ -104 +105 @@
 
         irq_spinlock_lock(&task->lock, true);
-        cap_initialize(&task->caps[handle]);
+        cap_initialize(&task->caps[handle], handle);
         irq_spinlock_unlock(&task->lock, true);
-}
-
-int cap_get_handle(task_t *task, cap_t *cap)
-{
-        return cap - task->caps;
 }