Changes in uspace/app/trace/ipcp.c [228e490:d9c8c81] in mainline

File:

• uspace/app/trace/ipcp.c (modified) (11 diffs)

uspace/app/trace/ipcp.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <adt/hash_table.h>
-#include <sys/typefmt.h>
 
 #include "ipc_desc.h"
@@ -46 +45 @@
 
 typedef struct {
-        sysarg_t phone_hash;
+        ipcarg_t phone_hash;
         ipc_call_t question;
         oper_t *oper;
@@ -124 +123 @@
 }
 
-static void ipc_m_print(proto_t *proto, sysarg_t method)
+static void ipc_m_print(proto_t *proto, ipcarg_t method)
 {
         oper_t *oper;
@@ -137 +136 @@
 
         if (oper != NULL) {
-                printf("%s (%" PRIun ")", oper->name, method);
+                printf("%s (%ld)", oper->name, method);
                 return;
         }
 
-        printf("%" PRIun, method);
+        printf("%ld", method);
 }
 
@@ -192 +191 @@
         unsigned long key[1];
         oper_t *oper;
-        sysarg_t *args;
+        ipcarg_t *args;
         int i;
 
@@ -201 +200 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                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]);
+                printf("Call ID: 0x%lx, phone: %d, proto: %s, method: ", hash,
+                        phone, (proto ? proto->name : "n/a"));
+                ipc_m_print(proto, IPC_GET_METHOD(*call));
+                printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2],
+                    args[3], args[4], args[5]);
         }
 
@@ -214 +211 @@
 
                 if (proto != NULL) {
-                        oper = proto_get_oper(proto, IPC_GET_IMETHOD(*call));
+                        oper = proto_get_oper(proto, IPC_GET_METHOD(*call));
                 } else {
                         oper = NULL;
@@ -262 +259 @@
     ipc_call_t *answer)
 {
-        sysarg_t phone;
-        sysarg_t method;
-        sysarg_t service;
-        sysarg_t retval;
+        ipcarg_t phone;
+        ipcarg_t method;
+        ipcarg_t service;
+        ipcarg_t retval;
         proto_t *proto;
         int cphone;
 
-        sysarg_t *resp;
+        ipcarg_t *resp;
         oper_t *oper;
         int i;
@@ -276 +273 @@
 
         phone = pcall->phone_hash;
-        method = IPC_GET_IMETHOD(pcall->question);
+        method = IPC_GET_METHOD(pcall->question);
         retval = IPC_GET_RETVAL(*answer);
 
@@ -282 +279 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                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));
+                printf("Response to 0x%lx: retval=%ld, args = (%lu, %lu, %lu, %lu, %lu)\n",
+                        hash, retval, IPC_GET_ARG1(*answer),
+                        IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
+                        IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
         }
 
@@ -340 +336 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash %p)\n", (void *) hash);
+                        printf("Not a response (hash 0x%lx)\n", hash);
                 }
                 return;