Changes in uspace/lib/c/generic/loader.c [63f8966:64d2b10] in mainline

File:

• uspace/lib/c/generic/loader.c (modified) (9 diffs)

uspace/lib/c/generic/loader.c

@@ -33 +33 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/loader.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <libc.h>
 #include <task.h>
@@ -63 +63 @@
 loader_t *loader_connect(void)
 {
-        int phone_id = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_LOAD, 0, 0);
+        int phone_id = service_connect_blocking(SERVICE_LOAD, 0, 0);
         if (phone_id < 0)
                 return NULL;
@@ -96 +96 @@
         }
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -131 +131 @@
         }
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -166 +166 @@
         free(pa);
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -213 +213 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_ARGS, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -267 +267 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
             count * sizeof(fdi_node_t));
         if (rc != EOK) {
@@ -319 +319 @@
                 return rc;
         
-        ipc_hangup(ldr->phone_id);
+        async_hangup(ldr->phone_id);
         ldr->phone_id = 0;
         return EOK;
@@ -337 +337 @@
 void loader_abort(loader_t *ldr)
 {
-        ipc_hangup(ldr->phone_id);
+        async_hangup(ldr->phone_id);
         ldr->phone_id = 0;
 }