Changeset 6deb2cd in mainline for uspace/lib/c/generic/ipc.c

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:

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:

• uspace/lib/c/generic/ipc.c (modified) (3 diffs)

uspace/lib/c/generic/ipc.c

@@ -254 +254 @@
  * @param usec   Timeout in microseconds
  * @param flags  Flags passed to SYS_IPC_WAIT (blocking, nonblocking).
- *
- * @return  Call handle.
- * @return  Negative error code.
- */
-cap_handle_t ipc_wait_cycle(ipc_call_t *call, sysarg_t usec, unsigned int flags)
-{
-        cap_handle_t chandle =
-            __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags);
+ * @param[out] out_handle  Call handle.
+ *
+ * @return  Error code.
+ */
+int ipc_wait_cycle(ipc_call_t *call, sysarg_t usec, unsigned int flags)
+{
+        int rc = __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags);
         
         /* Handle received answers */
-        if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED))
+        if ((rc == EOK) && (call->cap_handle == CAP_NIL) &&
+            (call->flags & IPC_CALL_ANSWERED)) {
                 handle_answer(call);
-        
-        return chandle;
+        }
+        
+        return rc;
 }
 
@@ -285 +286 @@
  * @param usec  Timeout in microseconds
  *
- * @return  Call handle.
- * @return  Negative error code.
- *
- */
-cap_handle_t ipc_wait_for_call_timeout(ipc_call_t *call, sysarg_t usec)
-{
-        cap_handle_t chandle;
+ * @return  Error code.
+ *
+ */
+int ipc_wait_for_call_timeout(ipc_call_t *call, sysarg_t usec)
+{
+        int rc;
         
         do {
-                chandle = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
-        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
-        
-        return chandle;
+                rc = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
+        } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
+        
+        return rc;
 }
 
@@ -306 +306 @@
  * @param call  Incoming call storage.
  *
- * @return  Call handle.
- * @return  Negative error code.
- *
- */
-cap_handle_t ipc_trywait_for_call(ipc_call_t *call)
-{
-        cap_handle_t chandle;
+ * @return  Error code.
+ *
+ */
+int ipc_trywait_for_call(ipc_call_t *call)
+{
+        int rc;
         
         do {
-                chandle = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
+                rc = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
                     SYNCH_FLAGS_NON_BLOCKING);
-        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
-        
-        return chandle;
+        } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
+        
+        return rc;
 }