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

Changeset a9b6bec in mainline for uspace/app/trace/ipcp.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/ipcp.c

    r37f7cfe ra9b6bec  
    4646
    4747typedef struct {
    48         ipcarg_t phone_hash;
     48        sysarg_t phone_hash;
    4949        ipc_call_t question;
    5050        oper_t *oper;
     
    124124}
    125125
    126 static void ipc_m_print(proto_t *proto, ipcarg_t method)
     126static void ipc_m_print(proto_t *proto, sysarg_t method)
    127127{
    128128        oper_t *oper;
     
    192192        unsigned long key[1];
    193193        oper_t *oper;
    194         ipcarg_t *args;
     194        sysarg_t *args;
    195195        int i;
    196196
     
    204204                    (void *) hash, phone,
    205205                    (proto ? proto->name : "n/a"));
    206                 ipc_m_print(proto, IPC_GET_METHOD(*call));
     206                ipc_m_print(proto, IPC_GET_IMETHOD(*call));
    207207                printf(" args: (%" PRIun ", %" PRIun ", %" PRIun ", "
    208208                    "%" PRIun ", %" PRIun ")\n",
     
    214214
    215215                if (proto != NULL) {
    216                         oper = proto_get_oper(proto, IPC_GET_METHOD(*call));
     216                        oper = proto_get_oper(proto, IPC_GET_IMETHOD(*call));
    217217                } else {
    218218                        oper = NULL;
     
    262262    ipc_call_t *answer)
    263263{
    264         ipcarg_t phone;
    265         ipcarg_t method;
    266         ipcarg_t service;
    267         ipcarg_t retval;
     264        sysarg_t phone;
     265        sysarg_t method;
     266        sysarg_t service;
     267        sysarg_t retval;
    268268        proto_t *proto;
    269269        int cphone;
    270270
    271         ipcarg_t *resp;
     271        sysarg_t *resp;
    272272        oper_t *oper;
    273273        int i;
     
    276276
    277277        phone = pcall->phone_hash;
    278         method = IPC_GET_METHOD(pcall->question);
     278        method = IPC_GET_IMETHOD(pcall->question);
    279279        retval = IPC_GET_RETVAL(*answer);
    280280
Note: See TracChangeset for help on using the changeset viewer.