Changeset 26f2af0 in mainline for uspace/lib/libc

Timestamp:

2007-09-18T19:58:19Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

47a776f9

Parents:

c3b25510

Message:

VFS work.
Implement VFS_REGISTER part of the protocol in the FAT file system.

IPC work.
Rename ipc_data_send_accept() to ipc_data_receive() and ipc_data_send_answer()
to ipc_data_deliver(). Introduce ipc_data_send().

Location:

uspace/lib/libc

Files:

• generic/ipc.c (modified) (5 diffs)
• include/async.h (modified) (1 diff)
• include/ipc/ipc.h (modified) (2 diffs)

uspace/lib/libc/generic/ipc.c

@@ -516 +516 @@
 int ipc_connect_to_me(int phoneid, int arg1, int arg2, ipcarg_t *phonehash)
 {
-        return ipc_call_sync_3(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2, 0, 0, 0,
-            phonehash);
+        return ipc_call_sync_3(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2, 0, 0,
+            0, phonehash);
 }
 
@@ -533 +533 @@
         int res;
 
-        res =  ipc_call_sync_3(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, 0, 0, 0,
+        res = ipc_call_sync_3(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, 0, 0, 0,
             &newphid);
         if (res)
@@ -596 +596 @@
 }
 
-/** Wrapper for accepting the IPC_M_DATA_SEND calls.
- *
- * This wrapper only makes it more comfortable to accept IPC_M_DATA_SEND calls
+/** Wrapper for making IPC_M_DATA_SEND calls.
+ *
+ * @param phoneid       Phone that will be used to contact the receiving side.
+ * @param src           Address of the beginning of the source buffer.
+ * @param size          Size of the source buffer.
+ *
+ * @return              Zero on success or a negative error code from errno.h.
+ */
+int ipc_data_send(int phoneid, void *src, size_t size)
+{
+        return ipc_call_sync_3(phoneid, IPC_M_DATA_SEND, 0, (ipcarg_t) src,
+            (ipcarg_t) size, NULL, NULL, NULL);
+}
+
+/** Wrapper for receiving the IPC_M_DATA_SEND calls.
+ *
+ * This wrapper only makes it more comfortable to receive IPC_M_DATA_SEND calls
  * so that the user doesn't have to remember the meaning of each IPC argument.
  *
@@ -613 +627 @@
  * @return              Non-zero on success, zero on failure.
  */
-int ipc_data_send_accept(ipc_callid_t *callid, ipc_call_t *call, void **dst,
+int ipc_data_receive(ipc_callid_t *callid, ipc_call_t *call, void **dst,
     size_t *size)
 {
@@ -641 +655 @@
  * @return              Zero on success or a value from @ref errno.h on failure.
  */
-ipcarg_t ipc_data_send_answer(ipc_callid_t callid, ipc_call_t *call, void *dst,     size_t size)
+ipcarg_t ipc_data_deliver(ipc_callid_t callid, ipc_call_t *call, void *dst,
+    size_t size)
 {
         IPC_SET_RETVAL(*call, EOK);

uspace/lib/libc/include/async.h

@@ -103 +103 @@
 
 fid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid, 
-                             ipc_call_t *call,
-                             void (*cthread)(ipc_callid_t,ipc_call_t *));
+    ipc_call_t *call, void (*cthread)(ipc_callid_t,ipc_call_t *));
 void async_usleep(suseconds_t timeout);
 void async_create_manager(void);

uspace/lib/libc/include/ipc/ipc.h

@@ -75 +75 @@
 
 #define ipc_call_async(phoneid, method, arg1, private, callback, can_preempt) \
-        (ipc_call_async_2(phoneid, method, arg1, 0, private, callback, \
-            can_preempt))
+    (ipc_call_async_2(phoneid, method, arg1, 0, private, callback, can_preempt))
 extern void ipc_call_async_2(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, void *private, ipc_async_callback_t callback,
@@ -91 +90 @@
 extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
     ipcarg_t arg1);
-
-extern int ipc_data_send_accept(ipc_callid_t *callid, ipc_call_t *call,
-    void **dst, size_t *size);
-extern ipcarg_t ipc_data_send_answer(ipc_callid_t callid, ipc_call_t *call,
+extern int ipc_data_send(int phoneid, void *src, size_t size);
+extern int ipc_data_receive(ipc_callid_t *callid, ipc_call_t *call, void **dst,
+    size_t *size);
+extern ipcarg_t ipc_data_deliver(ipc_callid_t callid, ipc_call_t *call,
     void *dst, size_t size);