Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2097 → Rev 2098

/trunk/kernel/generic/include/ipc/ipc.h
177,7 → 177,7
*/
answerbox_t *callerbox;
 
unative_t private; /**< Private data to internal IPC */
unative_t priv; /**< Private data to internal IPC */
 
ipc_data_t data; /**< Data passed from/to userspace */
} call_t;
/trunk/kernel/generic/src/ipc/sysipc.c
194,7 → 194,7
/* Set arg3 for server */
IPC_SET_ARG3(call->data, (unative_t)&TASK->phones[newphid]);
call->flags |= IPC_CALL_CONN_ME_TO;
call->private = newphid;
call->priv = newphid;
break;
case IPC_M_AS_AREA_SEND:
size = as_get_size(IPC_GET_ARG1(call->data));
223,9 → 223,9
 
if (call->flags & IPC_CALL_CONN_ME_TO) {
if (IPC_GET_RETVAL(call->data))
phone_dealloc(call->private);
phone_dealloc(call->priv);
else
IPC_SET_ARG3(call->data, call->private);
IPC_SET_ARG3(call->data, call->priv);
}
}
 
527,7 → 527,7
ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
 
/* Set in_phone_hash to the interrupt counter */
call->data.phone = (void *)call->private;
call->data.phone = (void *) call->priv;
STRUCT_TO_USPACE(calldata, &call->data);
 
/trunk/kernel/generic/src/ipc/irq.c
282,7 → 282,7
IPC_SET_ARG2(call->data, a2);
IPC_SET_ARG3(call->data, a3);
/* Put a counter to the message */
call->private = ++irq->notif_cfg.counter;
call->priv = ++irq->notif_cfg.counter;
send_call(irq, call);
}
306,7 → 306,7
}
call->flags |= IPC_CALL_NOTIF;
/* Put a counter to the message */
call->private = ++irq->notif_cfg.counter;
call->priv = ++irq->notif_cfg.counter;
/* Set up args */
IPC_SET_METHOD(call->data, irq->notif_cfg.method);