Changes in kernel/generic/src/ipc/irq.c [c1f68b0:cde999a] in mainline

File:

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

kernel/generic/src/ipc/irq.c

@@ -294 +294 @@
         /* Free up the IRQ code and associated structures. */
         code_free(irq->notif_cfg.code);
-        slab_free(irq_slab, irq);
+        slab_free(irq_cache, irq);
 }
 
@@ -308 +308 @@
  * @param ucode   Uspace pointer to top-half IRQ code.
  *
- * @return  IRQ capability handle.
- * @return  Negative error code.
+ * @param[out] uspace_handle  Uspace pointer to IRQ capability handle
+ *
+ * @return  Error code.
  *
  */
 int ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
-    irq_code_t *ucode)
+    irq_code_t *ucode, cap_handle_t *uspace_handle)
 {
         if ((inr < 0) || (inr > last_inr))
@@ -329 +330 @@
          * Allocate and populate the IRQ kernel object.
          */
-        cap_handle_t handle = cap_alloc(TASK);
-        if (handle < 0)
-                return handle;
-        
-        irq_t *irq = (irq_t *) slab_alloc(irq_slab, FRAME_ATOMIC);
+        cap_handle_t handle;
+        int rc = cap_alloc(TASK, &handle);
+        if (rc != EOK)
+                return rc;
+        
+        rc = copy_to_uspace(uspace_handle, &handle, sizeof(cap_handle_t));
+        if (rc != EOK) {
+                cap_free(TASK, handle);
+                return rc;
+        }
+
+        irq_t *irq = (irq_t *) slab_alloc(irq_cache, FRAME_ATOMIC);
         if (!irq) {
                 cap_free(TASK, handle);
@@ -342 +350 @@
         if (!kobject) {
                 cap_free(TASK, handle);
-                slab_free(irq_slab, irq);
+                slab_free(irq_cache, irq);
                 return ENOMEM;
         }
@@ -371 +379 @@
         cap_publish(TASK, handle, kobject);
         
-        return handle;
+        return EOK;
 }
 
@@ -379 +387 @@
  * @param handle  IRQ capability handle.
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */