Changeset 6deb2cd in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

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

9233e9d

Parents:

125c09c

git-author:

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

git-committer:

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

Message:

Return capability handle in SYS_IPC_WAIT via call data structure, separately from error codes.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -744 +744 @@
  *                 for explanation.
  *
- * @return Capability handle of the received request.
- * @return CAP_NIL for answers, notifications and when there is no call.
  * @return Negative error code on error.
  */
@@ -767 +765 @@
 
         if (!call) {
-                STRUCT_TO_USPACE(calldata, &(ipc_data_t){});
-                return CAP_NIL;
+                ipc_data_t data = {0};
+                data.cap_handle = CAP_NIL;
+                STRUCT_TO_USPACE(calldata, &data);
+                return EOK;
         }
         
@@ -776 +776 @@
                 
                 call->data.flags = IPC_CALL_NOTIF;
+                call->data.cap_handle = CAP_NIL;
 
                 STRUCT_TO_USPACE(calldata, &call->data);
                 kobject_put(call->kobject);
                 
-                return CAP_NIL;
+                return EOK;
         }
         
@@ -792 +793 @@
 
                 call->data.flags = IPC_CALL_ANSWERED;
+                call->data.cap_handle = CAP_NIL;
                 
                 STRUCT_TO_USPACE(calldata, &call->data);
                 kobject_put(call->kobject);
                 
-                return CAP_NIL;
+                return EOK;
         }
         
@@ -809 +811 @@
         }
         
+        call->data.cap_handle = handle;
+
         /*
          * Include phone hash of the caller in the request, copy the whole
@@ -819 +823 @@
         kobject_add_ref(call->kobject);
         cap_publish(TASK, handle, call->kobject);
-        return handle;
+        return EOK;
 
 error: