Changeset a9b6bec in mainline for uspace/lib/drv/generic/remote_usbhc.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/lib/drv/generic/remote_usbhc.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -122 +122 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        ipcarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
+        sysarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
         async_transaction_t * trans = (async_transaction_t *)buffer_hash;
         if (trans == NULL) {
@@ -197 +197 @@
                 ipc_answer_0(callid, rc);
         } else {
-                ipc_answer_1(callid, EOK, (ipcarg_t) address);
+                ipc_answer_1(callid, EOK, (sysarg_t) address);
         }
 }
@@ -254 +254 @@
 
         // FIXME - answer according to outcome
-        ipc_answer_1(trans->caller, EOK, (ipcarg_t)trans);
+        ipc_answer_1(trans->caller, EOK, (sysarg_t)trans);
 
         trans->size = actual_size;