diff options
Diffstat (limited to '')
-rw-r--r-- | src/hid_core/resources/applet_resource.cpp (renamed from src/core/hle/service/hid/controllers/applet_resource.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/applet_resource.h (renamed from src/core/hle/service/hid/controllers/applet_resource.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/controller_base.cpp (renamed from src/core/hle/service/hid/controllers/controller_base.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/controller_base.h (renamed from src/core/hle/service/hid/controllers/controller_base.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/debug_pad/debug_pad.cpp (renamed from src/core/hle/service/hid/controllers/debug_pad.cpp) | 12 | ||||
-rw-r--r-- | src/hid_core/resources/debug_pad/debug_pad.h (renamed from src/core/hle/service/hid/controllers/debug_pad.h) | 7 | ||||
-rw-r--r-- | src/hid_core/resources/debug_pad/debug_pad_types.h (renamed from src/core/hle/service/hid/controllers/types/debug_pad_types.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/digitizer/digitizer.cpp (renamed from src/core/hle/service/hid/controllers/digitizer.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/digitizer/digitizer.h (renamed from src/core/hle/service/hid/controllers/digitizer.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/keyboard/keyboard.cpp (renamed from src/core/hle/service/hid/controllers/keyboard.cpp) | 10 | ||||
-rw-r--r-- | src/hid_core/resources/keyboard/keyboard.h (renamed from src/core/hle/service/hid/controllers/keyboard.h) | 9 | ||||
-rw-r--r-- | src/hid_core/resources/keyboard/keyboard_types.h (renamed from src/core/hle/service/hid/controllers/types/keyboard_types.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/mouse/debug_mouse.cpp (renamed from src/core/hle/service/hid/controllers/debug_mouse.cpp) | 10 | ||||
-rw-r--r-- | src/hid_core/resources/mouse/debug_mouse.h (renamed from src/core/hle/service/hid/controllers/debug_mouse.h) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/mouse/mouse.cpp (renamed from src/core/hle/service/hid/controllers/mouse.cpp) | 10 | ||||
-rw-r--r-- | src/hid_core/resources/mouse/mouse.h (renamed from src/core/hle/service/hid/controllers/mouse.h) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/mouse/mouse_types.h (renamed from src/core/hle/service/hid/controllers/types/mouse_types.h) | 0 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad.cpp (renamed from src/core/hle/service/hid/controllers/npad.cpp) | 14 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad.h (renamed from src/core/hle/service/hid/controllers/npad.h) | 8 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad_data.cpp (renamed from src/core/hle/service/hid/controllers/npad/npad_data.cpp) | 4 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad_data.h (renamed from src/core/hle/service/hid/controllers/npad/npad_data.h) | 4 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad_resource.cpp (renamed from src/core/hle/service/hid/controllers/npad/npad_resource.cpp) | 8 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad_resource.h (renamed from src/core/hle/service/hid/controllers/npad/npad_resource.h) | 8 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad_types.h (renamed from src/core/hle/service/hid/controllers/types/npad_types.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/palma/palma.cpp (renamed from src/core/hle/service/hid/controllers/palma.cpp) | 7 | ||||
-rw-r--r-- | src/hid_core/resources/palma/palma.h (renamed from src/core/hle/service/hid/controllers/palma.h) | 5 | ||||
-rw-r--r-- | src/hid_core/resources/shared_memory_format.h (renamed from src/core/hle/service/hid/controllers/types/shared_memory_format.h) | 14 | ||||
-rw-r--r-- | src/hid_core/resources/shared_memory_holder.cpp (renamed from src/core/hle/service/hid/controllers/shared_memory_holder.cpp) | 8 | ||||
-rw-r--r-- | src/hid_core/resources/shared_memory_holder.h (renamed from src/core/hle/service/hid/controllers/shared_memory_holder.h) | 0 | ||||
-rw-r--r-- | src/hid_core/resources/six_axis/console_six_axis.cpp (renamed from src/core/hle/service/hid/controllers/console_six_axis.cpp) | 8 | ||||
-rw-r--r-- | src/hid_core/resources/six_axis/console_six_axis.h (renamed from src/core/hle/service/hid/controllers/console_six_axis.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/six_axis/seven_six_axis.cpp (renamed from src/core/hle/service/hid/controllers/seven_six_axis.cpp) | 8 | ||||
-rw-r--r-- | src/hid_core/resources/six_axis/seven_six_axis.h (renamed from src/core/hle/service/hid/controllers/seven_six_axis.h) | 4 | ||||
-rw-r--r-- | src/hid_core/resources/six_axis/six_axis.cpp (renamed from src/core/hle/service/hid/controllers/six_axis.cpp) | 14 | ||||
-rw-r--r-- | src/hid_core/resources/six_axis/six_axis.h (renamed from src/core/hle/service/hid/controllers/six_axis.h) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/system_buttons/capture_button.cpp (renamed from src/core/hle/service/hid/controllers/capture_button.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/system_buttons/capture_button.h (renamed from src/core/hle/service/hid/controllers/capture_button.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/system_buttons/home_button.cpp (renamed from src/core/hle/service/hid/controllers/home_button.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/system_buttons/home_button.h (renamed from src/core/hle/service/hid/controllers/home_button.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/system_buttons/sleep_button.cpp (renamed from src/core/hle/service/hid/controllers/sleep_button.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/system_buttons/sleep_button.h (renamed from src/core/hle/service/hid/controllers/sleep_button.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/touch_screen/gesture.cpp (renamed from src/core/hle/service/hid/controllers/gesture.cpp) | 10 | ||||
-rw-r--r-- | src/hid_core/resources/touch_screen/gesture.h (renamed from src/core/hle/service/hid/controllers/gesture.h) | 4 | ||||
-rw-r--r-- | src/hid_core/resources/touch_screen/gesture_types.h (renamed from src/core/hle/service/hid/controllers/types/gesture_types.h) | 0 | ||||
-rw-r--r-- | src/hid_core/resources/touch_screen/touch_screen.cpp (renamed from src/core/hle/service/hid/controllers/touchscreen.cpp) | 10 | ||||
-rw-r--r-- | src/hid_core/resources/touch_screen/touch_screen.h (renamed from src/core/hle/service/hid/controllers/touchscreen.h) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/touch_screen/touch_types.h (renamed from src/core/hle/service/hid/controllers/types/touch_types.h) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/unique_pad/unique_pad.cpp (renamed from src/core/hle/service/hid/controllers/unique_pad.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/resources/unique_pad/unique_pad.h (renamed from src/core/hle/service/hid/controllers/unique_pad.h) | 2 |
49 files changed, 144 insertions, 138 deletions
diff --git a/src/core/hle/service/hid/controllers/applet_resource.cpp b/src/hid_core/resources/applet_resource.cpp index b4ff663c2..d16cff1a4 100644 --- a/src/core/hle/service/hid/controllers/applet_resource.cpp +++ b/src/hid_core/resources/applet_resource.cpp @@ -3,9 +3,9 @@ #include "core/core.h" #include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" -#include "core/hle/service/hid/errors.h" +#include "hid_core/hid_result.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/applet_resource.h b/src/hid_core/resources/applet_resource.h index 0862fdc2f..f3f32bac1 100644 --- a/src/core/hle/service/hid/controllers/applet_resource.h +++ b/src/hid_core/resources/applet_resource.h @@ -9,7 +9,7 @@ #include "common/bit_field.h" #include "common/common_types.h" #include "core/hle/result.h" -#include "core/hle/service/hid/controllers/shared_memory_holder.h" +#include "hid_core/resources/shared_memory_holder.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/controllers/controller_base.cpp b/src/hid_core/resources/controller_base.cpp index afca7154c..df5f5c884 100644 --- a/src/core/hle/service/hid/controllers/controller_base.cpp +++ b/src/hid_core/resources/controller_base.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/resources/controller_base.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/controller_base.h b/src/hid_core/resources/controller_base.h index b34b85ece..e61bc6376 100644 --- a/src/core/hle/service/hid/controllers/controller_base.h +++ b/src/hid_core/resources/controller_base.h @@ -7,7 +7,7 @@ #include "common/common_types.h" #include "core/hle/result.h" -#include "core/hle/service/hid/controllers/applet_resource.h" +#include "hid_core/resources/applet_resource.h" namespace Core::Timing { class CoreTiming; diff --git a/src/core/hle/service/hid/controllers/debug_pad.cpp b/src/hid_core/resources/debug_pad/debug_pad.cpp index dc83f90f3..1102dad6c 100644 --- a/src/core/hle/service/hid/controllers/debug_pad.cpp +++ b/src/hid_core/resources/debug_pad/debug_pad.cpp @@ -3,12 +3,12 @@ #include "common/settings.h" #include "core/core_timing.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/debug_pad.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/debug_pad/debug_pad.h" +#include "hid_core/resources/shared_memory_format.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/debug_pad.h b/src/hid_core/resources/debug_pad/debug_pad.h index dd00b2402..73c3d4421 100644 --- a/src/core/hle/service/hid/controllers/debug_pad.h +++ b/src/hid_core/resources/debug_pad/debug_pad.h @@ -3,12 +3,13 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/controllers/types/debug_pad_types.h" +#include "hid_core/resources/controller_base.h" +#include "hid_core/resources/debug_pad/debug_pad_types.h" namespace Core::HID { class HIDCore; -} +class EmulatedController; +} // namespace Core::HID namespace Core::Timing { class CoreTiming; diff --git a/src/core/hle/service/hid/controllers/types/debug_pad_types.h b/src/hid_core/resources/debug_pad/debug_pad_types.h index a96171b62..8b5eb108e 100644 --- a/src/core/hle/service/hid/controllers/types/debug_pad_types.h +++ b/src/hid_core/resources/debug_pad/debug_pad_types.h @@ -5,7 +5,7 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hid/hid_types.h" +#include "hid_core/hid_types.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/digitizer.cpp b/src/hid_core/resources/digitizer/digitizer.cpp index d5514c965..cd72fd6e5 100644 --- a/src/core/hle/service/hid/controllers/digitizer.cpp +++ b/src/hid_core/resources/digitizer/digitizer.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core_timing.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/digitizer.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/digitizer/digitizer.h" +#include "hid_core/resources/shared_memory_format.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/digitizer.h b/src/hid_core/resources/digitizer/digitizer.h index d81f814c3..e031a16b0 100644 --- a/src/core/hle/service/hid/controllers/digitizer.h +++ b/src/hid_core/resources/digitizer/digitizer.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/resources/controller_base.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/keyboard.cpp b/src/hid_core/resources/keyboard/keyboard.cpp index c069bcbb2..340e8a65c 100644 --- a/src/core/hle/service/hid/controllers/keyboard.cpp +++ b/src/hid_core/resources/keyboard/keyboard.cpp @@ -3,11 +3,11 @@ #include "common/settings.h" #include "core/core_timing.h" -#include "core/hid/emulated_devices.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/keyboard.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/frontend/emulated_devices.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/keyboard/keyboard.h" +#include "hid_core/resources/shared_memory_format.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/keyboard.h b/src/hid_core/resources/keyboard/keyboard.h index e8ca326c6..4bcc1c1b2 100644 --- a/src/core/hle/service/hid/controllers/keyboard.h +++ b/src/hid_core/resources/keyboard/keyboard.h @@ -3,8 +3,13 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/controllers/types/keyboard_types.h" +#include "hid_core/resources/controller_base.h" +#include "hid_core/resources/keyboard/keyboard_types.h" + +namespace Core::HID { +class HIDCore; +class EmulatedDevices; +} // namespace Core::HID namespace Service::HID { class Keyboard final : public ControllerBase { diff --git a/src/core/hle/service/hid/controllers/types/keyboard_types.h b/src/hid_core/resources/keyboard/keyboard_types.h index f44a536b9..4d7ff2f0a 100644 --- a/src/core/hle/service/hid/controllers/types/keyboard_types.h +++ b/src/hid_core/resources/keyboard/keyboard_types.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hid/hid_types.h" +#include "hid_core/hid_types.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/debug_mouse.cpp b/src/hid_core/resources/mouse/debug_mouse.cpp index ceeb78d36..5f6f6e8e1 100644 --- a/src/core/hle/service/hid/controllers/debug_mouse.cpp +++ b/src/hid_core/resources/mouse/debug_mouse.cpp @@ -3,11 +3,11 @@ #include "core/core_timing.h" #include "core/frontend/emu_window.h" -#include "core/hid/emulated_devices.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/debug_mouse.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/frontend/emulated_devices.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/mouse/debug_mouse.h" +#include "hid_core/resources/shared_memory_format.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/debug_mouse.h b/src/hid_core/resources/mouse/debug_mouse.h index ec939fa9f..006b53da6 100644 --- a/src/core/hle/service/hid/controllers/debug_mouse.h +++ b/src/hid_core/resources/mouse/debug_mouse.h @@ -3,12 +3,12 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/controller_base.h" namespace Core::HID { +class HIDCore; class EmulatedDevices; -struct MouseState; -struct AnalogStickState; } // namespace Core::HID namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/mouse.cpp b/src/hid_core/resources/mouse/mouse.cpp index 3a8d1751b..53a8938a1 100644 --- a/src/core/hle/service/hid/controllers/mouse.cpp +++ b/src/hid_core/resources/mouse/mouse.cpp @@ -3,11 +3,11 @@ #include "core/core_timing.h" #include "core/frontend/emu_window.h" -#include "core/hid/emulated_devices.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/mouse.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/frontend/emulated_devices.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/mouse/mouse.h" +#include "hid_core/resources/shared_memory_format.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/mouse.h b/src/hid_core/resources/mouse/mouse.h index cefad956c..e9ac6ad36 100644 --- a/src/core/hle/service/hid/controllers/mouse.h +++ b/src/hid_core/resources/mouse/mouse.h @@ -3,12 +3,12 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/controller_base.h" namespace Core::HID { +class HIDCore; class EmulatedDevices; -struct MouseState; -struct AnalogStickState; } // namespace Core::HID namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/types/mouse_types.h b/src/hid_core/resources/mouse/mouse_types.h index 8bd6e167c..8bd6e167c 100644 --- a/src/core/hle/service/hid/controllers/types/mouse_types.h +++ b/src/hid_core/resources/mouse/mouse_types.h diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/hid_core/resources/npad/npad.cpp index 17cd0d7a0..e6c035628 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/hid_core/resources/npad/npad.cpp @@ -12,16 +12,16 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/core_timing.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" -#include "core/hle/service/hid/errors.h" -#include "core/hle/service/hid/hid_util.h" #include "core/hle/service/kernel_helpers.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/hid_result.h" +#include "hid_core/hid_util.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/npad/npad.h" +#include "hid_core/resources/shared_memory_format.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/hid_core/resources/npad/npad.h index 8ab333064..58f8c7acf 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/hid_core/resources/npad/npad.h @@ -9,10 +9,10 @@ #include <span> #include "common/common_types.h" -#include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/controllers/npad/npad_resource.h" -#include "core/hle/service/hid/controllers/types/npad_types.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/controller_base.h" +#include "hid_core/resources/npad/npad_resource.h" +#include "hid_core/resources/npad/npad_types.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/controllers/npad/npad_data.cpp b/src/hid_core/resources/npad/npad_data.cpp index d2423b6d3..c7e9760cb 100644 --- a/src/core/hle/service/hid/controllers/npad/npad_data.cpp +++ b/src/hid_core/resources/npad/npad_data.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/controllers/npad/npad_data.h" -#include "core/hle/service/hid/hid_util.h" +#include "hid_core/hid_util.h" +#include "hid_core/resources/npad/npad_data.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/npad/npad_data.h b/src/hid_core/resources/npad/npad_data.h index f799a9f9c..86bd3b81c 100644 --- a/src/core/hle/service/hid/controllers/npad/npad_data.h +++ b/src/hid_core/resources/npad/npad_data.h @@ -7,9 +7,9 @@ #include <span> #include "common/common_types.h" -#include "core/hid/hid_types.h" #include "core/hle/result.h" -#include "core/hle/service/hid/controllers/types/npad_types.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/npad/npad_types.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/npad/npad_resource.cpp b/src/hid_core/resources/npad/npad_resource.cpp index 0a9341a39..b0255a05c 100644 --- a/src/core/hle/service/hid/controllers/npad/npad_resource.cpp +++ b/src/hid_core/resources/npad/npad_resource.cpp @@ -3,10 +3,10 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/hid/controllers/npad/npad_resource.h" -#include "core/hle/service/hid/controllers/types/npad_types.h" -#include "core/hle/service/hid/errors.h" -#include "core/hle/service/hid/hid_util.h" +#include "hid_core/hid_result.h" +#include "hid_core/hid_util.h" +#include "hid_core/resources/npad/npad_resource.h" +#include "hid_core/resources/npad/npad_types.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/npad/npad_resource.h b/src/hid_core/resources/npad/npad_resource.h index 4c7e6ab0e..aed89eec6 100644 --- a/src/core/hle/service/hid/controllers/npad/npad_resource.h +++ b/src/hid_core/resources/npad/npad_resource.h @@ -8,12 +8,12 @@ #include <span> #include "common/common_types.h" -#include "core/hid/hid_types.h" #include "core/hle/result.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/npad/npad_data.h" -#include "core/hle/service/hid/controllers/types/npad_types.h" #include "core/hle/service/kernel_helpers.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/npad/npad_data.h" +#include "hid_core/resources/npad/npad_types.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/controllers/types/npad_types.h b/src/hid_core/resources/npad/npad_types.h index 419c33a8c..a02f9cf16 100644 --- a/src/core/hle/service/hid/controllers/types/npad_types.h +++ b/src/hid_core/resources/npad/npad_types.h @@ -6,7 +6,7 @@ #include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hid/hid_types.h" +#include "hid_core/hid_types.h" namespace Service::HID { static constexpr std::size_t MaxSupportedNpadIdTypes = 10; diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/hid_core/resources/palma/palma.cpp index aa0454b5e..ea4a291fd 100644 --- a/src/core/hle/service/hid/controllers/palma.cpp +++ b/src/hid_core/resources/palma/palma.cpp @@ -2,13 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core_timing.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hid/hid_types.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/hid/controllers/palma.h" #include "core/hle/service/kernel_helpers.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/palma/palma.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/palma.h b/src/hid_core/resources/palma/palma.h index 73884230d..60259c3d8 100644 --- a/src/core/hle/service/hid/controllers/palma.h +++ b/src/hid_core/resources/palma/palma.h @@ -6,8 +6,9 @@ #include <array> #include "common/common_funcs.h" #include "common/typed_address.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/errors.h" +#include "hid_core/hid_result.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/controller_base.h" namespace Kernel { class KEvent; diff --git a/src/core/hle/service/hid/controllers/types/shared_memory_format.h b/src/hid_core/resources/shared_memory_format.h index 976043b9c..2ae0004ba 100644 --- a/src/core/hle/service/hid/controllers/types/shared_memory_format.h +++ b/src/hid_core/resources/shared_memory_format.h @@ -6,13 +6,13 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/vector_math.h" -#include "core/hid/hid_types.h" -#include "core/hle/service/hid//controllers/types/debug_pad_types.h" -#include "core/hle/service/hid//controllers/types/keyboard_types.h" -#include "core/hle/service/hid//controllers/types/mouse_types.h" -#include "core/hle/service/hid//controllers/types/npad_types.h" -#include "core/hle/service/hid//controllers/types/touch_types.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/debug_pad/debug_pad_types.h" +#include "hid_core/resources/keyboard/keyboard_types.h" +#include "hid_core/resources/mouse/mouse_types.h" +#include "hid_core/resources/npad/npad_types.h" +#include "hid_core/resources/ring_lifo.h" +#include "hid_core/resources/touch_screen/touch_types.h" namespace Service::HID { static const std::size_t HidEntryCount = 17; diff --git a/src/core/hle/service/hid/controllers/shared_memory_holder.cpp b/src/hid_core/resources/shared_memory_holder.cpp index 0bc5169c6..ada593d8b 100644 --- a/src/core/hle/service/hid/controllers/shared_memory_holder.cpp +++ b/src/hid_core/resources/shared_memory_holder.cpp @@ -3,10 +3,10 @@ #include "core/core.h" #include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/shared_memory_holder.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" -#include "core/hle/service/hid/errors.h" +#include "hid_core/hid_result.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/shared_memory_holder.h" namespace Service::HID { SharedMemoryHolder::SharedMemoryHolder() {} diff --git a/src/core/hle/service/hid/controllers/shared_memory_holder.h b/src/hid_core/resources/shared_memory_holder.h index 943407c00..943407c00 100644 --- a/src/core/hle/service/hid/controllers/shared_memory_holder.h +++ b/src/hid_core/resources/shared_memory_holder.h diff --git a/src/core/hle/service/hid/controllers/console_six_axis.cpp b/src/hid_core/resources/six_axis/console_six_axis.cpp index 4b574c2e5..4f733cc76 100644 --- a/src/core/hle/service/hid/controllers/console_six_axis.cpp +++ b/src/hid_core/resources/six_axis/console_six_axis.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core_timing.h" -#include "core/hid/emulated_console.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/console_six_axis.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/frontend/emulated_console.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/six_axis/console_six_axis.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/console_six_axis.h b/src/hid_core/resources/six_axis/console_six_axis.h index e3351f83c..013b2e93b 100644 --- a/src/core/hle/service/hid/controllers/console_six_axis.h +++ b/src/hid_core/resources/six_axis/console_six_axis.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/resources/controller_base.h" namespace Core::HID { class EmulatedConsole; diff --git a/src/core/hle/service/hid/controllers/seven_six_axis.cpp b/src/hid_core/resources/six_axis/seven_six_axis.cpp index 495568484..d84ef31e1 100644 --- a/src/core/hle/service/hid/controllers/seven_six_axis.cpp +++ b/src/hid_core/resources/six_axis/seven_six_axis.cpp @@ -6,11 +6,11 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/frontend/emu_window.h" -#include "core/hid/emulated_console.h" -#include "core/hid/emulated_devices.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/seven_six_axis.h" #include "core/memory.h" +#include "hid_core/frontend/emulated_console.h" +#include "hid_core/frontend/emulated_devices.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/six_axis/seven_six_axis.h" namespace Service::HID { SevenSixAxis::SevenSixAxis(Core::System& system_) diff --git a/src/core/hle/service/hid/controllers/seven_six_axis.h b/src/hid_core/resources/six_axis/seven_six_axis.h index 40e3f5d12..0a26c77c9 100644 --- a/src/core/hle/service/hid/controllers/seven_six_axis.h +++ b/src/hid_core/resources/six_axis/seven_six_axis.h @@ -6,8 +6,8 @@ #include "common/common_types.h" #include "common/quaternion.h" #include "common/typed_address.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "hid_core/resources/controller_base.h" +#include "hid_core/resources/ring_lifo.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/controllers/six_axis.cpp b/src/hid_core/resources/six_axis/six_axis.cpp index adab60911..8a9677c50 100644 --- a/src/core/hle/service/hid/controllers/six_axis.cpp +++ b/src/hid_core/resources/six_axis/six_axis.cpp @@ -3,13 +3,13 @@ #include "common/common_types.h" #include "core/core_timing.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/controllers/six_axis.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" -#include "core/hle/service/hid/errors.h" -#include "core/hle/service/hid/hid_util.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/hid_result.h" +#include "hid_core/hid_util.h" +#include "hid_core/resources/npad/npad.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/six_axis/six_axis.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/six_axis.h b/src/hid_core/resources/six_axis/six_axis.h index 4c4f5dc7b..1054e1b27 100644 --- a/src/core/hle/service/hid/controllers/six_axis.h +++ b/src/hid_core/resources/six_axis/six_axis.h @@ -4,9 +4,9 @@ #pragma once #include "common/common_types.h" -#include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/controller_base.h" +#include "hid_core/resources/ring_lifo.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/controllers/capture_button.cpp b/src/hid_core/resources/system_buttons/capture_button.cpp index 7847c080e..70973ae25 100644 --- a/src/core/hle/service/hid/controllers/capture_button.cpp +++ b/src/hid_core/resources/system_buttons/capture_button.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core_timing.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/capture_button.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/system_buttons/capture_button.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/capture_button.h b/src/hid_core/resources/system_buttons/capture_button.h index dcc4715c5..ad95d7cad 100644 --- a/src/core/hle/service/hid/controllers/capture_button.h +++ b/src/hid_core/resources/system_buttons/capture_button.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/resources/controller_base.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/home_button.cpp b/src/hid_core/resources/system_buttons/home_button.cpp index 1397379f3..f9c1f44b5 100644 --- a/src/core/hle/service/hid/controllers/home_button.cpp +++ b/src/hid_core/resources/system_buttons/home_button.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core_timing.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/home_button.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/system_buttons/home_button.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/home_button.h b/src/hid_core/resources/system_buttons/home_button.h index e91c2aa5d..ecf8327f4 100644 --- a/src/core/hle/service/hid/controllers/home_button.h +++ b/src/hid_core/resources/system_buttons/home_button.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/resources/controller_base.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/sleep_button.cpp b/src/hid_core/resources/system_buttons/sleep_button.cpp index d44b1f4cc..22adf501f 100644 --- a/src/core/hle/service/hid/controllers/sleep_button.cpp +++ b/src/hid_core/resources/system_buttons/sleep_button.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core_timing.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/sleep_button.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/system_buttons/sleep_button.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/sleep_button.h b/src/hid_core/resources/system_buttons/sleep_button.h index 59964bf63..f9ed38c33 100644 --- a/src/core/hle/service/hid/controllers/sleep_button.h +++ b/src/hid_core/resources/system_buttons/sleep_button.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/resources/controller_base.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/hid_core/resources/touch_screen/gesture.cpp index c73da13ee..0ecc0941f 100644 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/hid_core/resources/touch_screen/gesture.cpp @@ -4,11 +4,11 @@ #include "common/math_util.h" #include "common/settings.h" #include "core/frontend/emu_window.h" -#include "core/hid/emulated_console.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/gesture.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/frontend/emulated_console.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/touch_screen/gesture.h" namespace Service::HID { // HW is around 700, value is set to 400 to make it easier to trigger with mouse diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/hid_core/resources/touch_screen/gesture.h index 78da1552a..32e9a8690 100644 --- a/src/core/hle/service/hid/controllers/gesture.h +++ b/src/hid_core/resources/touch_screen/gesture.h @@ -6,8 +6,8 @@ #include <array> #include "common/common_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/controllers/types/touch_types.h" +#include "hid_core/resources/controller_base.h" +#include "hid_core/resources/touch_screen/touch_types.h" namespace Core::HID { class EmulatedConsole; diff --git a/src/core/hle/service/hid/controllers/types/gesture_types.h b/src/hid_core/resources/touch_screen/gesture_types.h index b4f034cd3..b4f034cd3 100644 --- a/src/core/hle/service/hid/controllers/types/gesture_types.h +++ b/src/hid_core/resources/touch_screen/gesture_types.h diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/hid_core/resources/touch_screen/touch_screen.cpp index b585a5829..48d956c51 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.cpp +++ b/src/hid_core/resources/touch_screen/touch_screen.cpp @@ -6,11 +6,11 @@ #include "common/settings.h" #include "core/core_timing.h" #include "core/frontend/emu_window.h" -#include "core/hid/emulated_console.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/touchscreen.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" +#include "hid_core/frontend/emulated_console.h" +#include "hid_core/hid_core.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/touch_screen/touch_screen.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/hid_core/resources/touch_screen/touch_screen.h index 945d359be..4b3824742 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.h +++ b/src/hid_core/resources/touch_screen/touch_screen.h @@ -5,9 +5,9 @@ #include <array> -#include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/controllers/types/touch_types.h" +#include "hid_core/hid_types.h" +#include "hid_core/resources/controller_base.h" +#include "hid_core/resources/touch_screen/touch_types.h" namespace Core::HID { class EmulatedConsole; diff --git a/src/core/hle/service/hid/controllers/types/touch_types.h b/src/hid_core/resources/touch_screen/touch_types.h index efeaa796d..97ee847da 100644 --- a/src/core/hle/service/hid/controllers/types/touch_types.h +++ b/src/hid_core/resources/touch_screen/touch_types.h @@ -10,7 +10,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/point.h" -#include "core/hid/hid_types.h" +#include "hid_core/hid_types.h" namespace Service::HID { static constexpr std::size_t MAX_FINGERS = 16; diff --git a/src/core/hle/service/hid/controllers/unique_pad.cpp b/src/hid_core/resources/unique_pad/unique_pad.cpp index 6c543031d..892bbe3c9 100644 --- a/src/core/hle/service/hid/controllers/unique_pad.cpp +++ b/src/hid_core/resources/unique_pad/unique_pad.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core_timing.h" -#include "core/hle/service/hid/controllers/applet_resource.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" -#include "core/hle/service/hid/controllers/unique_pad.h" +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/unique_pad/unique_pad.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/unique_pad.h b/src/hid_core/resources/unique_pad/unique_pad.h index 966368264..674ad1691 100644 --- a/src/core/hle/service/hid/controllers/unique_pad.h +++ b/src/hid_core/resources/unique_pad/unique_pad.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/hid/controllers/controller_base.h" +#include "hid_core/resources/controller_base.h" namespace Service::HID { |