1.1 --- a/pkg/devices/input/include/input-keypad-client.h Sun Jun 11 15:42:11 2023 +0200
1.2 +++ b/pkg/devices/input/include/input-keypad-client.h Sun Jun 18 00:19:36 2023 +0200
1.3 @@ -22,11 +22,11 @@
1.4 #pragma once
1.5
1.6 #include <l4/devices/keypad.h>
1.7 -#include <l4/devices/keypad-client.h>
1.8
1.9 #include <pthread.h>
1.10 #include <pthread-l4.h>
1.11
1.12 +#include <l4/re/c/dataspace.h>
1.13 #include <l4/re/event_enums.h>
1.14
1.15 #include <stdint.h>
1.16 @@ -48,9 +48,6 @@
1.17
1.18 #ifdef __cplusplus
1.19
1.20 -#include <l4/re/dataspace>
1.21 -#include <l4/re/env>
1.22 -
1.23 /* Client object to provide input event access. */
1.24
1.25 class Input_keypad_client
1.26 @@ -62,7 +59,7 @@
1.27
1.28 /* Keypad layout details. */
1.29
1.30 - Keypad *_keypad;
1.31 + Keypad_generic *_keypad;
1.32
1.33 /* Keypad memory. */
1.34
1.35 @@ -90,7 +87,7 @@
1.36 void scan_keypad();
1.37
1.38 public:
1.39 - explicit Input_keypad_client(Keypad *keypad) : _keypad(keypad)
1.40 + explicit Input_keypad_client(Keypad_generic *keypad) : _keypad(keypad)
1.41 {
1.42 init_memory();
1.43 init_keypad();