Changeset 4c61e60 in mainline for libipc/generic/ipc.c

Timestamp:

2006-03-19T19:42:38Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

06b0d112

Parents:

7048773

Message:

Adapt userspace API to conform to kernel api.

File:

• libipc/generic/ipc.c (modified) (8 diffs)

libipc/generic/ipc.c

@@ -47 +47 @@
                 ipc_callid_t callid;
                 struct {
+                        ipc_call_t data;
                         int phoneid;
-                        ipc_data_t data;
                 } msg;
         }u;
@@ -59 +59 @@
                   ipcarg_t *result)
 {
-        ipc_data_t resdata;
+        ipc_call_t resdata;
         int callres;
         
@@ -75 +75 @@
                     ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3)
 {
-        ipc_data_t data;
+        ipc_call_t data;
         int callres;
 
@@ -98 +98 @@
 
 /** Syscall to send asynchronous message */
-static  ipc_callid_t _ipc_call_async(int phoneid, ipc_data_t *data)
+static  ipc_callid_t _ipc_call_async(int phoneid, ipc_call_t *data)
 {
         return __SYSCALL2(SYS_IPC_CALL_ASYNC, phoneid, (sysarg_t)data);
@@ -153 +153 @@
 {
         __SYSCALL4(SYS_IPC_ANSWER_FAST, callid, retval, arg1, arg2);
-}
-
-
-/** Call syscall function sys_ipc_wait_for_call */
-static inline ipc_callid_t _ipc_wait_for_call(ipc_call_t *call, int flags)
-{
-        return __SYSCALL3(SYS_IPC_WAIT, (sysarg_t)&call->data, 
-                          (sysarg_t)&call->taskid, flags);
 }
 
@@ -194 +186 @@
  * @param callid Callid (with first bit set) of the answered call
  */
-static void handle_answer(ipc_callid_t callid, ipc_data_t *data)
+static void handle_answer(ipc_callid_t callid, ipc_call_t *data)
 {
         link_t *item;
@@ -230 +222 @@
                 try_dispatch_queued_calls();
 
-                callid = _ipc_wait_for_call(call, flags);
+                callid = __SYSCALL2(SYS_IPC_WAIT, (sysarg_t)call, flags);
                 /* Handle received answers */
                 if (callid & IPC_CALLID_ANSWERED)
-                        handle_answer(callid, &call->data);
+                        handle_answer(callid, call);
         } while (callid & IPC_CALLID_ANSWERED);
 
@@ -239 +231 @@
 }
 
-/** Ask destination to do a callback connection */
-int ipc_connect_to_me(int phoneid, int arg1, int arg2,
-                      unsigned long long *taskid)
-{
-        return __SYSCALL4(SYS_IPC_CONNECT_TO_ME, phoneid, arg1, arg2,
-                          (sysarg_t) taskid);
-}
-
-/** Ask through phone for a new connection to some service */
+/** Ask destination to do a callback connection
+ *
+ * @return 0 - OK, error code
+ */
+int ipc_connect_to_me(int phoneid, int arg1, int arg2, ipcarg_t *phone)
+{
+        return ipc_call_sync_3(phoneid, IPC_M_CONNECT_TO_ME, arg1,
+                               arg2, 0, 0, 0, phone);
+}
+
+/** Ask through phone for a new connection to some service
+ *
+ * @return new phoneid - OK, error code
+ */
 int ipc_connect_me_to(int phoneid, int arg1, int arg2)
 {
-        return __SYSCALL3(SYS_IPC_CONNECT_ME_TO, phoneid, arg1, arg2);
+        int newphid;
+        int res;
+
+        res =  ipc_call_sync_3(phoneid, IPC_M_CONNECT_ME_TO, arg1,
+                               arg2, 0, 0, 0, &newphid);
+        if (res)
+                return res;
+        return newphid;
 }