RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:48:11 +00:00
Code Issues Activity Actions

LibKeyboard: Don't compile CharacterMap:set_system_map in kernel mode

Browse source 
In preparation for using Userspace<T> 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.
This commit is contained in:
Brian Gianforcaro 2020-08-01 16:31:13 -07:00 • committed by Andreas Kling
parent 10e912d68c
commit e67d0c9eef
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibKeyboard/CharacterMap.cpp
View file

@ -46,12 +46,16 @@ CharacterMap::CharacterMap(const String& file_name)
#endif #endif
} }
#ifndef KERNEL
int CharacterMap::set_system_map() 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 }; 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, &params); return syscall(SC_setkeymap, &params);
} }
#endif
u32 CharacterMap::get_char(KeyEvent event) u32 CharacterMap::get_char(KeyEvent event)
{ {
auto modifiers = event.modifiers(); auto modifiers = event.modifiers();

3
Libraries/LibKeyboard/CharacterMap.h
View file

@ -37,7 +37,10 @@ class CharacterMap {
public: public:
CharacterMap(const String& file_name); CharacterMap(const String& file_name);
#ifndef KERNEL
int set_system_map(); int set_system_map();
#endif
u32 get_char(KeyEvent); u32 get_char(KeyEvent);
void set_character_map_data(CharacterMapData character_map_data); void set_character_map_data(CharacterMapData character_map_data);