Changeset 7bdcc45 in mainline for uspace/lib/c/generic/loader.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/lib/c/generic/loader.c (modified) (5 diffs)

uspace/lib/c/generic/loader.c

@@ -96 +96 @@
         }
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -131 +131 @@
         }
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -166 +166 @@
         free(pa);
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -213 +213 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_ARGS, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -267 +267 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
             count * sizeof(fdi_node_t));
         if (rc != EOK) {