Changes in uspace/lib/libc/generic/ipc.c [ba8f8cb:d9c8c81] in mainline

File:

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

uspace/lib/libc/generic/ipc.c

@@ -565 +565 @@
 }
 
-/** Interrupt one thread of this task from waiting for IPC. */
-void ipc_poke(void)
-{
-        __SYSCALL0(SYS_IPC_POKE);
-}
-
 /** Ask destination to do a callback connection.
  *
@@ -730 +724 @@
         int res;
         sysarg_t tmp_flags;
-        res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
+        res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
             (ipcarg_t) size, arg, NULL, &tmp_flags);
         if (flags)
@@ -737 +731 @@
 }
 
+/** Wrapper for receiving the IPC_M_SHARE_IN calls.
+ *
+ * This wrapper only makes it more comfortable to receive IPC_M_SHARE_IN calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
+ *
+ * So far, this wrapper is to be used from within a connection fibril.
+ *
+ * @param callid        Storage where the hash of the IPC_M_SHARE_IN call will
+ *                      be stored.
+ * @param size          Destination address space area size.    
+ *
+ * @return              Non-zero on success, zero on failure.
+ */
+int ipc_share_in_receive(ipc_callid_t *callid, size_t *size)
+{
+        ipc_call_t data;
+        
+        assert(callid);
+        assert(size);
+
+        *callid = async_get_call(&data);
+        if (IPC_GET_METHOD(data) != IPC_M_SHARE_IN)
+                return 0;
+        *size = (size_t) IPC_GET_ARG2(data);
+        return 1;
+}
+
 /** Wrapper for answering the IPC_M_SHARE_IN calls.
  *
@@ -763 +784 @@
 int ipc_share_out_start(int phoneid, void *src, int flags)
 {
-        return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
+        return async_req_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
             (ipcarg_t) flags);
+}
+
+/** Wrapper for receiving the IPC_M_SHARE_OUT calls.
+ *
+ * This wrapper only makes it more comfortable to receive IPC_M_SHARE_OUT calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
+ *
+ * So far, this wrapper is to be used from within a connection fibril.
+ *
+ * @param callid        Storage where the hash of the IPC_M_SHARE_OUT call will
+ *                      be stored.
+ * @param size          Storage where the source address space area size will be
+ *                      stored.
+ * @param flags         Storage where the sharing flags will be stored.
+ *
+ * @return              Non-zero on success, zero on failure.
+ */
+int ipc_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags)
+{
+        ipc_call_t data;
+        
+        assert(callid);
+        assert(size);
+        assert(flags);
+
+        *callid = async_get_call(&data);
+        if (IPC_GET_METHOD(data) != IPC_M_SHARE_OUT)
+                return 0;
+        *size = (size_t) IPC_GET_ARG2(data);
+        *flags = (int) IPC_GET_ARG3(data);
+        return 1;
 }
 
@@ -793 +845 @@
 int ipc_data_read_start(int phoneid, void *dst, size_t size)
 {
-        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
+        return async_req_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
             (ipcarg_t) size);
+}
+
+/** Wrapper for receiving the IPC_M_DATA_READ calls.
+ *
+ * This wrapper only makes it more comfortable to receive IPC_M_DATA_READ calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
+ *
+ * So far, this wrapper is to be used from within a connection fibril.
+ *
+ * @param callid        Storage where the hash of the IPC_M_DATA_READ call will
+ *                      be stored.
+ * @param size          Storage where the maximum size will be stored. Can be
+ *                      NULL.
+ *
+ * @return              Non-zero on success, zero on failure.
+ */
+int ipc_data_read_receive(ipc_callid_t *callid, size_t *size)
+{
+        ipc_call_t data;
+        
+        assert(callid);
+
+        *callid = async_get_call(&data);
+        if (IPC_GET_METHOD(data) != IPC_M_DATA_READ)
+                return 0;
+        if (size)
+                *size = (size_t) IPC_GET_ARG2(data);
+        return 1;
 }
 
@@ -824 +904 @@
 int ipc_data_write_start(int phoneid, const void *src, size_t size)
 {
-        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
+        return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
             (ipcarg_t) size);
+}
+
+/** Wrapper for receiving the IPC_M_DATA_WRITE calls.
+ *
+ * This wrapper only makes it more comfortable to receive IPC_M_DATA_WRITE calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
+ *
+ * So far, this wrapper is to be used from within a connection fibril.
+ *
+ * @param callid        Storage where the hash of the IPC_M_DATA_WRITE call will
+ *                      be stored.
+ * @param size          Storage where the suggested size will be stored. May be
+ *                      NULL
+ *
+ * @return              Non-zero on success, zero on failure.
+ */
+int ipc_data_write_receive(ipc_callid_t *callid, size_t *size)
+{
+        ipc_call_t data;
+        
+        assert(callid);
+
+        *callid = async_get_call(&data);
+        if (IPC_GET_METHOD(data) != IPC_M_DATA_WRITE)
+                return 0;
+        if (size)
+                *size = (size_t) IPC_GET_ARG2(data);
+        return 1;
 }