Changeset a9b6bec in mainline for kernel/generic/src/ipc/ipc.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/src/ipc/ipc.c

    r37f7cfe ra9b6bec  
    270270 *
    271271 */
    272 void ipc_backsend_err(phone_t *phone, call_t *call, unative_t err)
     272void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
    273273{
    274274        call->data.phone = phone;
    … …  
    367367               
    368368                call_t *call = ipc_call_alloc(0);
    369                 IPC_SET_METHOD(call->data, IPC_M_PHONE_HUNGUP);
     369                IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
    370370                call->flags |= IPC_CALL_DISCARD_ANSWER;
    371371                _ipc_call(phone, box, call);
    … …  
    547547                         * disconnected.
    548548                         */
    549                         IPC_SET_METHOD(call->data, IPC_M_PHONE_HUNGUP);
     549                        IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
    550550                        call->flags |= IPC_CALL_DISCARD_ANSWER;
    551551                        _ipc_call(phone, box, call);
    … …  
    741741                    " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call,
    742742                    call->sender->taskid,
    743                     IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
     743                    IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
    744744                    IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
    745745                    IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
    … …  
    757757                    " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call,
    758758                    call->sender->taskid,
    759                     IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
     759                    IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
    760760                    IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
    761761                    IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
    … …  
    771771                printf("Callid:%p M:%" PRIun " A1:%" PRIun " A2:%" PRIun
    772772                    " A3:%" PRIun " A4:%" PRIun " A5:%" PRIun " Flags:%x\n",
    773                     call, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
     773                    call, IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
    774774                    IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
    775775                    IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
Note: See TracChangeset for help on using the changeset viewer.