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

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/srv/net/nil/nildummy/nildummy.c

    r37f7cfe ra9b6bec  
    110110
    111111        while (true) {
    112                 switch (IPC_GET_METHOD(*icall)) {
     112                switch (IPC_GET_IMETHOD(*icall)) {
    113113                case NET_NIL_DEVICE_STATE:
    114114                        rc = nil_device_state_msg_local(0,
    115115                            IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
    116                         ipc_answer_0(iid, (ipcarg_t) rc);
     116                        ipc_answer_0(iid, (sysarg_t) rc);
    117117                        break;
    118118               
     
    124124                                    IPC_GET_DEVICE(icall), packet, 0);
    125125                        }
    126                         ipc_answer_0(iid, (ipcarg_t) rc);
     126                        ipc_answer_0(iid, (sysarg_t) rc);
    127127                        break;
    128128               
    129129                default:
    130                         ipc_answer_0(iid, (ipcarg_t) ENOTSUP);
     130                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
    131131                }
    132132               
     
    386386       
    387387        *answer_count = 0;
    388         switch (IPC_GET_METHOD(*call)) {
     388        switch (IPC_GET_IMETHOD(*call)) {
    389389        case IPC_M_PHONE_HUNGUP:
    390390                return EOK;
     
    466466                 * result.
    467467                 */
    468                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
     468                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
    469469                    (res == EHANGUP))
    470470                        return;
Note: See TracChangeset for help on using the changeset viewer.