Changeset 6773ff3 in mainline for kernel/generic/src/ipc/sysipc.c


Ignore:
Timestamp:
2012-04-23T14:57:42Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ee3b6150
Parents:
728d771 (diff), 6aae539d (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ipc/sysipc.c

    r728d771 r6773ff3  
    111111        switch (imethod) {
    112112        case IPC_M_CONNECTION_CLONE:
    113         case IPC_M_CONNECT_ME:
     113        case IPC_M_CLONE_ESTABLISH:
    114114        case IPC_M_PHONE_HUNGUP:
    115115                /* This message is meant only for the original recipient. */
     
    160160        switch (IPC_GET_IMETHOD(call->data)) {
    161161        case IPC_M_CONNECTION_CLONE:
    162         case IPC_M_CONNECT_ME:
     162        case IPC_M_CLONE_ESTABLISH:
    163163        case IPC_M_CONNECT_TO_ME:
    164164        case IPC_M_CONNECT_ME_TO:
     
    225225                        mutex_unlock(&phone->lock);
    226226                }
    227         } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CONNECT_ME) {
     227        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CLONE_ESTABLISH) {
    228228                phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
    229229               
     
    459459                break;
    460460        }
    461         case IPC_M_CONNECT_ME:
     461        case IPC_M_CLONE_ESTABLISH:
    462462                IPC_SET_ARG5(call->data, (sysarg_t) phone);
    463463                break;
Note: See TracChangeset for help on using the changeset viewer.