From e67d0c9eef8d34714da3b0a2730ae31110e5181d Mon Sep 17 00:00:00 2001 From: Brian Gianforcaro Date: Sat, 1 Aug 2020 16:31:13 -0700 Subject: [PATCH] LibKeyboard: Don't compile CharacterMap:set_system_map in kernel mode In preparation for using Userspace in Syscall::SC_setkeymap_params remove the usage of SC_setkeymap_params from when compiling in kernel mode. In kernel model we would need to do a bunch of explicit FlatPtr cats to in order to get it to compile, and it's unused anyway, so just avoid the pain. --- Libraries/LibKeyboard/CharacterMap.cpp | 4 ++++ Libraries/LibKeyboard/CharacterMap.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Libraries/LibKeyboard/CharacterMap.cpp b/Libraries/LibKeyboard/CharacterMap.cpp index 577f25422d..87e9973e89 100644 --- a/Libraries/LibKeyboard/CharacterMap.cpp +++ b/Libraries/LibKeyboard/CharacterMap.cpp @@ -46,12 +46,16 @@ CharacterMap::CharacterMap(const String& file_name) #endif } +#ifndef KERNEL + int CharacterMap::set_system_map() { Syscall::SC_setkeymap_params params { m_character_map_data.map, m_character_map_data.shift_map, m_character_map_data.alt_map, m_character_map_data.altgr_map }; return syscall(SC_setkeymap, ¶ms); } +#endif + u32 CharacterMap::get_char(KeyEvent event) { auto modifiers = event.modifiers(); diff --git a/Libraries/LibKeyboard/CharacterMap.h b/Libraries/LibKeyboard/CharacterMap.h index d263fa81f7..cf0a8f065e 100644 --- a/Libraries/LibKeyboard/CharacterMap.h +++ b/Libraries/LibKeyboard/CharacterMap.h @@ -37,7 +37,10 @@ class CharacterMap { public: CharacterMap(const String& file_name); +#ifndef KERNEL int set_system_map(); +#endif + u32 get_char(KeyEvent); void set_character_map_data(CharacterMapData character_map_data);