Changeset b61d47d in mainline for uspace/lib/libc

Timestamp:

2007-12-02T20:00:14Z (18 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

90c35436

Parents:

8df2eab

Message:

Function ipc_connect_me_to sends 3 user defined arguments now.
One argument added also to ipc_forward_fast.
Fixed devmap and improved its test.

Location:

uspace/lib/libc

Files:

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

uspace/lib/libc/generic/async.c

@@ -539 +539 @@
         case IPC_M_CONNECT_ME_TO:
                 /* Open new connection with fibril etc. */
-                async_new_connection(IPC_GET_ARG3(*call), callid, call,
+                async_new_connection(IPC_GET_ARG5(*call), callid, call,
                     client_connection);
                 return;

uspace/lib/libc/generic/io/stream.c

@@ -97 +97 @@
         if (console_phone < 0) {
                 while ((console_phone = ipc_connect_me_to(PHONE_NS,
-                    SERVICE_CONSOLE, 0)) < 0) {
+                    SERVICE_CONSOLE, 0, 0)) < 0) {
                         usleep(10000);
                 }
@@ -116 +116 @@
         if (console_phone < 0) {
                 while ((console_phone = ipc_connect_me_to(PHONE_NS,
-                    SERVICE_CONSOLE, 0)) < 0) {
+                    SERVICE_CONSOLE, 0, 0)) < 0) {
                         usleep(10000);
                 }

uspace/lib/libc/generic/ipc.c

@@ -588 +588 @@
  * @param arg1          User defined argument.
  * @param arg2          User defined argument.
+ * @param arg3          User defined argument.
  *
  * @return              New phone handle on success or a negative error code.
  */
-int ipc_connect_me_to(int phoneid, int arg1, int arg2)
+int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3)
 {
         ipcarg_t newphid;
         int res;
 
-        res = ipc_call_sync_2_3(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, NULL,
-            NULL, &newphid);
+        res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, 
+                NULL, NULL, NULL, NULL, &newphid);
         if (res)
                 return res;
@@ -647 +648 @@
  * @param method        New method for the forwarded call.
  * @param arg1          New value of the first argument for the forwarded call.
+ * @param arg2          New value of the second argument for the forwarded call.
  * @param mode          Flags specifying mode of the forward operation.
  *
@@ -652 +654 @@
  *
  * For non-system methods, the old method and arg1 are rewritten by the new
- * values. For system methods, the new method and arg1 are written to the old
- * arg1 and arg2, respectivelly. Calls with immutable methods are forwarded
- * verbatim.
+ * values. For system methods, the new method, arg1 and arg2 are written 
+ * to the old arg1, arg2 and arg3, respectivelly. Calls with immutable 
+ * methods are forwarded verbatim.
  */
 int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
-    ipcarg_t arg1, int mode)
-{
-        return __SYSCALL5(SYS_IPC_FORWARD_FAST, callid, phoneid, method, arg1,
-            mode);
+    ipcarg_t arg1, ipcarg_t arg2, int mode)
+{
+        return __SYSCALL6(SYS_IPC_FORWARD_FAST, callid, phoneid, method, arg1, 
+                arg2, mode);
 }
 

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

@@ -254 +254 @@
 
 extern int ipc_connect_to_me(int phoneid, int arg1, int arg2, ipcarg_t *phone);
-extern int ipc_connect_me_to(int phoneid, int arg1, int arg2);
+extern int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3);
 extern int ipc_hangup(int phoneid);
 extern int ipc_register_irq(int inr, int devno, int method, irq_code_t *code);
 extern int ipc_unregister_irq(int inr, int devno);
 extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
-    ipcarg_t arg1, int mode);
+    ipcarg_t arg1, ipcarg_t arg2, int mode);
 extern int ipc_data_send(int phoneid, void *src, size_t size);
 extern int ipc_data_receive(ipc_callid_t *callid, void **dst, size_t *size);