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

Changeset a9b6bec in mainline for uspace/srv/net/nil/eth/eth.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/srv/net/nil/eth/eth.c

    r37f7cfe ra9b6bec  
    238238
    239239        while (true) {
    240                 switch (IPC_GET_METHOD(*icall)) {
     240                switch (IPC_GET_IMETHOD(*icall)) {
    241241                case NET_NIL_DEVICE_STATE:
    242242                        nil_device_state_msg_local(0, IPC_GET_DEVICE(icall),
     
    251251                                    IPC_GET_DEVICE(icall), packet, 0);
    252252                        }
    253                         ipc_answer_0(iid, (ipcarg_t) rc);
     253                        ipc_answer_0(iid, (sysarg_t) rc);
    254254                        break;
    255255                default:
    256                         ipc_answer_0(iid, (ipcarg_t) ENOTSUP);
     256                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
    257257                }
    258258               
     
    849849       
    850850        *answer_count = 0;
    851         switch (IPC_GET_METHOD(*call)) {
     851        switch (IPC_GET_IMETHOD(*call)) {
    852852        case IPC_M_PHONE_HUNGUP:
    853853                return EOK;
     
    926926                 * result.
    927927                 */
    928                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
     928                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
    929929                    (res == EHANGUP))
    930930                        return;
Note: See TracChangeset for help on using the changeset viewer.