summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiav A <liavalb@gmail.com>2022-12-19 23:53:51 +0200
committerJelle Raaijmakers <jelle@gmta.nl>2023-04-09 18:11:37 +0200
commit6c4a47d916d2eff1d7c9bd7657609c213f5d7e26 (patch)
tree6f7b50d1971ab0f0523d60aea27f1093359bd1da
parentb3cc320718f74a5b15933b02491b540b951075fa (diff)
downloadserenity-6c4a47d916d2eff1d7c9bd7657609c213f5d7e26.zip
Kernel: Remove redundant HID name from all associated files
-rw-r--r--Kernel/Arch/init.cpp2
-rw-r--r--Kernel/Arch/x86_64/ISABus/HID/PS2KeyboardDevice.cpp2
-rw-r--r--Kernel/CMakeLists.txt2
-rw-r--r--Kernel/Devices/HID/Device.h (renamed from Kernel/Devices/HID/HIDDevice.h)0
-rw-r--r--Kernel/Devices/HID/KeyboardDevice.h2
-rw-r--r--Kernel/Devices/HID/Management.cpp (renamed from Kernel/Devices/HID/HIDManagement.cpp)2
-rw-r--r--Kernel/Devices/HID/Management.h (renamed from Kernel/Devices/HID/HIDManagement.h)2
-rw-r--r--Kernel/Devices/HID/MouseDevice.cpp2
-rw-r--r--Kernel/Devices/HID/MouseDevice.h2
-rw-r--r--Kernel/FileSystem/SysFS/Subsystems/Kernel/Keymap.cpp2
-rw-r--r--Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp2
-rw-r--r--Kernel/Syscalls/keymap.cpp2
-rw-r--r--Kernel/TTY/VirtualConsole.cpp2
-rw-r--r--Kernel/TTY/VirtualConsole.h2
14 files changed, 13 insertions, 13 deletions
diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp
index 01e01069d5..ec22a77da9 100644
--- a/Kernel/Arch/init.cpp
+++ b/Kernel/Arch/init.cpp
@@ -17,7 +17,7 @@
#include <Kernel/Devices/DeviceControlDevice.h>
#include <Kernel/Devices/DeviceManagement.h>
#include <Kernel/Devices/FullDevice.h>
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/Devices/KCOVDevice.h>
#include <Kernel/Devices/MemoryDevice.h>
#include <Kernel/Devices/NullDevice.h>
diff --git a/Kernel/Arch/x86_64/ISABus/HID/PS2KeyboardDevice.cpp b/Kernel/Arch/x86_64/ISABus/HID/PS2KeyboardDevice.cpp
index 02e1d3ab01..1f7b3140b2 100644
--- a/Kernel/Arch/x86_64/ISABus/HID/PS2KeyboardDevice.cpp
+++ b/Kernel/Arch/x86_64/ISABus/HID/PS2KeyboardDevice.cpp
@@ -9,7 +9,7 @@
#include <Kernel/Arch/x86_64/ISABus/HID/PS2KeyboardDevice.h>
#include <Kernel/Debug.h>
#include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/Scheduler.h>
#include <Kernel/Sections.h>
#include <Kernel/TTY/ConsoleManagement.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 205b8c157f..54d7ae41ef 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -69,8 +69,8 @@ set(KERNEL_SOURCES
Devices/SelfTTYDevice.cpp
Devices/SerialDevice.cpp
Devices/ZeroDevice.cpp
- Devices/HID/HIDManagement.cpp
Devices/HID/KeyboardDevice.cpp
+ Devices/HID/Management.cpp
Devices/HID/MouseDevice.cpp
Graphics/Bochs/GraphicsAdapter.cpp
Graphics/Bochs/QEMUDisplayConnector.cpp
diff --git a/Kernel/Devices/HID/HIDDevice.h b/Kernel/Devices/HID/Device.h
index 72d244650c..72d244650c 100644
--- a/Kernel/Devices/HID/HIDDevice.h
+++ b/Kernel/Devices/HID/Device.h
diff --git a/Kernel/Devices/HID/KeyboardDevice.h b/Kernel/Devices/HID/KeyboardDevice.h
index 85896e9bf1..e37f9bedb1 100644
--- a/Kernel/Devices/HID/KeyboardDevice.h
+++ b/Kernel/Devices/HID/KeyboardDevice.h
@@ -11,7 +11,7 @@
#include <AK/Types.h>
#include <Kernel/API/KeyCode.h>
#include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/Devices/HID/HIDDevice.h>
+#include <Kernel/Devices/HID/Device.h>
#include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Random.h>
diff --git a/Kernel/Devices/HID/HIDManagement.cpp b/Kernel/Devices/HID/Management.cpp
index 1ec30195c2..8338b6cf86 100644
--- a/Kernel/Devices/HID/HIDManagement.cpp
+++ b/Kernel/Devices/HID/Management.cpp
@@ -10,7 +10,7 @@
# include <Kernel/Arch/x86_64/ISABus/I8042Controller.h>
#endif
#include <Kernel/CommandLine.h>
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/Firmware/ACPI/Parser.h>
#include <Kernel/Sections.h>
diff --git a/Kernel/Devices/HID/HIDManagement.h b/Kernel/Devices/HID/Management.h
index 157ef94afd..c1acb1f6be 100644
--- a/Kernel/Devices/HID/HIDManagement.h
+++ b/Kernel/Devices/HID/Management.h
@@ -12,7 +12,7 @@
#include <AK/Types.h>
#include <Kernel/API/KeyCode.h>
#include <Kernel/API/MousePacket.h>
-#include <Kernel/Devices/HID/HIDDevice.h>
+#include <Kernel/Devices/HID/Device.h>
#include <Kernel/Forward.h>
#include <Kernel/Library/LockRefPtr.h>
#include <Kernel/Locking/Spinlock.h>
diff --git a/Kernel/Devices/HID/MouseDevice.cpp b/Kernel/Devices/HID/MouseDevice.cpp
index 0adaee5034..622d0638f7 100644
--- a/Kernel/Devices/HID/MouseDevice.cpp
+++ b/Kernel/Devices/HID/MouseDevice.cpp
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/Devices/HID/MouseDevice.h>
namespace Kernel {
diff --git a/Kernel/Devices/HID/MouseDevice.h b/Kernel/Devices/HID/MouseDevice.h
index f32fa11d9f..65a7718fda 100644
--- a/Kernel/Devices/HID/MouseDevice.h
+++ b/Kernel/Devices/HID/MouseDevice.h
@@ -11,7 +11,7 @@
#include <Kernel/API/KeyCode.h>
#include <Kernel/API/MousePacket.h>
#include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/Devices/HID/HIDDevice.h>
+#include <Kernel/Devices/HID/Device.h>
#include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Random.h>
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Keymap.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Keymap.cpp
index eb86824891..d0baf4771f 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Keymap.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Keymap.cpp
@@ -5,7 +5,7 @@
*/
#include <AK/JsonObjectSerializer.h>
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Keymap.h>
#include <Kernel/Sections.h>
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp
index 07a2b6eeda..f13a40d568 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.h>
#include <Kernel/Sections.h>
diff --git a/Kernel/Syscalls/keymap.cpp b/Kernel/Syscalls/keymap.cpp
index 422bcc655d..3c836d2f79 100644
--- a/Kernel/Syscalls/keymap.cpp
+++ b/Kernel/Syscalls/keymap.cpp
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/Process.h>
namespace Kernel {
diff --git a/Kernel/TTY/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp
index 9fea8f345e..5cd2c767bf 100644
--- a/Kernel/TTY/VirtualConsole.cpp
+++ b/Kernel/TTY/VirtualConsole.cpp
@@ -13,7 +13,7 @@
#endif
#include <Kernel/CommandLine.h>
#include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/Graphics/GraphicsManagement.h>
#include <Kernel/Heap/kmalloc.h>
#include <Kernel/Sections.h>
diff --git a/Kernel/TTY/VirtualConsole.h b/Kernel/TTY/VirtualConsole.h
index 7245bce5a3..672e4ea1ca 100644
--- a/Kernel/TTY/VirtualConsole.h
+++ b/Kernel/TTY/VirtualConsole.h
@@ -11,7 +11,7 @@
#include <AK/Vector.h>
#include <Kernel/API/KeyCode.h>
#include <Kernel/Devices/ConsoleDevice.h>
-#include <Kernel/Devices/HID/HIDManagement.h>
+#include <Kernel/Devices/HID/Management.h>
#include <Kernel/Graphics/Console/Console.h>
#include <Kernel/TTY/TTY.h>
#include <LibVT/Attribute.h>