Changes in uspace/srv/ns/ns.c [a46e56b:a35b458] in mainline

File:

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

uspace/srv/ns/ns.c

@@ -49 +49 @@
 #include "task.h"
 
-static void ns_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void ns_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_call_t call;
-        cap_call_handle_t chandle;
+        ipc_callid_t callid;
         iface_t iface;
         service_t service;
@@ -63 +63 @@
                  */
                 if (service_clonable(service)) {
-                        connect_to_clonable(service, iface, icall, icall_handle);
+                        connect_to_clonable(service, iface, icall, iid);
                 } else {
-                        connect_to_service(service, iface, icall, icall_handle);
+                        connect_to_service(service, iface, icall, iid);
                 }
                 return;
         }
 
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(iid, EOK);
 
         while (true) {
                 process_pending_conn();
 
-                chandle = async_get_call(&call);
+                callid = async_get_call(&call);
                 if (!IPC_GET_IMETHOD(call))
                         break;
@@ -94 +94 @@
                          */
                         if (service_clonable(service)) {
-                                register_clonable(service, phone, &call, chandle);
+                                register_clonable(service, phone, &call, callid);
                                 continue;
                         } else {
@@ -107 +107 @@
                         id = (task_id_t)
                             MERGE_LOUP32(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-                        wait_for_task(id, &call, chandle);
+                        wait_for_task(id, &call, callid);
                         continue;
                 case NS_ID_INTRO:
@@ -121 +121 @@
                 }
 
-                async_answer_0(chandle, retval);
+                async_answer_0(callid, retval);
         }