| /trunk/kernel/generic/include/ipc/ipc.h |
|---|
| 125,7 → 125,7 |
| * error is sent back to caller. Otherwise |
| * the call is accepted and the response is sent back. |
| * - the allocated phoneid is passed to userspace |
| * (on the receiving side) as ARG3 of the call. |
| * (on the receiving side) as ARG5 of the call. |
| * - the caller obtains taskid of the called thread |
| */ |
| #define IPC_M_CONNECT_TO_ME 1 |
| /trunk/kernel/generic/src/ipc/ipcrsc.c |
|---|
| 72,7 → 72,7 |
| * |
| * *** Connect_me_to *** |
| * The caller sends IPC_M_CONNECT_ME_TO to an answerbox. The server receives |
| * 'phoneid' of the connecting phone as an ARG3. If it answers with RETVAL=0, |
| * 'phoneid' of the connecting phone as an ARG5. If it answers with RETVAL=0, |
| * the phonecall is accepted, otherwise it is refused. |
| * |
| * *** Connect_to_me *** |
| /trunk/kernel/generic/src/ipc/sysipc.c |
|---|
| 177,7 → 177,7 |
| return 0; |
| if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_TO_ME) { |
| phoneid = IPC_GET_ARG3(*olddata); |
| phoneid = IPC_GET_ARG5(*olddata); |
| if (IPC_GET_RETVAL(answer->data)) { |
| /* The connection was not accepted */ |
| phone_dealloc(phoneid); |
| 185,7 → 185,7 |
| /* The connection was accepted */ |
| phone_connect(phoneid, &answer->sender->answerbox); |
| /* Set 'phone hash' as arg3 of response */ |
| IPC_SET_ARG3(answer->data, |
| IPC_SET_ARG5(answer->data, |
| (unative_t) &TASK->phones[phoneid]); |
| } |
| } else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) { |
| 341,7 → 341,7 |
| ipc_answer(box, call); |
| return -1; |
| } |
| IPC_SET_ARG3(call->data, phoneid); |
| IPC_SET_ARG5(call->data, phoneid); |
| } |
| return 0; |
| } |
| /trunk/kernel/generic/src/ipc/ipc.c |
|---|
| 568,9 → 568,10 |
| tmp = tmp->next) { |
| call = list_get_instance(tmp, call_t, link); |
| printf("Callid: %p Srctask:%llu M:%d A1:%d A2:%d A3:%d " |
| "Flags:%x\n", call, call->sender->taskid, |
| "A4:%d A5:%d Flags:%x\n", call, call->sender->taskid, |
| IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data), |
| IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), |
| IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data), |
| call->flags); |
| } |
| /* Print answerbox - calls */ |
| 580,9 → 581,10 |
| tmp = tmp->next) { |
| call = list_get_instance(tmp, call_t, link); |
| printf("Callid: %p Srctask:%llu M:%d A1:%d A2:%d A3:%d " |
| "Flags:%x\n", call, call->sender->taskid, |
| "A4:%d A5:%d Flags:%x\n", call, call->sender->taskid, |
| IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data), |
| IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), |
| IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data), |
| call->flags); |
| } |
| /* Print answerbox - calls */ |
| 590,9 → 592,10 |
| for (tmp = task->answerbox.answers.next; tmp != &task->answerbox.answers; |
| tmp = tmp->next) { |
| call = list_get_instance(tmp, call_t, link); |
| printf("Callid:%p M:%d A1:%d A2:%d A3:%d Flags:%x\n", call, |
| IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data), |
| printf("Callid:%p M:%d A1:%d A2:%d A3:%d A4:%d A5:%d Flags:%x\n", |
| call, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data), |
| IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), |
| IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data), |
| call->flags); |
| } |