Changes in uspace/lib/c/generic/ipc.c [6aae539d:ab34cc9] in mainline

File:

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

uspace/lib/c/generic/ipc.c

@@ -48 +48 @@
 #include <fibril.h>
 #include <macros.h>
-#include "private/libc.h"
 
 /**
@@ -647 +646 @@
  *
  */
-int ipc_clone_establish(int phoneid)
+int ipc_connect_me(int phoneid)
 {
         sysarg_t newphid;
-        int res = ipc_call_sync_0_5(phoneid, IPC_M_CLONE_ESTABLISH, NULL,
-            NULL, NULL, NULL, &newphid);
+        int res = ipc_call_sync_0_5(phoneid, IPC_M_CONNECT_ME, NULL, NULL,
+            NULL, NULL, &newphid);
         if (res)
                 return res;
@@ -761 +760 @@
  *
  * @param phoneid Phone that will be used to contact the receiving side.
+ * @param dst     Destination address space area base.
  * @param size    Size of the destination address space area.
  * @param arg     User defined argument.
  * @param flags   Storage for received flags. Can be NULL.
- * @param dst     Destination address space area base. Cannot be NULL.
  *
  * @return Zero on success or a negative error code from errno.h.
  *
  */
-int ipc_share_in_start(int phoneid, size_t size, sysarg_t arg,
-    unsigned int *flags, void **dst)
-{
-        sysarg_t _flags = 0;
-        sysarg_t _dst = (sysarg_t) -1;
-        int res = ipc_call_sync_2_4(phoneid, IPC_M_SHARE_IN, (sysarg_t) size,
-            arg, NULL, &_flags, NULL, &_dst);
+int ipc_share_in_start(int phoneid, void *dst, size_t size, sysarg_t arg,
+    unsigned int *flags)
+{
+        sysarg_t tmp_flags = 0;
+        int res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst,
+            (sysarg_t) size, arg, NULL, &tmp_flags);
         
         if (flags)
-                *flags = (unsigned int) _flags;
-        
-        *dst = (void *) _dst;
+                *flags = (unsigned int) tmp_flags;
+        
         return res;
 }
@@ -786 +783 @@
 /** Wrapper for answering the IPC_M_SHARE_IN calls.
  *
- * This wrapper only makes it more comfortable to answer IPC_M_SHARE_IN
+ * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ
  * calls so that the user doesn't have to remember the meaning of each
  * IPC argument.
@@ -799 +796 @@
 int ipc_share_in_finalize(ipc_callid_t callid, void *src, unsigned int flags)
 {
-        return ipc_answer_3(callid, EOK, (sysarg_t) src, (sysarg_t) flags,
-            (sysarg_t) __entry);
+        return ipc_answer_2(callid, EOK, (sysarg_t) src, (sysarg_t) flags);
 }
 
@@ -830 +826 @@
  *
  */
-int ipc_share_out_finalize(ipc_callid_t callid, void **dst)
-{
-        return ipc_answer_2(callid, EOK, (sysarg_t) __entry, (sysarg_t) dst);
+int ipc_share_out_finalize(ipc_callid_t callid, void *dst)
+{
+        return ipc_answer_1(callid, EOK, (sysarg_t) dst);
 }