Changes in kernel/generic/include/cap/cap.h [c1f68b0:09d01f2] in mainline

File:

• kernel/generic/include/cap/cap.h (modified) (5 diffs)

kernel/generic/include/cap/cap.h

@@ -36 +36 @@
 #define KERN_CAP_H_
 
+#include <abi/cap.h>
 #include <typedefs.h>
 #include <adt/list.h>
@@ -44 +45 @@
 #include <atomic.h>
 
-typedef int cap_handle_t;
-
 typedef enum {
         CAP_STATE_FREE,
@@ -53 +52 @@
 
 typedef enum {
+        KOBJECT_TYPE_CALL,
+        KOBJECT_TYPE_IRQ,
         KOBJECT_TYPE_PHONE,
-        KOBJECT_TYPE_IRQ,
         KOBJECT_TYPE_MAX
 } kobject_type_t;
 
 struct task;
+
+struct call;
+struct irq;
 struct phone;
-struct irq;
 
 struct kobject;
@@ -79 +81 @@
         union {
                 void *raw;
+                struct call *call;
+                struct irq *irq;
                 struct phone *phone;
-                struct irq *irq;
         };
 } kobject_t;
@@ -118 +121 @@
     bool (*)(cap_t *, void *), void *);
 
-extern cap_handle_t cap_alloc(struct task *);
+extern int cap_alloc(struct task *, cap_handle_t *);
 extern void cap_publish(struct task *, cap_handle_t, kobject_t *);
 extern kobject_t *cap_unpublish(struct task *, cap_handle_t, kobject_type_t);