Changes in uspace/srv/ns/clonable.c [7b616e2:566992e1] in mainline

File:

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

uspace/srv/ns/clonable.c

@@ -31 +31 @@
  */
 
-#include <async.h>
+#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <adt/list.h>
@@ -81 +81 @@
                 /* There was no pending connection request. */
                 printf("%s: Unexpected clonable server.\n", NAME);
-                async_answer_0(callid, EBUSY);
+                ipc_answer_0(callid, EBUSY);
                 return;
         }
@@ -91 +91 @@
         assert(csr->service == SERVICE_LOADER);
         
-        async_answer_0(callid, EOK);
+        ipc_answer_0(callid, EOK);
         
-        async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
-        if (sess == NULL)
-                async_answer_0(callid, EIO);
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        async_forward_fast(csr->callid, exch, csr->iface, csr->arg3, 0,
+        ipc_forward_fast(csr->callid, phone, csr->iface, csr->arg3, 0,
             IPC_FF_NONE);
-        async_exchange_end(exch);
         
         free(csr);
-        async_hangup(sess);
+        ipc_hangup(phone);
 }
 
@@ -123 +117 @@
         cs_req_t *csr = malloc(sizeof(cs_req_t));
         if (csr == NULL) {
-                async_answer_0(callid, ENOMEM);
+                ipc_answer_0(callid, ENOMEM);
                 return;
         }
@@ -132 +126 @@
         if (rc < 0) {
                 free(csr);
-                async_answer_0(callid, rc);
+                ipc_answer_0(callid, rc);
                 return;
         }