Changeset 87b4baa in mainline for uspace/app/tester/ipc/register.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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/app/tester/ipc/register.c (modified) (2 diffs)

uspace/app/tester/ipc/register.c

@@ -56 +56 @@
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         TPRINTF("Phone %" PRIun " hung up\n", icall->in_phone_hash);
@@ -79 +79 @@
         async_set_client_connection(client_connection);
         
-        ipcarg_t phonead;
+        sysarg_t phonead;
         int res = ipc_connect_to_me(PHONE_NS, IPC_TEST_SERVICE, 0, 0, &phonead);
         if (res != 0)