Changes in uspace/lib/c/generic/ipc.c [b7fd2a0:addbce4] in mainline

File:

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

uspace/lib/c/generic/ipc.c

@@ -93 +93 @@
  * @param call     Structure returned by ipc_prepare_async().
  */
-static inline void ipc_finish_async(errno_t rc, async_call_t *call)
+static inline void ipc_finish_async(int rc, async_call_t *call)
 {
         if (!call) {
@@ -136 +136 @@
                 return;
         
-        errno_t rc = (errno_t) __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phandle, imethod, arg1,
+        int rc = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phandle, imethod, arg1,
             arg2, arg3, (sysarg_t) call);
         
@@ -175 +175 @@
         IPC_SET_ARG5(call->msg.data, arg5);
         
-        errno_t rc = (errno_t) __SYSCALL3(SYS_IPC_CALL_ASYNC_SLOW, phandle,
+        int rc = __SYSCALL3(SYS_IPC_CALL_ASYNC_SLOW, phandle,
             (sysarg_t) &call->msg.data, (sysarg_t) call);
         
@@ -197 +197 @@
  *
  */
-errno_t ipc_answer_fast(cap_handle_t chandle, errno_t retval, sysarg_t arg1,
+sysarg_t ipc_answer_fast(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
-        return (errno_t) __SYSCALL6(SYS_IPC_ANSWER_FAST, chandle, (sysarg_t) retval, arg1, arg2,
+        return __SYSCALL6(SYS_IPC_ANSWER_FAST, chandle, retval, arg1, arg2,
             arg3, arg4);
 }
@@ -218 +218 @@
  *
  */
-errno_t ipc_answer_slow(cap_handle_t chandle, errno_t retval, sysarg_t arg1,
+sysarg_t ipc_answer_slow(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
 {
@@ -230 +230 @@
         IPC_SET_ARG5(data, arg5);
         
-        return (errno_t) __SYSCALL2(SYS_IPC_ANSWER_SLOW, chandle, (sysarg_t) &data);
+        return __SYSCALL2(SYS_IPC_ANSWER_SLOW, chandle, (sysarg_t) &data);
 }
 
@@ -254 +254 @@
  * @param usec   Timeout in microseconds
  * @param flags  Flags passed to SYS_IPC_WAIT (blocking, nonblocking).
- * @param[out] out_handle  Call handle.
- *
- * @return  Error code.
- */
-errno_t ipc_wait_cycle(ipc_call_t *call, sysarg_t usec, unsigned int flags)
-{
-        errno_t rc = (errno_t) __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags);
+ *
+ * @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);
         
         /* Handle received answers */
-        if ((rc == EOK) && (call->cap_handle == CAP_NIL) &&
-            (call->flags & IPC_CALL_ANSWERED)) {
+        if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED))
                 handle_answer(call);
-        }
-        
-        return rc;
+        
+        return chandle;
 }
 
@@ -286 +285 @@
  * @param usec  Timeout in microseconds
  *
- * @return  Error code.
- *
- */
-errno_t ipc_wait_for_call_timeout(ipc_call_t *call, sysarg_t usec)
-{
-        errno_t rc;
+ * @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;
         
         do {
-                rc = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
-        } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
-        
-        return rc;
+                chandle = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
+        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
+        
+        return chandle;
 }
 
@@ -306 +306 @@
  * @param call  Incoming call storage.
  *
- * @return  Error code.
- *
- */
-errno_t ipc_trywait_for_call(ipc_call_t *call)
-{
-        errno_t rc;
+ * @return  Call handle.
+ * @return  Negative error code.
+ *
+ */
+cap_handle_t ipc_trywait_for_call(ipc_call_t *call)
+{
+        cap_handle_t chandle;
         
         do {
-                rc = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
+                chandle = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
                     SYNCH_FLAGS_NON_BLOCKING);
-        } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
-        
-        return rc;
+        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
+        
+        return chandle;
 }
 
@@ -325 +326 @@
  * @param phandle  Handle of the phone to be hung up.
  *
- * @return  Zero on success or an error code.
- *
- */
-errno_t ipc_hangup(cap_handle_t phandle)
-{
-        return (errno_t) __SYSCALL1(SYS_IPC_HANGUP, phandle);
+ * @return  Zero on success or a negative error code.
+ *
+ */
+int ipc_hangup(cap_handle_t phandle)
+{
+        return __SYSCALL1(SYS_IPC_HANGUP, phandle);
 }
 
@@ -350 +351 @@
  *
  */
-errno_t ipc_forward_fast(cap_handle_t chandle, cap_handle_t phandle,
+int ipc_forward_fast(cap_handle_t chandle, cap_handle_t phandle,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, unsigned int mode)
 {
-        return (errno_t) __SYSCALL6(SYS_IPC_FORWARD_FAST, chandle, phandle, imethod, arg1,
+        return __SYSCALL6(SYS_IPC_FORWARD_FAST, chandle, phandle, imethod, arg1,
             arg2, mode);
 }
 
-errno_t ipc_forward_slow(cap_handle_t chandle, cap_handle_t phandle,
+int ipc_forward_slow(cap_handle_t chandle, cap_handle_t phandle,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
     sysarg_t arg4, sysarg_t arg5, unsigned int mode)
@@ -370 +371 @@
         IPC_SET_ARG5(data, arg5);
         
-        return (errno_t) __SYSCALL4(SYS_IPC_FORWARD_SLOW, chandle, phandle,
+        return __SYSCALL4(SYS_IPC_FORWARD_SLOW, chandle, phandle,
             (sysarg_t) &data, mode);
 }
@@ -377 +378 @@
  *
  */
-errno_t ipc_connect_kbox(task_id_t id, cap_handle_t *phone)
-{
-        return (errno_t) __SYSCALL2(SYS_IPC_CONNECT_KBOX, (sysarg_t) &id, (sysarg_t) phone);
+int ipc_connect_kbox(task_id_t id)
+{
+#ifdef __32_BITS__
+        sysarg64_t arg = (sysarg64_t) id;
+        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg);
+#endif
+        
+#ifdef __64_BITS__
+        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) id);
+#endif
 }