mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-18 15:18:20 +00:00
committed by
Christian Helmuth
parent
da5d182ad3
commit
4cdfb9bc2f
@ -130,9 +130,6 @@ Ipc_ostream::Ipc_ostream(Native_capability dst, Msgbuf_base *snd_msg)
|
||||
** Ipc_istream **
|
||||
*****************/
|
||||
|
||||
void Ipc_istream::_wait() { }
|
||||
|
||||
|
||||
Ipc_istream::Ipc_istream(Msgbuf_base *rcv_msg)
|
||||
: Ipc_unmarshaller(&rcv_msg->buf[0], rcv_msg->size()), _rcv_msg(rcv_msg)
|
||||
{
|
||||
@ -233,7 +230,11 @@ void Ipc_server::_reply()
|
||||
void Ipc_server::_reply_wait() { }
|
||||
|
||||
|
||||
Ipc_server::Ipc_server(Msgbuf_base *snd_msg,
|
||||
Msgbuf_base *rcv_msg)
|
||||
: Ipc_istream(rcv_msg), Ipc_ostream(Native_capability(), snd_msg)
|
||||
Ipc_server::Ipc_server(Native_connection_state &cs,
|
||||
Msgbuf_base *snd_msg, Msgbuf_base *rcv_msg)
|
||||
:
|
||||
Ipc_istream(rcv_msg), Ipc_ostream(Native_capability(), snd_msg), _rcv_cs(cs)
|
||||
{ }
|
||||
|
||||
|
||||
Ipc_server::~Ipc_server() { }
|
||||
|
@ -20,6 +20,7 @@
|
||||
|
||||
/* base-internal includes */
|
||||
#include <base/internal/stack.h>
|
||||
#include <base/internal/native_connection_state.h>
|
||||
|
||||
/* NOVA includes */
|
||||
#include <nova/syscalls.h>
|
||||
@ -120,7 +121,8 @@ void Rpc_entrypoint::_activation_entry()
|
||||
/* prepare ipc server object (copying utcb content to message buffer */
|
||||
int opcode = 0;
|
||||
|
||||
Ipc_server srv(&ep->_snd_buf, &ep->_rcv_buf);
|
||||
Native_connection_state cs;
|
||||
Ipc_server srv(cs, &ep->_snd_buf, &ep->_rcv_buf);
|
||||
srv >> IPC_WAIT >> opcode;
|
||||
|
||||
/* set default return value */
|
||||
|
Reference in New Issue
Block a user