diff options
author | Liav A <liavalb@gmail.com> | 2021-04-02 23:21:35 +0300 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-04-03 11:57:23 +0200 |
commit | 8e3e3a71cb20ba4a743cd4ad2dcec49a31f35733 (patch) | |
tree | ea07149398379b4af07879fa3705a2a005bf2217 /Kernel/Syscalls/keymap.cpp | |
parent | 32dd9c554b7a98daf0bdf7df2090640d90ce36ca (diff) | |
download | serenity-8e3e3a71cb20ba4a743cd4ad2dcec49a31f35733.zip |
Kernel: Introduce a new HID subsystem
The end goal of this commit is to allow to boot on bare metal with no
PS/2 device connected to the system. It turned out that the original
code relied on the existence of the PS/2 keyboard, so VirtualConsole
called it even though ACPI indicated the there's no i8042 controller on
my real machine because I didn't plug any PS/2 device.
The code is much more flexible, so adding HID support for other type of
hardware (e.g. USB HID) could be much simpler.
Briefly describing the change, we have a new singleton called
HIDManagement, which is responsible to initialize the i8042 controller
if exists, and to enumerate its devices. I also abstracted a bit
things, so now every Human interface device is represented with the
HIDDevice class. Then, there are 2 types of it - the MouseDevice and
KeyboardDevice classes; both are responsible to handle the interface in
the DevFS.
PS2KeyboardDevice, PS2MouseDevice and VMWareMouseDevice classes are
responsible for handling the hardware-specific interface they are
assigned to. Therefore, they are inheriting from the IRQHandler class.
Diffstat (limited to 'Kernel/Syscalls/keymap.cpp')
-rw-r--r-- | Kernel/Syscalls/keymap.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Kernel/Syscalls/keymap.cpp b/Kernel/Syscalls/keymap.cpp index e22a8dd377..d9eae8be9a 100644 --- a/Kernel/Syscalls/keymap.cpp +++ b/Kernel/Syscalls/keymap.cpp @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <Kernel/Devices/KeyboardDevice.h> +#include <Kernel/Devices/HID/HIDManagement.h> #include <Kernel/Process.h> namespace Kernel { @@ -62,8 +62,7 @@ KResultOr<int> Process::sys$setkeymap(Userspace<const Syscall::SC_setkeymap_para if (map_name.value().length() > map_name_max_size) { return ENAMETOOLONG; } - - KeyboardDevice::the().set_maps(character_map_data, map_name.value()); + HIDManagement::the().set_maps(character_map_data, map_name.value()); return 0; } @@ -75,8 +74,8 @@ KResultOr<int> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_para if (!copy_from_user(¶ms, user_params)) return EFAULT; - String keymap_name = KeyboardDevice::the().keymap_name(); - const Keyboard::CharacterMapData& character_maps = KeyboardDevice::the().character_maps(); + String keymap_name = HIDManagement::the().keymap_name(); + const Keyboard::CharacterMapData& character_maps = HIDManagement::the().character_maps(); if (!copy_to_user(params.map, character_maps.map, CHAR_MAP_SIZE * sizeof(u32))) return EFAULT; |