Changeset cf2af94 in mainline for uspace/srv/ns/clonable.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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:

Merge mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/srv/ns/clonable.c (modified) (5 diffs)

uspace/srv/ns/clonable.c

@@ -46 +46 @@
 typedef struct {
         link_t link;
-        ipcarg_t service;
+        sysarg_t service;
         ipc_call_t call;
         ipc_callid_t callid;
@@ -73 +73 @@
  *
  */
-void register_clonable(ipcarg_t service, ipcarg_t phone, ipc_call_t *call,
+void register_clonable(sysarg_t service, sysarg_t phone, ipc_call_t *call,
     ipc_callid_t callid)
 {
@@ -92 +92 @@
         
         ipc_forward_fast(csr->callid, phone, IPC_GET_ARG2(csr->call),
-                IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
+            IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
         
         free(csr);
@@ -107 +107 @@
  *
  */
-void connect_to_clonable(ipcarg_t service, ipc_call_t *call,
+void connect_to_clonable(sysarg_t service, ipc_call_t *call,
     ipc_callid_t callid)
 {
@@ -127 +127 @@
         }
         
+        link_initialize(&csr->link);
         csr->service = service;
         csr->call = *call;