Changeset 7bdcc45 in mainline for uspace/app/tester/ipc/register.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/app/tester/ipc/register.c (modified) (4 diffs)

uspace/app/tester/ipc/register.c

@@ -27 +27 @@
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -41 +42 @@
         unsigned int i;
         
-        TPRINTF("Connected phone %#x accepting\n", icall->in_phone_hash);
+        TPRINTF("Connected phone %" PRIun " accepting\n", icall->in_phone_hash);
         ipc_answer_0(iid, EOK);
         for (i = 0; i < MAX_CONNECTIONS; i++) {
@@ -55 +56 @@
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        TPRINTF("Phone %#x hung up\n", icall->in_phone_hash);
+                        TPRINTF("Phone %" PRIun " hung up\n", icall->in_phone_hash);
                         retval = 0;
                         break;
                 case IPC_TEST_METHOD:
-                        TPRINTF("Received well known message from %#x: %#x\n",
+                        TPRINTF("Received well known message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, EOK);
                         break;
                 default:
-                        TPRINTF("Received unknown message from %#x: %#x\n",
+                        TPRINTF("Received unknown message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, ENOENT);
@@ -78 +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)