← Back to branch summary

~martin-decky/helenos/rcu

« back to all changes in this revision

Viewing changes to kernel/generic/src/ipc/sysipc.c

Merge mainline changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/generic/src/ipc/sysipc.c
110
110
{
111
111
        switch (imethod) {
112
112
        case IPC_M_CONNECTION_CLONE:
113
 
        case IPC_M_CONNECT_ME:
 
113
        case IPC_M_CLONE_ESTABLISH:
114
114
        case IPC_M_PHONE_HUNGUP:
115
115
                /* This message is meant only for the original recipient. */
116
116
                return false;
159
159
{
160
160
        switch (IPC_GET_IMETHOD(call->data)) {
161
161
        case IPC_M_CONNECTION_CLONE:
162
 
        case IPC_M_CONNECT_ME:
 
162
        case IPC_M_CLONE_ESTABLISH:
163
163
        case IPC_M_CONNECT_TO_ME:
164
164
        case IPC_M_CONNECT_ME_TO:
165
165
        case IPC_M_SHARE_OUT:
224
224
                        }
225
225
                        mutex_unlock(&phone->lock);
226
226
                }
227
 
        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CONNECT_ME) {
 
227
        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CLONE_ESTABLISH) {
228
228
                phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
229
229
                
230
230
                if (IPC_GET_RETVAL(answer->data) != EOK) {
458
458
                IPC_SET_ARG1(call->data, newphid);
459
459
                break;
460
460
        }
461
 
        case IPC_M_CONNECT_ME:
 
461
        case IPC_M_CLONE_ESTABLISH:
462
462
                IPC_SET_ARG5(call->data, (sysarg_t) phone);
463
463
                break;
464
464
        case IPC_M_CONNECT_ME_TO: {