ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform API: simplify _wait_for_device

Browse Source 
Fix genodelabs/genode#4615
This commit is contained in:
Stefan Kalkowski 2022-09-02 13:35:13 +02:00 committed by Christian Helmuth
parent 0370b0fa23
commit dda168fc10
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
repos/os/include/platform_session/connection.h
View File

@ -39,10 +39,11 @@ class Platform::Connection : public Genode::Connection<Session>,
friend class Device;
friend class Dma_buffer;
Env &_env;
Rom_session_client _rom {devices_rom()};
Constructible<Attached_dataspace> _ds {};
Constructible<Io_signal_handler<Connection>> _handler {};
Env & _env;
Rom_session_client _rom { devices_rom() };
Constructible<Attached_dataspace> _ds {};
Io_signal_handler<Connection> _handler { _env.ep(), *this,
&Connection::_handle_io };
void _try_attach()
{
@ -60,19 +61,8 @@ class Platform::Connection : public Genode::Connection<Session>,
for (;;) {
/* repeatedly check for availability of device */
Capability<Device_interface> cap = fn();
if (cap.valid()) {
if (_handler.constructed()) {
sigh(Signal_context_capability());
_handler.destruct();
}
if (cap.valid())
return cap;
}
if (!_handler.constructed()) {
_handler.construct(_env.ep(), *this,
&Connection::_handle_io);
sigh(*_handler);
}
_env.ep().wait_and_dispatch_one_io_signal();
}
@ -89,6 +79,12 @@ class Platform::Connection : public Genode::Connection<Session>,
_env(env)
{
_try_attach();
/*
* Initially register dummy handler, to be able to receive signals
* if _wait_for_device probes for a valid devices rom
*/
sigh(_handler);
}
void update()