1.1 --- a/pkg/landfall-examples/input_event_client/input_event_client.cc Wed May 23 23:57:09 2018 +0200
1.2 +++ b/pkg/landfall-examples/input_event_client/input_event_client.cc Thu May 24 23:49:57 2018 +0200
1.3 @@ -43,7 +43,6 @@
1.4 * exception statement from your version.
1.5 */
1.6
1.7 -#include <l4/devices/input-event-client.h>
1.8 #include <l4/devices/input-event-loop.h>
1.9
1.10 #include <pthread.h>
1.11 @@ -56,6 +55,7 @@
1.12 #include <l4/re/event>
1.13 #include <l4/re/event_enums.h>
1.14 #include <l4/re/util/cap_alloc>
1.15 +#include <l4/sys/icu.h>
1.16 #include <l4/util/util.h>
1.17
1.18 #include <l4/mag-gfx/canvas>
1.19 @@ -260,9 +260,10 @@
1.20 _screen = screen;
1.21 _font = &font;
1.22
1.23 - /* Obtain a reference to the event source. */
1.24 + /* Obtain a reference to the event source. It should also be possible to use
1.25 + the Input_event_interface for the core operations. */
1.26
1.27 - L4::Cap<Input_event_interface> event_server = L4Re::Env::env()->get_cap<Input_event_interface>("ev");
1.28 + L4::Cap<L4Re::Event> event_server = L4Re::Env::env()->get_cap<L4Re::Event>("ev");
1.29 if (!event_server.is_valid()) return 1;
1.30
1.31 /* Obtain a capability for the event buffer. */
1.32 @@ -286,9 +287,13 @@
1.33 L4::Cap<L4::Irq> irq = L4Re::Util::cap_alloc.alloc<L4::Irq>();
1.34 if (!irq.is_valid()) return 1;
1.35
1.36 + /* Create an interrupt object. */
1.37 +
1.38 + if (l4_error(L4Re::Env::env()->factory()->create(irq))) return 1;
1.39 +
1.40 /* Bind the interrupt to the event capability. */
1.41
1.42 - if (event_server->bind(0, irq)) return 1;
1.43 + if (l4_error(event_server->bind(0, irq))) return 1;
1.44
1.45 /* Create an event handler. */
1.46