Changeset 7bdcc45 in mainline for uspace/srv/loader/main.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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) (3 diffs)

uspace/srv/loader/main.c

@@ -383 +383 @@
                 callid = async_get_call(&call);
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         exit(0);
@@ -411 +411 @@
                         break;
                 }
-                if ((callid & IPC_CALLID_NOTIFICATION) == 0 &&
-                    IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
                         DPRINTF("Responding EINVAL to method %d.\n",
-                            IPC_GET_METHOD(call));
+                            IPC_GET_IMETHOD(call));
                         ipc_answer_0(callid, EINVAL);
                 }
@@ -424 +423 @@
 int main(int argc, char *argv[])
 {
-        ipcarg_t phonead;
+        sysarg_t phonead;
         task_id_t id;
         int rc;