Changes in kernel/generic/include/cap/cap.h [09d01f2:c1f68b0] 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>
@@ -45 +44 @@
 #include <atomic.h>
 
+typedef int cap_handle_t;
+
 typedef enum {
         CAP_STATE_FREE,
@@ -52 +53 @@
 
 typedef enum {
-        KOBJECT_TYPE_CALL,
+        KOBJECT_TYPE_PHONE,
         KOBJECT_TYPE_IRQ,
-        KOBJECT_TYPE_PHONE,
         KOBJECT_TYPE_MAX
 } kobject_type_t;
 
 struct task;
-
-struct call;
+struct phone;
 struct irq;
-struct phone;
 
 struct kobject;
@@ -81 +79 @@
         union {
                 void *raw;
-                struct call *call;
+                struct phone *phone;
                 struct irq *irq;
-                struct phone *phone;
         };
 } kobject_t;
@@ -121 +118 @@
     bool (*)(cap_t *, void *), void *);
 
-extern int cap_alloc(struct task *, cap_handle_t *);
+extern cap_handle_t cap_alloc(struct task *);
 extern void cap_publish(struct task *, cap_handle_t, kobject_t *);
 extern kobject_t *cap_unpublish(struct task *, cap_handle_t, kobject_type_t);