1.1 --- a/pkg/landfall-examples/input_event_client/input_event_client.cc Mon Jun 19 16:55:47 2023 +0200
1.2 +++ b/pkg/landfall-examples/input_event_client/input_event_client.cc Mon Jun 19 16:58:52 2023 +0200
1.3 @@ -49,7 +49,6 @@
1.4 #include <l4/re/env.h>
1.5 #include <l4/re/event>
1.6 #include <l4/re/event_enums.h>
1.7 -#include <l4/sys/factory.h>
1.8 #include <l4/util/util.h>
1.9
1.10 #include <l4/re/c/util/video/goos_fb.h>
1.11 @@ -61,7 +60,7 @@
1.12 #include <l4/mag-gfx/gfx_colors>
1.13 #include <l4/mag-gfx/mem_factory>
1.14
1.15 -#include <ipc/cap_alloc.h>
1.16 +#include <ipc/irq.h>
1.17
1.18 #include <stdint.h>
1.19 #include <string.h>
1.20 @@ -272,15 +271,11 @@
1.21 if (l4_is_invalid_cap(event_cap))
1.22 return 1;
1.23
1.24 - /* Obtain a capability for the event buffer. */
1.25 -
1.26 - l4re_ds_t mem = ipc_cap_alloc();
1.27 -
1.28 - if (l4_is_invalid_cap(mem))
1.29 - return 1;
1.30 + /* Obtain the event buffer. */
1.31
1.32 client_Event event_obj(event_cap);
1.33 client_ICU icu_obj(event_cap);
1.34 + l4re_ds_t mem;
1.35
1.36 if (event_obj.get_buffer(&mem))
1.37 return 1;
1.38 @@ -297,16 +292,11 @@
1.39
1.40 L4Re::Event_buffer event_buffer(evmem, l4re_ds_size(mem));
1.41
1.42 - /* Obtain an interrupt capability. */
1.43 -
1.44 - l4_cap_idx_t irq = ipc_cap_alloc();
1.45 -
1.46 - if (l4_is_invalid_cap(irq))
1.47 - return 1;
1.48 -
1.49 /* Create an interrupt object. */
1.50
1.51 - if (l4_error(l4_factory_create_irq(l4re_env()->factory, irq)))
1.52 + l4_cap_idx_t irq;
1.53 +
1.54 + if (ipc_create_irq(&irq))
1.55 return 1;
1.56
1.57 /* Bind the interrupt to the event capability. */