Changeset 9233e9d in mainline for kernel/generic/src/ipc

Timestamp:

2017-12-08T21:17:27Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

071a1ddb

Parents:

6deb2cd

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 16:48:51)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return capability handle in SYS_IPC_IRQ_SUBSCRIBE separately from error code.

Location:

kernel/generic/src/ipc

Files:

• irq.c (modified) (3 diffs)
• sysipc.c (modified) (1 diff)

kernel/generic/src/ipc/irq.c

@@ -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))
@@ -333 +334 @@
                 return handle;
         
+        int 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) {
@@ -371 +378 @@
         cap_publish(TASK, handle, kobject);
         
-        return handle;
+        return EOK;
 }
 

kernel/generic/src/ipc/sysipc.c

@@ -864 +864 @@
  * @param ucode   Uspace pointer to the top-half pseudocode.
  *
- * @return IRQ kernel object capability
+ * @param[out] uspace_handle  Uspace pointer to IRQ kernel object capability
+ *
  * @return EPERM
  * @return Error code returned by ipc_irq_subscribe().
  *
  */
-sysarg_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod, irq_code_t *ucode)
+sysarg_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod, irq_code_t *ucode,
+        cap_handle_t *uspace_handle)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
                 return EPERM;
         
-        return ipc_irq_subscribe(&TASK->answerbox, inr, imethod, ucode);
+        return ipc_irq_subscribe(&TASK->answerbox, inr, imethod, ucode, uspace_handle);
 }