Changeset 973ef9fc in mainline for uspace/app/trace/ipcp.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/trace/ipcp.c (modified) (10 diffs)

uspace/app/trace/ipcp.c

@@ -46 +46 @@
 
 typedef struct {
-        ipcarg_t phone_hash;
+        sysarg_t phone_hash;
         ipc_call_t question;
         oper_t *oper;
@@ -124 +124 @@
 }
 
-static void ipc_m_print(proto_t *proto, ipcarg_t method)
+static void ipc_m_print(proto_t *proto, sysarg_t method)
 {
         oper_t *oper;
@@ -137 +137 @@
 
         if (oper != NULL) {
-                printf("%s (%ld)", oper->name, method);
+                printf("%s (%" PRIun ")", oper->name, method);
                 return;
         }
 
-        printf("%ld", method);
+        printf("%" PRIun, method);
 }
 
@@ -192 +192 @@
         unsigned long key[1];
         oper_t *oper;
-        ipcarg_t *args;
+        sysarg_t *args;
         int i;
 
@@ -201 +201 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: %p, phone: %d, proto: %s, method: ", hash,
-                        phone, (proto ? proto->name : "n/a"));
-                ipc_m_print(proto, IPC_GET_METHOD(*call));
-                printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
-                    ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2],
-                    args[3], args[4], args[5]);
+                printf("Call ID: %p, phone: %d, proto: %s, method: ",
+                    (void *) hash, phone,
+                    (proto ? proto->name : "n/a"));
+                ipc_m_print(proto, IPC_GET_IMETHOD(*call));
+                printf(" args: (%" PRIun ", %" PRIun ", %" PRIun ", "
+                    "%" PRIun ", %" PRIun ")\n",
+                    args[1], args[2], args[3], args[4], args[5]);
         }
 
@@ -213 +214 @@
 
                 if (proto != NULL) {
-                        oper = proto_get_oper(proto, IPC_GET_METHOD(*call));
+                        oper = proto_get_oper(proto, IPC_GET_IMETHOD(*call));
                 } else {
                         oper = NULL;
@@ -261 +262 @@
     ipc_call_t *answer)
 {
-        ipcarg_t phone;
-        ipcarg_t method;
-        ipcarg_t service;
-        ipcarg_t retval;
+        sysarg_t phone;
+        sysarg_t method;
+        sysarg_t service;
+        sysarg_t retval;
         proto_t *proto;
         int cphone;
 
-        ipcarg_t *resp;
+        sysarg_t *resp;
         oper_t *oper;
         int i;
@@ -275 +276 @@
 
         phone = pcall->phone_hash;
-        method = IPC_GET_METHOD(pcall->question);
+        method = IPC_GET_IMETHOD(pcall->question);
         retval = IPC_GET_RETVAL(*answer);
 
@@ -281 +282 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG
-                    ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
-                    ", %" PRIuIPCARG ")\n",
-                    hash, retval, IPC_GET_ARG1(*answer),
+                printf("Response to %p: retval=%" PRIdn ", args = (%" PRIun ", "
+                    "%" PRIun ", %" PRIun ", %" PRIun ", %" PRIun ")\n",
+                    (void *) hash, retval, IPC_GET_ARG1(*answer),
                     IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
                     IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
@@ -340 +340 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash %p)\n", hash);
+                        printf("Not a response (hash %p)\n", (void *) hash);
                 }
                 return;