Changes in uspace/srv/ns/service.c [7b616e2:8a637a4] in mainline

File:

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

uspace/srv/ns/service.c

@@ -31 +31 @@
  */
 
+#include <ipc/ipc.h>
 #include <adt/hash_table.h>
 #include <assert.h>
-#include <async.h>
 #include <errno.h>
 #include <stdio.h>
@@ -47 +47 @@
         service_t service;
         
-        /** Session to the service */
-        async_sess_t *sess;
+        /** Phone registered with the interface */
+        sysarg_t phone;
+        
+        /** Incoming phone hash */
+        sysarg_t in_phone_hash;
 } hashed_service_t;
 
@@ -118 +121 @@
                 
                 hashed_service_t *hashed_service = hash_table_get_inst(link, hashed_service_t, link);
-                async_exch_t *exch = async_exchange_begin(hashed_service->sess);
-                async_forward_fast(pending->callid, exch, pending->iface,
-                    pending->arg3, 0, IPC_FF_NONE);
-                async_exchange_end(exch);
+                (void) ipc_forward_fast(pending->callid, hashed_service->phone,
+                    pending->iface, pending->arg3, 0, IPC_FF_NONE);
                 
                 list_remove(&pending->link);
@@ -150 +151 @@
         
         hashed_service->service = service;
-        hashed_service->sess = async_callback_receive(EXCHANGE_SERIALIZE);
-        if (hashed_service->sess == NULL)
-                return EIO;
+        hashed_service->phone = phone;
+        hashed_service->in_phone_hash = call->in_phone_hash;
         
         hash_table_insert(&service_hash_table, &hashed_service->link);
+        
         return EOK;
 }
@@ -201 +202 @@
         
         hashed_service_t *hashed_service = hash_table_get_inst(link, hashed_service_t, link);
-        async_exch_t *exch = async_exchange_begin(hashed_service->sess);
-        async_forward_fast(callid, exch, iface, arg3, 0, IPC_FF_NONE);
-        async_exchange_end(exch);
+        (void) ipc_forward_fast(callid, hashed_service->phone, iface, arg3,
+            0, IPC_FF_NONE);
         return;
         
 out:
-        async_answer_0(callid, retval);
+        if (!(callid & IPC_CALLID_NOTIFICATION))
+                ipc_answer_0(callid, retval);
 }