Changes in kernel/generic/src/ipc/irq.c [82d515e9:b7fd2a0] in mainline

File:

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

kernel/generic/src/ipc/irq.c

@@ -78 +78 @@
 }
 
-static int ranges_map_and_apply(irq_pio_range_t *ranges, size_t rangecount,
+static errno_t ranges_map_and_apply(irq_pio_range_t *ranges, size_t rangecount,
     irq_cmd_t *cmds, size_t cmdcount)
 {
@@ -164 +164 @@
  *
  */
-static int code_check(irq_cmd_t *cmds, size_t cmdcount)
+static errno_t code_check(irq_cmd_t *cmds, size_t cmdcount)
 {
         for (size_t i = 0; i < cmdcount; i++) {
@@ -226 +226 @@
         
         irq_code_t *code = malloc(sizeof(*code), 0);
-        int rc = copy_from_uspace(code, ucode, sizeof(*code));
+        errno_t rc = copy_from_uspace(code, ucode, sizeof(*code));
         if (rc != EOK)
                 goto error;
@@ -308 +308 @@
  * @param ucode   Uspace pointer to top-half IRQ code.
  *
- * @return  IRQ capability handle.
- * @return  Negative error code.
- *
- */
-int ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
-    irq_code_t *ucode)
+ * @param[out] uspace_handle  Uspace pointer to IRQ capability handle
+ *
+ * @return  Error code.
+ *
+ */
+errno_t ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
+    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;
-        
+        cap_handle_t handle;
+        errno_t 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) {
@@ -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.
- *
- */
-int ipc_irq_unsubscribe(answerbox_t *box, int handle)
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t ipc_irq_unsubscribe(answerbox_t *box, int handle)
 {
         kobject_t *kobj = cap_unpublish(TASK, handle, KOBJECT_TYPE_IRQ);