Changeset 84876aa4 in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master into gfx

Mainly to get XCW fixes

File:

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

kernel/generic/src/cap/cap.c

@@ -83 +83 @@
 #include <mm/slab.h>
 #include <adt/list.h>
+#include <synch/syswaitq.h>
+#include <ipc/ipcrsc.h>
+#include <ipc/ipc.h>
+#include <ipc/irq.h>
 
 #include <limits.h>
@@ -94 +98 @@
 static slab_cache_t *cap_cache;
 static slab_cache_t *kobject_cache;
+
+kobject_ops_t *kobject_ops[KOBJECT_TYPE_MAX] = {
+        [KOBJECT_TYPE_CALL] = &call_kobject_ops,
+        [KOBJECT_TYPE_IRQ] = &irq_kobject_ops,
+        [KOBJECT_TYPE_PHONE] = &phone_kobject_ops,
+        [KOBJECT_TYPE_WAITQ] = &waitq_kobject_ops
+};
 
 static size_t caps_hash(const ht_link_t *item)
@@ -412 +423 @@
  * @param type  Type of the kernel object.
  * @param raw   Raw pointer to the encapsulated object.
- * @param ops   Pointer to kernel object operations for the respective type.
- */
-void kobject_initialize(kobject_t *kobj, kobject_type_t type, void *raw,
-    kobject_ops_t *ops)
+ */
+void kobject_initialize(kobject_t *kobj, kobject_type_t type, void *raw)
 {
         atomic_store(&kobj->refcnt, 1);
@@ -424 +433 @@
         kobj->type = type;
         kobj->raw = raw;
-        kobj->ops = ops;
 }
 
@@ -474 +482 @@
 {
         if (atomic_postdec(&kobj->refcnt) == 1) {
-                kobj->ops->destroy(kobj->raw);
+                KOBJECT_OP(kobj)->destroy(kobj->raw);
                 kobject_free(kobj);
         }