Ignore:
Timestamp:
2010-12-25T21:20:28Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
631ee0c
Parents:
1bfd3d3 (diff), 09178b7f (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hw/bus/cuda_adb/cuda_adb.c

    r1bfd3d3 r973ef9fc  
    195195        ipc_callid_t callid;
    196196        ipc_call_t call;
    197         ipcarg_t method;
     197        sysarg_t method;
    198198        devmap_handle_t dh;
    199199        int retval;
     
    220220        while (1) {
    221221                callid = async_get_call(&call);
    222                 method = IPC_GET_METHOD(call);
     222                method = IPC_GET_IMETHOD(call);
    223223                switch (method) {
    224224                case IPC_M_PHONE_HUNGUP:
Note: See TracChangeset for help on using the changeset viewer.