Changeset 87b4baa in mainline for kernel/generic/include/udebug/udebug.h

Timestamp:

2010-12-17T20:16:46Z (13 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:

• kernel/generic/include/udebug/udebug.h (modified) (2 diffs)

kernel/generic/include/udebug/udebug.h

@@ -212 +212 @@
         waitq_t go_wq;
         call_t *go_call;
-        unative_t syscall_args[6];
+        sysarg_t syscall_args[6];
         istate_t *uspace_state;
 
@@ -229 +229 @@
 void udebug_thread_initialize(udebug_thread_t *ut);
 
-void udebug_syscall_event(unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5, unative_t a6, unative_t id, unative_t rc,
+void udebug_syscall_event(sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id, sysarg_t rc,
     bool end_variant);