Ignore:
Timestamp:
2010-12-17T14:51:41Z (13 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1f383dde
Parents:
692f13e4 (diff), 11658b64 (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:

Merged development into lelian/hidd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/drv/generic/remote_usbhc.c

    r692f13e4 r82122f3  
    122122    ipc_callid_t callid, ipc_call_t *call)
    123123{
    124         ipcarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
     124        sysarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
    125125        async_transaction_t * trans = (async_transaction_t *)buffer_hash;
    126126        if (trans == NULL) {
     
    197197                ipc_answer_0(callid, rc);
    198198        } else {
    199                 ipc_answer_1(callid, EOK, (ipcarg_t) address);
     199                ipc_answer_1(callid, EOK, (sysarg_t) address);
    200200        }
    201201}
     
    254254
    255255        // FIXME - answer according to outcome
    256         ipc_answer_1(trans->caller, EOK, (ipcarg_t)trans);
     256        ipc_answer_1(trans->caller, EOK, (sysarg_t)trans);
    257257
    258258        trans->size = actual_size;
Note: See TracChangeset for help on using the changeset viewer.