Changeset 9233e9d in mainline

Timestamp:

2017-12-08T21:17:27Z (6 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.

Files:

• kernel/generic/include/ipc/irq.h (modified) (1 diff)
• kernel/generic/include/ipc/sysipc.h (modified) (1 diff)
• kernel/generic/src/ipc/irq.c (modified) (3 diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)
• uspace/lib/c/generic/async.c (modified) (1 diff)
• uspace/lib/c/generic/irq.c (modified) (2 diffs)
• uspace/lib/c/include/ipc/irq.h (modified) (1 diff)

kernel/generic/include/ipc/irq.h

@@ -51 +51 @@
 extern void ipc_irq_top_half_handler(irq_t *);
 
-extern int ipc_irq_subscribe(answerbox_t *, inr_t, sysarg_t, irq_code_t *);
+extern int ipc_irq_subscribe(answerbox_t *, inr_t, sysarg_t, irq_code_t *,
+    cap_handle_t *);
 extern int ipc_irq_unsubscribe(answerbox_t *, int);
 

kernel/generic/include/ipc/sysipc.h

@@ -56 +56 @@
 extern sysarg_t sys_ipc_hangup(sysarg_t);
 
-extern sysarg_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *, cap_handle_t *);
 extern sysarg_t sys_ipc_irq_unsubscribe(sysarg_t);
 

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);
 }
 

uspace/lib/c/generic/async.c

@@ -1076 +1076 @@
         futex_up(&async_futex);
         
-        return ipc_irq_subscribe(inr, imethod, ucode);
+        cap_handle_t cap;
+        int rc = ipc_irq_subscribe(inr, imethod, ucode, &cap);
+        if (rc != EOK) {
+                return rc;
+        }
+        return cap;
 }
 

uspace/lib/c/generic/irq.c

@@ -58 +58 @@
  * @param ucode  Top-half pseudocode handler.
  *
- * @return IRQ capability handle returned by the kernel.
+ * @param[out] out_handle  IRQ capability handle returned by the kernel.
+ *
  * @return Error code returned by the kernel.
  *
  */
-int ipc_irq_subscribe(int inr, sysarg_t method, const irq_code_t *ucode)
+int ipc_irq_subscribe(int inr, sysarg_t method, const irq_code_t *ucode,
+    cap_handle_t *out_handle)
 {
         if (ucode == NULL)
                 ucode = &default_ucode;
         
-        return __SYSCALL3(SYS_IPC_IRQ_SUBSCRIBE, inr, method, (sysarg_t) ucode);
+        return __SYSCALL4(SYS_IPC_IRQ_SUBSCRIBE, inr, method, (sysarg_t) ucode,
+            (sysarg_t) out_handle);
 }
 
@@ -77 +80 @@
  *
  */
-int ipc_irq_unsubscribe(int cap)
+int ipc_irq_unsubscribe(cap_handle_t cap)
 {
         return __SYSCALL1(SYS_IPC_IRQ_UNSUBSCRIBE, cap);

uspace/lib/c/include/ipc/irq.h

@@ -38 +38 @@
 #include <types/common.h>
 #include <abi/ddi/irq.h>
+#include <abi/cap.h>
 
-extern int ipc_irq_subscribe(int, sysarg_t, const irq_code_t *);
-extern int ipc_irq_unsubscribe(int);
+extern int ipc_irq_subscribe(int, sysarg_t, const irq_code_t *, cap_handle_t *);
+extern int ipc_irq_unsubscribe(cap_handle_t);
 
 #endif