فهرست منبع

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

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.
Brian Gianforcaro 5 سال پیش
والد
کامیت
e67d0c9eef
2فایلهای تغییر یافته به همراه7 افزوده شده و 0 حذف شده
  1. 4 0
      Libraries/LibKeyboard/CharacterMap.cpp
  2. 3 0
      Libraries/LibKeyboard/CharacterMap.h

+ 4 - 0
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, &params);
 }
 
+#endif
+
 u32 CharacterMap::get_char(KeyEvent event)
 {
     auto modifiers = event.modifiers();

+ 3 - 0
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);