Changeset 153cc76a in mainline for uspace/lib/c/generic/async.c

Timestamp:

2011-12-23T16:42:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7e1b130

Parents:

4291215 (diff), 2f0dd2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes.

File:

• uspace/lib/c/generic/async.c (modified) (4 diffs)

uspace/lib/c/generic/async.c

@@ -1998 +1998 @@
  *
  * @param exch  Exchange for sending the message.
- * @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 the 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 async_share_in_start(async_exch_t *exch, void *dst, size_t size,
-    sysarg_t arg, unsigned int *flags)
+int async_share_in_start(async_exch_t *exch, size_t size, sysarg_t arg,
+    unsigned int *flags, void **dst)
 {
         if (exch == NULL)
                 return ENOENT;
         
-        sysarg_t tmp_flags;
-        int res = async_req_3_2(exch, IPC_M_SHARE_IN, (sysarg_t) dst,
-            (sysarg_t) size, arg, NULL, &tmp_flags);
+        sysarg_t _flags = 0;
+        sysarg_t _dst = (sysarg_t) -1;
+        int res = async_req_2_4(exch, IPC_M_SHARE_IN, (sysarg_t) size,
+            arg, NULL, &_flags, NULL, &_dst);
         
         if (flags)
-                *flags = (unsigned int) tmp_flags;
-        
+                *flags = (unsigned int) _flags;
+        
+        *dst = (void *) _dst;
         return res;
 }
@@ -2047 +2049 @@
                 return false;
         
-        *size = (size_t) IPC_GET_ARG2(data);
+        *size = (size_t) IPC_GET_ARG1(data);
         return true;
 }
@@ -2053 +2055 @@
 /** Wrapper for answering the IPC_M_SHARE_IN calls using the async framework.
  *
- * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ
+ * This wrapper only makes it more comfortable to answer IPC_M_SHARE_IN
  * calls so that the user doesn't have to remember the meaning of each IPC
  * argument.
@@ -2131 +2133 @@
  *
  */
-int async_share_out_finalize(ipc_callid_t callid, void *dst)
+int async_share_out_finalize(ipc_callid_t callid, void **dst)
 {
         return ipc_share_out_finalize(callid, dst);