Changeset 97c7682 in mainline for kernel/generic/src/ipc/sysipc.c
- Timestamp:
- 2012-07-14T11:18:40Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 804d9b6
- Parents:
- 0747468 (diff), f0348c8 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/ipc/sysipc.c
r0747468 r97c7682 111 111 switch (imethod) { 112 112 case IPC_M_CONNECTION_CLONE: 113 case IPC_M_C ONNECT_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. */ … … 160 160 switch (IPC_GET_IMETHOD(call->data)) { 161 161 case IPC_M_CONNECTION_CLONE: 162 case IPC_M_C ONNECT_ME:162 case IPC_M_CLONE_ESTABLISH: 163 163 case IPC_M_CONNECT_TO_ME: 164 164 case IPC_M_CONNECT_ME_TO: … … 225 225 mutex_unlock(&phone->lock); 226 226 } 227 } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_C ONNECT_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 … … 459 459 break; 460 460 } 461 case IPC_M_C ONNECT_ME:461 case IPC_M_CLONE_ESTABLISH: 462 462 IPC_SET_ARG5(call->data, (sysarg_t) phone); 463 463 break; … … 597 597 if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) { 598 598 int phoneid = phone_alloc(TASK); 599 if (phoneid < 0) { /* Failed to allocate phone */599 if (phoneid < 0) { /* Failed to allocate phone */ 600 600 IPC_SET_RETVAL(call->data, ELIMIT); 601 601 ipc_answer(box, call); … … 883 883 884 884 /* 885 * User space is not allowed to change interface and method of system885 * User space is not allowed to change interface and method of system 886 886 * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by 887 * means of method, arg1, arg2 and arg3.887 * means of imethod, arg1, arg2 and arg3. 888 888 * If the interface and method is immutable, don't change anything. 889 889 */ … … 897 897 IPC_SET_ARG3(call->data, arg2); 898 898 899 if (slow) {899 if (slow) 900 900 IPC_SET_ARG4(call->data, arg3); 901 /*902 * For system methods we deliberately don't903 * overwrite ARG5.904 */905 }901 902 /* 903 * For system methods we deliberately don't 904 * overwrite ARG5. 905 */ 906 906 } else { 907 907 IPC_SET_IMETHOD(call->data, imethod);
Note:
See TracChangeset
for help on using the changeset viewer.