Changeset 3f74275 in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2017-08-20T16:45:01Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e68765e

Parents:

e7ac23d0

Message:

Fix terminology around capabilities, capability handles and kernel objects

File:

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

kernel/generic/src/ipc/irq.c

@@ -84 +84 @@
 #include <print.h>
 #include <macros.h>
-#include <kobject/kobject.h>
+#include <cap/cap.h>
 
 static void ranges_unmap(irq_pio_range_t *ranges, size_t rangecount)
@@ -298 +298 @@
  * @param ucode   Uspace pointer to top-half pseudocode.
  *
- * @return  IRQ capability.
+ * @return  IRQ capability handle.
  * @return  Negative error code.
  *
@@ -324 +324 @@
          * Allocate and populate the IRQ kernel object.
          */
-        int cap = kobject_alloc(TASK);
-        if (cap < 0)
-                return cap;
-        kobject_t *kobj = kobject_get_current(cap, KOBJECT_TYPE_ALLOCATED);
-        assert(kobj);
-        kobj->type = KOBJECT_TYPE_IRQ;
-
-        irq_t *irq = &kobj->irq;
+        int handle = cap_alloc(TASK);
+        if (handle < 0)
+                return handle;
+        cap_t *cap = cap_get_current(handle, CAP_TYPE_ALLOCATED);
+        assert(cap);
+        cap->type = CAP_TYPE_IRQ;
+
+        irq_t *irq = &cap->irq;
         irq_initialize(irq);
         irq->inr = inr;
@@ -357 +357 @@
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
         
-        return cap;
+        return handle;
 }
 
 /** Unsubscribe task from IRQ notification.
  *
- * @param box      Answerbox associated with the notification.
- * @param irq_cap  IRQ capability.
+ * @param box     Answerbox associated with the notification.
+ * @param handle  IRQ capability handle.
  *
  * @return EOK on success or a negative error code.
  *
  */
-int ipc_irq_unsubscribe(answerbox_t *box, int irq_cap)
-{
-        kobject_t *kobj = kobject_get_current(irq_cap, KOBJECT_TYPE_IRQ);
-        if (!kobj)
+int ipc_irq_unsubscribe(answerbox_t *box, int handle)
+{
+        cap_t *cap = cap_get_current(handle, CAP_TYPE_IRQ);
+        if (!cap)
                 return ENOENT;
-        irq_t *irq = &kobj->irq;
+        irq_t *irq = &cap->irq;
 
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
@@ -394 +394 @@
         code_free(irq->notif_cfg.code);
         
-        /* Free up the IRQ kernel object. */
-        kobject_free(TASK, irq_cap);
+        /* Free up the IRQ capability and the underlying kernel object. */
+        cap_free(TASK, handle);
         
         return EOK;