Changeset 87b4baa in mainline for uspace/app/trace/ipcp.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/trace/ipcp.c (modified) (7 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;
@@ -192 +192 @@
         unsigned long key[1];
         oper_t *oper;
-        ipcarg_t *args;
+        sysarg_t *args;
         int i;
 
@@ -204 +204 @@
                     (void *) hash, phone,
                     (proto ? proto->name : "n/a"));
-                ipc_m_print(proto, IPC_GET_METHOD(*call));
+                ipc_m_print(proto, IPC_GET_IMETHOD(*call));
                 printf(" args: (%" PRIun ", %" PRIun ", %" PRIun ", "
                     "%" PRIun ", %" PRIun ")\n",
@@ -214 +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;
@@ -262 +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;
@@ -276 +276 @@
 
         phone = pcall->phone_hash;
-        method = IPC_GET_METHOD(pcall->question);
+        method = IPC_GET_IMETHOD(pcall->question);
         retval = IPC_GET_RETVAL(*answer);