Changeset 357b5f5 in mainline for uspace/app/trace

Timestamp:

2011-01-23T20:09:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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.

Location:

uspace/app/trace

Files:

• ipcp.c (modified) (7 diffs)
• proto.c (modified) (1 diff)
• syscalls.c (modified) (1 diff)
• trace.c (modified) (3 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);
 

uspace/app/trace/proto.c

@@ -53 +53 @@
 
 typedef struct {
-        ipcarg_t method;
+        sysarg_t method;
         oper_t *oper;
         link_t link;

uspace/app/trace/syscalls.c

@@ -73 +73 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
-    [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",      2,      V_ERRNO },
 
     [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },

uspace/app/trace/trace.c

@@ -287 +287 @@
 {
         ipc_call_t call;
-        ipcarg_t phoneid;
+        sysarg_t phoneid;
         
         if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
@@ -295 +295 @@
         phoneid = sc_args[0];
 
-        IPC_SET_METHOD(call, sc_args[1]);
+        IPC_SET_IMETHOD(call, sc_args[1]);
         IPC_SET_ARG1(call, sc_args[2]);
         IPC_SET_ARG2(call, sc_args[3]);
@@ -331 +331 @@
         phoneidx = sc_args[0];
 
-        IPC_SET_METHOD(question, sc_args[1]);
+        IPC_SET_IMETHOD(question, sc_args[1]);
         IPC_SET_ARG1(question, sc_args[2]);
         IPC_SET_ARG2(question, sc_args[3]);