Changeset c028b22 in mainline for uspace/srv/loader/main.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/srv/loader/main.c (modified) (6 diffs)

uspace/srv/loader/main.c

@@ -52 +52 @@
 #include <ipc/services.h>
 #include <ipc/loader.h>
-#include <ipc/ns.h>
-#include <macros.h>
+#include <ns.h>
 #include <loader/pcb.h>
 #include <entry_point.h>
@@ -60 +59 @@
 #include <str.h>
 #include <as.h>
-
 #include <elf.h>
 #include <elf_load.h>
@@ -412 +410 @@
  * to execute the loaded program).
  */
-static void ldr_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
-        ipc_call_t call;
-        int retval;
-        
+static void ldr_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
         /* Already have a connection? */
         if (connected) {
@@ -430 +424 @@
         
         /* Ignore parameters, the connection is already open */
-        (void) iid;
         (void) icall;
         
-        while (1) {
-                callid = async_get_call(&call);
+        while (true) {
+                int retval;
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
+                        exit(0);
                 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        exit(0);
                 case LOADER_GET_TASKID:
                         ldr_get_taskid(callid, &call);
@@ -465 +461 @@
                 }
                 
-                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
-                        async_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -479 +474 @@
         /* Introduce this task to the NS (give it our task ID). */
         task_id_t id = task_get_id();
-        int rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
+        int rc = ns_intro(id);
         if (rc != EOK)
                 return -1;