Changes in uspace/srv/ns/clonable.c [566992e1:3e6a98c5] in mainline

File:

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

uspace/srv/ns/clonable.c

@@ -46 +46 @@
 typedef struct {
         link_t link;
-        service_t service;
-        iface_t iface;
+        sysarg_t service;
+        ipc_call_t call;
         ipc_callid_t callid;
-        sysarg_t arg3;
 } cs_req_t;
 
@@ -62 +61 @@
 
 /** Return true if @a service is clonable. */
-bool service_clonable(service_t service)
+bool service_clonable(int service)
 {
-        return (service == SERVICE_LOADER);
+        return (service == SERVICE_LOAD);
 }
 
@@ -74 +73 @@
  *
  */
-void register_clonable(service_t service, sysarg_t phone, ipc_call_t *call,
+void register_clonable(sysarg_t service, sysarg_t phone, ipc_call_t *call,
     ipc_callid_t callid)
 {
-        link_t *req_link = list_first(&cs_req);
+        link_t *req_link;
+
+        req_link = list_first(&cs_req);
         if (req_link == NULL) {
                 /* There was no pending connection request. */
@@ -89 +90 @@
         
         /* Currently we can only handle a single type of clonable service. */
-        assert(csr->service == SERVICE_LOADER);
+        assert(csr->service == SERVICE_LOAD);
         
         ipc_answer_0(callid, EOK);
         
-        ipc_forward_fast(csr->callid, phone, csr->iface, csr->arg3, 0,
-            IPC_FF_NONE);
+        ipc_forward_fast(csr->callid, phone, IPC_GET_ARG2(csr->call),
+            IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
         
         free(csr);
@@ -103 +104 @@
  *
  * @param service Service to be connected to.
- * @param iface   Interface to be connected to.
  * @param call    Pointer to call structure.
  * @param callid  Call ID of the request.
@@ -110 +110 @@
  *
  */
-void connect_to_clonable(service_t service, iface_t iface, ipc_call_t *call,
+void connect_to_clonable(sysarg_t service, ipc_call_t *call,
     ipc_callid_t callid)
 {
-        assert(service == SERVICE_LOADER);
+        assert(service == SERVICE_LOAD);
         
         cs_req_t *csr = malloc(sizeof(cs_req_t));
@@ -132 +132 @@
         link_initialize(&csr->link);
         csr->service = service;
-        csr->iface = iface;
+        csr->call = *call;
         csr->callid = callid;
-        csr->arg3 = IPC_GET_ARG3(*call);
         
         /*