Changeset 357b5f5 in mainline for kernel/generic/src/udebug/udebug_ipc.c

Timestamp:

2011-01-23T20:09:13Z (13 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.

File:

• kernel/generic/src/udebug/udebug_ipc.c (modified) (6 diffs)

kernel/generic/src/udebug/udebug_ipc.c

@@ -210 +210 @@
 static void udebug_receive_name_read(call_t *call)
 {
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         size_t data_size;
         size_t buf_size;
@@ -257 +257 @@
 static void udebug_receive_areas_read(call_t *call)
 {
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         size_t data_size;
         size_t buf_size;
@@ -304 +304 @@
 {
         thread_t *t;
-        unative_t uspace_addr;
+        sysarg_t uspace_addr;
         int rc;
         void *buffer;
@@ -328 +328 @@
            (no way to distinguish method in answer) */
         IPC_SET_ARG1(call->data, uspace_addr);
-        IPC_SET_ARG2(call->data, 6 * sizeof(unative_t));
+        IPC_SET_ARG2(call->data, 6 * sizeof(sysarg_t));
         call->buffer = buffer;
 
@@ -341 +341 @@
 {
         thread_t *t;
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         void *buffer;
         int rc;
@@ -382 +382 @@
 static void udebug_receive_mem_read(call_t *call)
 {
-        unative_t uspace_dst;
-        unative_t uspace_src;
+        sysarg_t uspace_dst;
+        sysarg_t uspace_src;
         unsigned size;
         void *buffer;