Changes in kernel/generic/include/cap/cap.h [31e15be:455241b] in mainline

File:

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

kernel/generic/include/cap/cap.h

@@ -37 +37 @@
 
 #include <abi/cap.h>
+#include <adt/hash_table.h>
+#include <adt/hash.h>
+#include <adt/list.h>
+#include <atomic.h>
+#include <lib/ra.h>
+#include <lib/refcount.h>
+#include <synch/mutex.h>
 #include <typedefs.h>
-#include <adt/list.h>
-#include <adt/hash.h>
-#include <adt/hash_table.h>
-#include <lib/ra.h>
-#include <synch/mutex.h>
-#include <atomic.h>
 
 typedef enum {
@@ -59 +60 @@
 } kobject_type_t;
 
-struct task;
-
-struct call;
-struct irq;
-struct phone;
-struct waitq;
+struct kobject;
 
 typedef struct kobject_ops {
-        void (*destroy)(void *);
+        void (*destroy)(struct kobject *);
 } kobject_ops_t;
 
@@ -76 +72 @@
 /*
  * Everything in kobject_t except for the atomic reference count, the capability
- * list and its lock is imutable.
+ * list and its lock is immutable.
  */
 typedef struct kobject {
         kobject_type_t type;
-        atomic_size_t refcnt;
+        atomic_refcount_t refcnt;
 
         /** Mutex protecting caps_list */
@@ -86 +82 @@
         /** List of published capabilities associated with the kobject */
         list_t caps_list;
-
-        union {
-                void *raw;
-                struct call *call;
-                struct irq *irq;
-                struct phone *phone;
-                struct waitq *waitq;
-        };
 } kobject_t;
 
@@ -129 +117 @@
 extern errno_t caps_task_alloc(struct task *);
 extern void caps_task_free(struct task *);
-extern void caps_task_init(struct task *);
+extern void caps_task_clear(struct task *task);
+extern errno_t caps_task_init(struct task *);
 extern bool caps_apply_to_kobject_type(struct task *, kobject_type_t,
     bool (*)(cap_t *, void *), void *);
@@ -139 +128 @@
 extern void cap_free(struct task *, cap_handle_t);
 
-extern kobject_t *kobject_alloc(unsigned int);
-extern void kobject_free(kobject_t *);
-extern void kobject_initialize(kobject_t *, kobject_type_t, void *);
+extern void kobject_initialize(kobject_t *, kobject_type_t);
 extern kobject_t *kobject_get(struct task *, cap_handle_t, kobject_type_t);
 extern void kobject_add_ref(kobject_t *);