Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/app/trace/trace.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/trace/trace.c

    r37f7cfe ra9b6bec  
    287287{
    288288        ipc_call_t call;
    289         ipcarg_t phoneid;
     289        sysarg_t phoneid;
    290290       
    291291        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
     
    295295        phoneid = sc_args[0];
    296296
    297         IPC_SET_METHOD(call, sc_args[1]);
     297        IPC_SET_IMETHOD(call, sc_args[1]);
    298298        IPC_SET_ARG1(call, sc_args[2]);
    299299        IPC_SET_ARG2(call, sc_args[3]);
     
    331331        phoneidx = sc_args[0];
    332332
    333         IPC_SET_METHOD(question, sc_args[1]);
     333        IPC_SET_IMETHOD(question, sc_args[1]);
    334334        IPC_SET_ARG1(question, sc_args[2]);
    335335        IPC_SET_ARG2(question, sc_args[3]);
Note: See TracChangeset for help on using the changeset viewer.