Changeset a9b6bec in mainline for uspace/drv/vhc/debug.c

Timestamp:

2010-12-14T20:19:41Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

11658b64

Parents:

37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:

• uspace/drv/vhc/debug.c (modified) (1 diff)

uspace/drv/vhc/debug.c

@@ -42 +42 @@
 /** Debug print informing of invalid call.
  */
-void dprintf_inval_call(int level, ipc_call_t call, ipcarg_t phone_hash)
+void dprintf_inval_call(int level, ipc_call_t call, sysarg_t phone_hash)
 {
         dprintf(level, "phone%#x: invalid call [%u (%u, %u, %u, %u, %u)]",
             phone_hash,
-            IPC_GET_METHOD(call),
+            IPC_GET_IMETHOD(call),
             IPC_GET_ARG1(call), IPC_GET_ARG2(call), IPC_GET_ARG3(call),
             IPC_GET_ARG4(call), IPC_GET_ARG5(call));