Changeset ad7a6c9 in mainline for uspace/lib/c/generic/loader.c

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/generic/loader.c (modified) (5 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;
@@ -160 +160 @@
         int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len);
         if (rc != EOK) {
+                free(pa);
                 async_wait_for(req, NULL);
                 return rc;
@@ -319 +320 @@
                 return rc;
         
-        ipc_hangup(ldr->phone_id);
+        async_hangup(ldr->phone_id);
         ldr->phone_id = 0;
         return EOK;
@@ -337 +338 @@
 void loader_abort(loader_t *ldr)
 {
-        ipc_hangup(ldr->phone_id);
+        async_hangup(ldr->phone_id);
         ldr->phone_id = 0;
 }