1.1 --- a/pkg/devices/input/src/event_loop/input-event-loop.cc Mon Jun 19 16:54:57 2023 +0200
1.2 +++ b/pkg/devices/input/src/event_loop/input-event-loop.cc Mon Jun 19 16:55:47 2023 +0200
1.3 @@ -1,7 +1,7 @@
1.4 /*
1.5 * Input event loop functionality.
1.6 *
1.7 - * Copyright (C) 2018 Paul Boddie <paul@boddie.org.uk>
1.8 + * Copyright (C) 2018, 2023 Paul Boddie <paul@boddie.org.uk>
1.9 *
1.10 * This program is free software; you can redistribute it and/or
1.11 * modify it under the terms of the GNU General Public License as
1.12 @@ -22,15 +22,21 @@
1.13 #include "input-event-loop.h"
1.14
1.15 #include <l4/re/event>
1.16 +#include <l4/sys/irq.h>
1.17 +
1.18 +#include <pthread-l4.h>
1.19 +
1.20 +#include <ipc/irq.h>
1.21 +
1.22 +
1.23
1.24 /* Handler for incoming interrupts signalling the presence of events. */
1.25
1.26 -void
1.27 -Input_event_loop::handle()
1.28 +void Input_event_loop::handle()
1.29 {
1.30 Event_type *event;
1.31
1.32 - if (!l4_error(_irq->receive()))
1.33 + if (!l4_error(l4_irq_receive(_irq, L4_IPC_NEVER)))
1.34 {
1.35 while ((event = _event_buffer.next()))
1.36 {
1.37 @@ -42,10 +48,9 @@
1.38
1.39 /* Event loop initiation. */
1.40
1.41 -void
1.42 -Input_event_loop::start(l4_umword_t label)
1.43 +void Input_event_loop::start(l4_umword_t label)
1.44 {
1.45 Event_loop::start();
1.46
1.47 - _irq->bind_thread(Pthread::L4::cap(_pthread), label);
1.48 + ipc_bind_irq(_irq, label, pthread_l4_cap(_pthread));
1.49 }