diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-05 03:37:43 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-05 18:41:15 +0100 |
commit | ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613 (patch) | |
tree | 3b95cbb74be05f0ce7a007353f1f9f95e1ed3901 /src/hid_core | |
parent | Merge pull request #12437 from ameerj/gl-amd-fixes (diff) | |
download | yuzu-ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613.tar yuzu-ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613.tar.gz yuzu-ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613.tar.bz2 yuzu-ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613.tar.lz yuzu-ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613.tar.xz yuzu-ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613.tar.zst yuzu-ee847f8ff0b1b0aec39c1b78c010bc0c08a0a613.zip |
Diffstat (limited to '')
-rw-r--r-- | src/hid_core/CMakeLists.txt | 126 | ||||
-rw-r--r-- | src/hid_core/frontend/emulated_console.cpp (renamed from src/core/hid/emulated_console.cpp) | 4 | ||||
-rw-r--r-- | src/hid_core/frontend/emulated_console.h (renamed from src/core/hid/emulated_console.h) | 4 | ||||
-rw-r--r-- | src/hid_core/frontend/emulated_controller.cpp (renamed from src/core/hid/emulated_controller.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/frontend/emulated_controller.h (renamed from src/core/hid/emulated_controller.h) | 6 | ||||
-rw-r--r-- | src/hid_core/frontend/emulated_devices.cpp (renamed from src/core/hid/emulated_devices.cpp) | 4 | ||||
-rw-r--r-- | src/hid_core/frontend/emulated_devices.h (renamed from src/core/hid/emulated_devices.h) | 2 | ||||
-rw-r--r-- | src/hid_core/frontend/input_converter.cpp (renamed from src/core/hid/input_converter.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/frontend/input_converter.h (renamed from src/core/hid/input_converter.h) | 0 | ||||
-rw-r--r-- | src/hid_core/frontend/input_interpreter.cpp (renamed from src/core/hid/input_interpreter.cpp) | 8 | ||||
-rw-r--r-- | src/hid_core/frontend/input_interpreter.h (renamed from src/core/hid/input_interpreter.h) | 0 | ||||
-rw-r--r-- | src/hid_core/frontend/motion_input.cpp (renamed from src/core/hid/motion_input.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/frontend/motion_input.h (renamed from src/core/hid/motion_input.h) | 0 | ||||
-rw-r--r-- | src/hid_core/hid_core.cpp (renamed from src/core/hid/hid_core.cpp) | 10 | ||||
-rw-r--r-- | src/hid_core/hid_core.h (renamed from src/core/hid/hid_core.h) | 2 | ||||
-rw-r--r-- | src/hid_core/hid_result.h (renamed from src/core/hle/service/hid/errors.h) | 0 | ||||
-rw-r--r-- | src/hid_core/hid_types.h (renamed from src/core/hid/hid_types.h) | 0 | ||||
-rw-r--r-- | src/hid_core/hid_util.h (renamed from src/core/hle/service/hid/hid_util.h) | 4 | ||||
-rw-r--r-- | src/hid_core/hidbus/hidbus_base.cpp (renamed from src/core/hle/service/hid/hidbus/hidbus_base.cpp) | 4 | ||||
-rw-r--r-- | src/hid_core/hidbus/hidbus_base.h (renamed from src/core/hle/service/hid/hidbus/hidbus_base.h) | 0 | ||||
-rw-r--r-- | src/hid_core/hidbus/ringcon.cpp (renamed from src/core/hle/service/hid/hidbus/ringcon.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/hidbus/ringcon.h (renamed from src/core/hle/service/hid/hidbus/ringcon.h) | 2 | ||||
-rw-r--r-- | src/hid_core/hidbus/starlink.cpp (renamed from src/core/hle/service/hid/hidbus/starlink.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/hidbus/starlink.h (renamed from src/core/hle/service/hid/hidbus/starlink.h) | 2 | ||||
-rw-r--r-- | src/hid_core/hidbus/stubbed.cpp (renamed from src/core/hle/service/hid/hidbus/stubbed.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/hidbus/stubbed.h (renamed from src/core/hle/service/hid/hidbus/stubbed.h) | 2 | ||||
-rw-r--r-- | src/hid_core/irsensor/clustering_processor.cpp (renamed from src/core/hle/service/hid/irsensor/clustering_processor.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/irsensor/clustering_processor.h (renamed from src/core/hle/service/hid/irsensor/clustering_processor.h) | 6 | ||||
-rw-r--r-- | src/hid_core/irsensor/image_transfer_processor.cpp (renamed from src/core/hle/service/hid/irsensor/image_transfer_processor.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/irsensor/image_transfer_processor.h (renamed from src/core/hle/service/hid/irsensor/image_transfer_processor.h) | 4 | ||||
-rw-r--r-- | src/hid_core/irsensor/ir_led_processor.cpp (renamed from src/core/hle/service/hid/irsensor/ir_led_processor.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/irsensor/ir_led_processor.h (renamed from src/core/hle/service/hid/irsensor/ir_led_processor.h) | 4 | ||||
-rw-r--r-- | src/hid_core/irsensor/irs_types.h (renamed from src/core/hid/irs_types.h) | 2 | ||||
-rw-r--r-- | src/hid_core/irsensor/moment_processor.cpp (renamed from src/core/hle/service/hid/irsensor/moment_processor.cpp) | 6 | ||||
-rw-r--r-- | src/hid_core/irsensor/moment_processor.h (renamed from src/core/hle/service/hid/irsensor/moment_processor.h) | 6 | ||||
-rw-r--r-- | src/hid_core/irsensor/pointing_processor.cpp (renamed from src/core/hle/service/hid/irsensor/pointing_processor.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/irsensor/pointing_processor.h (renamed from src/core/hle/service/hid/irsensor/pointing_processor.h) | 4 | ||||
-rw-r--r-- | src/hid_core/irsensor/processor_base.cpp (renamed from src/core/hle/service/hid/irsensor/processor_base.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/irsensor/processor_base.h (renamed from src/core/hle/service/hid/irsensor/processor_base.h) | 2 | ||||
-rw-r--r-- | src/hid_core/irsensor/tera_plugin_processor.cpp (renamed from src/core/hle/service/hid/irsensor/tera_plugin_processor.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/irsensor/tera_plugin_processor.h (renamed from src/core/hle/service/hid/irsensor/tera_plugin_processor.h) | 4 | ||||
-rw-r--r-- | src/hid_core/precompiled_headers.h | 6 | ||||
-rw-r--r-- | src/hid_core/resource_manager.cpp (renamed from src/core/hle/service/hid/resource_manager.cpp) | 42 | ||||
-rw-r--r-- | src/hid_core/resource_manager.h (renamed from src/core/hle/service/hid/resource_manager.h) | 0 | ||||
-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/hid_firmware_settings.cpp (renamed from src/core/hle/service/hid/hid_firmware_settings.cpp) | 2 | ||||
-rw-r--r-- | src/hid_core/resources/hid_firmware_settings.h (renamed from src/core/hle/service/hid/hid_firmware_settings.h) | 0 | ||||
-rw-r--r-- | src/hid_core/resources/irs_ring_lifo.h (renamed from src/core/hle/service/hid/irs_ring_lifo.h) | 0 | ||||
-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/ring_lifo.h (renamed from src/core/hle/service/hid/ring_lifo.h) | 0 | ||||
-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 |
97 files changed, 368 insertions, 230 deletions
diff --git a/src/hid_core/CMakeLists.txt b/src/hid_core/CMakeLists.txt new file mode 100644 index 000000000..cce4e6857 --- /dev/null +++ b/src/hid_core/CMakeLists.txt @@ -0,0 +1,126 @@ +# SPDX-FileCopyrightText: 2018 yuzu Emulator Project +# SPDX-License-Identifier: GPL-2.0-or-later + +add_library(hid_core STATIC + frontend/emulated_console.cpp + frontend/emulated_console.h + frontend/emulated_controller.cpp + frontend/emulated_controller.h + frontend/emulated_devices.cpp + frontend/emulated_devices.h + frontend/input_converter.cpp + frontend/input_converter.h + frontend/input_interpreter.cpp + frontend/input_interpreter.h + frontend/motion_input.cpp + frontend/motion_input.h + hidbus/hidbus_base.cpp + hidbus/hidbus_base.h + hidbus/ringcon.cpp + hidbus/ringcon.h + hidbus/starlink.cpp + hidbus/starlink.h + hidbus/stubbed.cpp + hidbus/stubbed.h + irsensor/clustering_processor.cpp + irsensor/clustering_processor.h + irsensor/image_transfer_processor.cpp + irsensor/image_transfer_processor.h + irsensor/ir_led_processor.cpp + irsensor/ir_led_processor.h + irsensor/moment_processor.cpp + irsensor/moment_processor.h + irsensor/pointing_processor.cpp + irsensor/pointing_processor.h + irsensor/processor_base.cpp + irsensor/processor_base.h + irsensor/tera_plugin_processor.cpp + irsensor/tera_plugin_processor.h + resources/debug_pad/debug_pad.cpp + resources/debug_pad/debug_pad.h + resources/debug_pad/debug_pad_types.h + resources/digitizer/digitizer.cpp + resources/digitizer/digitizer.h + resources/keyboard/keyboard.cpp + resources/keyboard/keyboard.h + resources/keyboard/keyboard_types.h + resources/mouse/debug_mouse.cpp + resources/mouse/debug_mouse.h + resources/mouse/mouse.cpp + resources/mouse/mouse.h + resources/mouse/mouse_types.h + resources/npad/npad.cpp + resources/npad/npad.h + resources/npad/npad_data.cpp + resources/npad/npad_data.h + resources/npad/npad_resource.cpp + resources/npad/npad_resource.h + resources/npad/npad_types.h + resources/palma/palma.cpp + resources/palma/palma.h + resources/six_axis/console_six_axis.cpp + resources/six_axis/console_six_axis.h + resources/six_axis/seven_six_axis.cpp + resources/six_axis/seven_six_axis.h + resources/six_axis/six_axis.cpp + resources/six_axis/six_axis.h + resources/system_buttons/capture_button.cpp + resources/system_buttons/capture_button.h + resources/system_buttons/home_button.cpp + resources/system_buttons/home_button.h + resources/system_buttons/sleep_button.cpp + resources/system_buttons/sleep_button.h + resources/touch_screen/gesture.cpp + resources/touch_screen/gesture.h + resources/touch_screen/gesture_types.h + resources/touch_screen/touch_screen.cpp + resources/touch_screen/touch_screen.h + resources/touch_screen/touch_types.h + resources/unique_pad/unique_pad.cpp + resources/unique_pad/unique_pad.h + resources/applet_resource.cpp + resources/applet_resource.h + resources/controller_base.cpp + resources/controller_base.h + resources/hid_firmware_settings.cpp + resources/hid_firmware_settings.h + resources/irs_ring_lifo.h + resources/ring_lifo.h + resources/shared_memory_format.h + resources/shared_memory_holder.cpp + resources/shared_memory_holder.h + hid_core.cpp + hid_core.h + hid_result.h + hid_types.h + hid_util.h + precompiled_headers.h + resource_manager.cpp + resource_manager.h +) + +if (MSVC) + target_compile_options(hid_core PRIVATE + /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data + /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data + /we4245 # 'conversion': conversion from 'type1' to 'type2', signed/unsigned mismatch + /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data + /we4800 # Implicit conversion from 'type' to bool. Possible information loss + ) +else() + target_compile_options(hid_core PRIVATE + -Werror=conversion + + -Wno-sign-conversion + -Wno-cast-function-type + + $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation> + ) +endif() + +create_target_directory_groups(hid_core) +target_link_libraries(hid_core PUBLIC core) + +if (YUZU_USE_PRECOMPILED_HEADERS) + target_precompile_headers(hid_core PRIVATE precompiled_headers.h) +endif() diff --git a/src/core/hid/emulated_console.cpp b/src/hid_core/frontend/emulated_console.cpp index b4afd930e..114c22fb7 100644 --- a/src/core/hid/emulated_console.cpp +++ b/src/hid_core/frontend/emulated_console.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/settings.h" -#include "core/hid/emulated_console.h" -#include "core/hid/input_converter.h" +#include "hid_core/frontend/emulated_console.h" +#include "hid_core/frontend/input_converter.h" namespace Core::HID { EmulatedConsole::EmulatedConsole() = default; diff --git a/src/core/hid/emulated_console.h b/src/hid_core/frontend/emulated_console.h index fae15a556..847551395 100644 --- a/src/core/hid/emulated_console.h +++ b/src/hid_core/frontend/emulated_console.h @@ -17,8 +17,8 @@ #include "common/point.h" #include "common/quaternion.h" #include "common/vector_math.h" -#include "core/hid/hid_types.h" -#include "core/hid/motion_input.h" +#include "hid_core/frontend/motion_input.h" +#include "hid_core/hid_types.h" namespace Core::HID { static constexpr std::size_t MaxTouchDevices = 32; diff --git a/src/core/hid/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index a6e681e15..3d2d1e9f9 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp @@ -6,9 +6,9 @@ #include "common/polyfill_ranges.h" #include "common/thread.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/input_converter.h" -#include "core/hle/service/hid/hid_util.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/frontend/input_converter.h" +#include "hid_core/hid_util.h" namespace Core::HID { constexpr s32 HID_JOYSTICK_MAX = 0x7fff; diff --git a/src/core/hid/emulated_controller.h b/src/hid_core/frontend/emulated_controller.h index d6e20ab66..94798164d 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/hid_core/frontend/emulated_controller.h @@ -15,9 +15,9 @@ #include "common/param_package.h" #include "common/settings.h" #include "common/vector_math.h" -#include "core/hid/hid_types.h" -#include "core/hid/irs_types.h" -#include "core/hid/motion_input.h" +#include "hid_core/frontend/motion_input.h" +#include "hid_core/hid_types.h" +#include "hid_core/irsensor/irs_types.h" namespace Core::HID { const std::size_t max_emulated_controllers = 2; diff --git a/src/core/hid/emulated_devices.cpp b/src/hid_core/frontend/emulated_devices.cpp index 8e165dded..a827aa9b7 100644 --- a/src/core/hid/emulated_devices.cpp +++ b/src/hid_core/frontend/emulated_devices.cpp @@ -4,8 +4,8 @@ #include <algorithm> #include <fmt/format.h> -#include "core/hid/emulated_devices.h" -#include "core/hid/input_converter.h" +#include "hid_core/frontend/emulated_devices.h" +#include "hid_core/frontend/input_converter.h" namespace Core::HID { diff --git a/src/core/hid/emulated_devices.h b/src/hid_core/frontend/emulated_devices.h index 5eab693e4..b2e57318c 100644 --- a/src/core/hid/emulated_devices.h +++ b/src/hid_core/frontend/emulated_devices.h @@ -14,7 +14,7 @@ #include "common/input.h" #include "common/param_package.h" #include "common/settings.h" -#include "core/hid/hid_types.h" +#include "hid_core/hid_types.h" namespace Core::HID { using KeyboardDevices = std::array<std::unique_ptr<Common::Input::InputDevice>, diff --git a/src/core/hid/input_converter.cpp b/src/hid_core/frontend/input_converter.cpp index a05716fd8..f245a3f76 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/hid_core/frontend/input_converter.cpp @@ -5,7 +5,7 @@ #include <random> #include "common/input.h" -#include "core/hid/input_converter.h" +#include "hid_core/frontend/input_converter.h" namespace Core::HID { diff --git a/src/core/hid/input_converter.h b/src/hid_core/frontend/input_converter.h index c51c03e57..c51c03e57 100644 --- a/src/core/hid/input_converter.h +++ b/src/hid_core/frontend/input_converter.h diff --git a/src/core/hid/input_interpreter.cpp b/src/hid_core/frontend/input_interpreter.cpp index 072f38a68..b6c8d8c5d 100644 --- a/src/core/hid/input_interpreter.cpp +++ b/src/hid_core/frontend/input_interpreter.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hid/hid_types.h" -#include "core/hid/input_interpreter.h" -#include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/hid_server.h" -#include "core/hle/service/hid/resource_manager.h" #include "core/hle/service/sm/sm.h" +#include "hid_core/frontend/input_interpreter.h" +#include "hid_core/hid_types.h" +#include "hid_core/resource_manager.h" +#include "hid_core/resources/npad/npad.h" InputInterpreter::InputInterpreter(Core::System& system) : npad{system.ServiceManager() diff --git a/src/core/hid/input_interpreter.h b/src/hid_core/frontend/input_interpreter.h index 3569aac93..3569aac93 100644 --- a/src/core/hid/input_interpreter.h +++ b/src/hid_core/frontend/input_interpreter.h diff --git a/src/core/hid/motion_input.cpp b/src/hid_core/frontend/motion_input.cpp index f56f2ae1d..417cd03f9 100644 --- a/src/core/hid/motion_input.cpp +++ b/src/hid_core/frontend/motion_input.cpp @@ -4,7 +4,7 @@ #include <cmath> #include "common/math_util.h" -#include "core/hid/motion_input.h" +#include "hid_core/frontend/motion_input.h" namespace Core::HID { diff --git a/src/core/hid/motion_input.h b/src/hid_core/frontend/motion_input.h index 11678983d..11678983d 100644 --- a/src/core/hid/motion_input.h +++ b/src/hid_core/frontend/motion_input.h diff --git a/src/core/hid/hid_core.cpp b/src/hid_core/hid_core.cpp index 2cf25a870..410c84afb 100644 --- a/src/core/hid/hid_core.cpp +++ b/src/hid_core/hid_core.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "core/hid/emulated_console.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/emulated_devices.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/hid_util.h" +#include "hid_core/frontend/emulated_console.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/frontend/emulated_devices.h" +#include "hid_core/hid_core.h" +#include "hid_core/hid_util.h" namespace Core::HID { diff --git a/src/core/hid/hid_core.h b/src/hid_core/hid_core.h index 80abab18b..dae29c506 100644 --- a/src/core/hid/hid_core.h +++ b/src/hid_core/hid_core.h @@ -6,7 +6,7 @@ #include <memory> #include "common/common_funcs.h" -#include "core/hid/hid_types.h" +#include "hid_core/hid_types.h" namespace Core::HID { class EmulatedConsole; diff --git a/src/core/hle/service/hid/errors.h b/src/hid_core/hid_result.h index bb14aa61e..bb14aa61e 100644 --- a/src/core/hle/service/hid/errors.h +++ b/src/hid_core/hid_result.h diff --git a/src/core/hid/hid_types.h b/src/hid_core/hid_types.h index a81ed6af0..a81ed6af0 100644 --- a/src/core/hid/hid_types.h +++ b/src/hid_core/hid_types.h diff --git a/src/core/hle/service/hid/hid_util.h b/src/hid_core/hid_util.h index 6a2ed287a..94ff2d23a 100644 --- a/src/core/hle/service/hid/hid_util.h +++ b/src/hid_core/hid_util.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hid/hid_types.h" -#include "core/hle/service/hid/errors.h" +#include "hid_core/hid_result.h" +#include "hid_core/hid_types.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.cpp b/src/hid_core/hidbus/hidbus_base.cpp index 8c44f93e8..632bb173b 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.cpp +++ b/src/hid_core/hidbus/hidbus_base.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#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/hidbus/hidbus_base.h" #include "core/hle/service/kernel_helpers.h" +#include "hid_core/hid_core.h" +#include "hid_core/hidbus/hidbus_base.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/hid_core/hidbus/hidbus_base.h index ec41684e1..ec41684e1 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.h +++ b/src/hid_core/hidbus/hidbus_base.h diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/hid_core/hidbus/ringcon.cpp index 378108012..cedf25c16 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.cpp +++ b/src/hid_core/hidbus/ringcon.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.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/hidbus/ringcon.h" #include "core/memory.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/hidbus/ringcon.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hidbus/ringcon.h b/src/hid_core/hidbus/ringcon.h index f42f3ea41..0953e8100 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.h +++ b/src/hid_core/hidbus/ringcon.h @@ -7,7 +7,7 @@ #include <span> #include "common/common_types.h" -#include "core/hle/service/hid/hidbus/hidbus_base.h" +#include "hid_core/hidbus/hidbus_base.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/hidbus/starlink.cpp b/src/hid_core/hidbus/starlink.cpp index 36573274e..31b263aa1 100644 --- a/src/core/hle/service/hid/hidbus/starlink.cpp +++ b/src/hid_core/hidbus/starlink.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/hidbus/starlink.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/hidbus/starlink.h" namespace Service::HID { constexpr u8 DEVICE_ID = 0x28; diff --git a/src/core/hle/service/hid/hidbus/starlink.h b/src/hid_core/hidbus/starlink.h index a276aa88f..ee37763b4 100644 --- a/src/core/hle/service/hid/hidbus/starlink.h +++ b/src/hid_core/hidbus/starlink.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/hid/hidbus/hidbus_base.h" +#include "hid_core/hidbus/hidbus_base.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/hidbus/stubbed.cpp b/src/hid_core/hidbus/stubbed.cpp index 8160b7218..f16051aa9 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.cpp +++ b/src/hid_core/hidbus/stubbed.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/hidbus/stubbed.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/hidbus/stubbed.h" namespace Service::HID { constexpr u8 DEVICE_ID = 0xFF; diff --git a/src/core/hle/service/hid/hidbus/stubbed.h b/src/hid_core/hidbus/stubbed.h index 2e58d42fc..7a711cea0 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.h +++ b/src/hid_core/hidbus/stubbed.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/hid/hidbus/hidbus_base.h" +#include "hid_core/hidbus/hidbus_base.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/irsensor/clustering_processor.cpp b/src/hid_core/irsensor/clustering_processor.cpp index c559eb0d5..3abe19365 100644 --- a/src/core/hle/service/hid/irsensor/clustering_processor.cpp +++ b/src/hid_core/irsensor/clustering_processor.cpp @@ -5,9 +5,9 @@ #include "core/core.h" #include "core/core_timing.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/irsensor/clustering_processor.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/irsensor/clustering_processor.h" namespace Service::IRS { ClusteringProcessor::ClusteringProcessor(Core::System& system_, diff --git a/src/core/hle/service/hid/irsensor/clustering_processor.h b/src/hid_core/irsensor/clustering_processor.h index 83f34734a..e3b60d9b0 100644 --- a/src/core/hle/service/hid/irsensor/clustering_processor.h +++ b/src/hid_core/irsensor/clustering_processor.h @@ -4,9 +4,9 @@ #pragma once #include "common/common_types.h" -#include "core/hid/irs_types.h" -#include "core/hle/service/hid/irs_ring_lifo.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "hid_core/irsensor/irs_types.h" +#include "hid_core/irsensor/processor_base.h" +#include "hid_core/resources/irs_ring_lifo.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp b/src/hid_core/irsensor/image_transfer_processor.cpp index 22067a591..d6573f8dc 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp +++ b/src/hid_core/irsensor/image_transfer_processor.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "core/core.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/irsensor/image_transfer_processor.h" #include "core/memory.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/irsensor/image_transfer_processor.h" namespace Service::IRS { ImageTransferProcessor::ImageTransferProcessor(Core::System& system_, diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.h b/src/hid_core/irsensor/image_transfer_processor.h index 7f42d8453..4e0117084 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.h +++ b/src/hid_core/irsensor/image_transfer_processor.h @@ -4,8 +4,8 @@ #pragma once #include "common/typed_address.h" -#include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "hid_core/irsensor/irs_types.h" +#include "hid_core/irsensor/processor_base.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/irsensor/ir_led_processor.cpp b/src/hid_core/irsensor/ir_led_processor.cpp index 8e6dd99e4..4b04e05b5 100644 --- a/src/core/hle/service/hid/irsensor/ir_led_processor.cpp +++ b/src/hid_core/irsensor/ir_led_processor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/ir_led_processor.h" +#include "hid_core/irsensor/ir_led_processor.h" namespace Service::IRS { IrLedProcessor::IrLedProcessor(Core::IrSensor::DeviceFormat& device_format) diff --git a/src/core/hle/service/hid/irsensor/ir_led_processor.h b/src/hid_core/irsensor/ir_led_processor.h index c3d8693c9..03d0c4245 100644 --- a/src/core/hle/service/hid/irsensor/ir_led_processor.h +++ b/src/hid_core/irsensor/ir_led_processor.h @@ -5,8 +5,8 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "hid_core/irsensor/irs_types.h" +#include "hid_core/irsensor/processor_base.h" namespace Service::IRS { class IrLedProcessor final : public ProcessorBase { diff --git a/src/core/hid/irs_types.h b/src/hid_core/irsensor/irs_types.h index 0d1bfe53f..017f38e6c 100644 --- a/src/core/hid/irs_types.h +++ b/src/hid_core/irsensor/irs_types.h @@ -5,7 +5,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hid/hid_types.h" +#include "hid_core/hid_types.h" namespace Core::IrSensor { diff --git a/src/core/hle/service/hid/irsensor/moment_processor.cpp b/src/hid_core/irsensor/moment_processor.cpp index cf045bda7..0284a58bd 100644 --- a/src/core/hle/service/hid/irsensor/moment_processor.cpp +++ b/src/hid_core/irsensor/moment_processor.cpp @@ -3,9 +3,9 @@ #include "core/core.h" #include "core/core_timing.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hle/service/hid/irsensor/moment_processor.h" +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" +#include "hid_core/irsensor/moment_processor.h" namespace Service::IRS { static constexpr auto format = Core::IrSensor::ImageTransferProcessorFormat::Size40x30; diff --git a/src/core/hle/service/hid/irsensor/moment_processor.h b/src/hid_core/irsensor/moment_processor.h index 398cfbdc1..78c9c035f 100644 --- a/src/core/hle/service/hid/irsensor/moment_processor.h +++ b/src/hid_core/irsensor/moment_processor.h @@ -5,9 +5,9 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hid/irs_types.h" -#include "core/hle/service/hid/irs_ring_lifo.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "hid_core/irsensor/irs_types.h" +#include "hid_core/irsensor/processor_base.h" +#include "hid_core/resources/irs_ring_lifo.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/irsensor/pointing_processor.cpp b/src/hid_core/irsensor/pointing_processor.cpp index 929f177fc..c1d6c1bb6 100644 --- a/src/core/hle/service/hid/irsensor/pointing_processor.cpp +++ b/src/hid_core/irsensor/pointing_processor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/pointing_processor.h" +#include "hid_core/irsensor/pointing_processor.h" namespace Service::IRS { PointingProcessor::PointingProcessor(Core::IrSensor::DeviceFormat& device_format) diff --git a/src/core/hle/service/hid/irsensor/pointing_processor.h b/src/hid_core/irsensor/pointing_processor.h index d63423aff..968c2e5bd 100644 --- a/src/core/hle/service/hid/irsensor/pointing_processor.h +++ b/src/hid_core/irsensor/pointing_processor.h @@ -4,8 +4,8 @@ #pragma once #include "common/common_types.h" -#include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "hid_core/irsensor/irs_types.h" +#include "hid_core/irsensor/processor_base.h" namespace Service::IRS { class PointingProcessor final : public ProcessorBase { diff --git a/src/core/hle/service/hid/irsensor/processor_base.cpp b/src/hid_core/irsensor/processor_base.cpp index 4d43ca17a..91a513a70 100644 --- a/src/core/hle/service/hid/irsensor/processor_base.cpp +++ b/src/hid_core/irsensor/processor_base.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "hid_core/irsensor/processor_base.h" namespace Service::IRS { diff --git a/src/core/hle/service/hid/irsensor/processor_base.h b/src/hid_core/irsensor/processor_base.h index bc0d2977b..48beeafba 100644 --- a/src/core/hle/service/hid/irsensor/processor_base.h +++ b/src/hid_core/irsensor/processor_base.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hid/irs_types.h" +#include "hid_core/irsensor/irs_types.h" namespace Service::IRS { class ProcessorBase { diff --git a/src/core/hle/service/hid/irsensor/tera_plugin_processor.cpp b/src/hid_core/irsensor/tera_plugin_processor.cpp index e691c840a..2382e208a 100644 --- a/src/core/hle/service/hid/irsensor/tera_plugin_processor.cpp +++ b/src/hid_core/irsensor/tera_plugin_processor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/tera_plugin_processor.h" +#include "hid_core/irsensor/tera_plugin_processor.h" namespace Service::IRS { TeraPluginProcessor::TeraPluginProcessor(Core::IrSensor::DeviceFormat& device_format) diff --git a/src/core/hle/service/hid/irsensor/tera_plugin_processor.h b/src/hid_core/irsensor/tera_plugin_processor.h index bbea7ed0b..dc8fe7d07 100644 --- a/src/core/hle/service/hid/irsensor/tera_plugin_processor.h +++ b/src/hid_core/irsensor/tera_plugin_processor.h @@ -5,8 +5,8 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "hid_core/irsensor/irs_types.h" +#include "hid_core/irsensor/processor_base.h" namespace Service::IRS { class TeraPluginProcessor final : public ProcessorBase { diff --git a/src/hid_core/precompiled_headers.h b/src/hid_core/precompiled_headers.h new file mode 100644 index 000000000..aabae730b --- /dev/null +++ b/src/hid_core/precompiled_headers.h @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "common/common_precompiled_headers.h" diff --git a/src/core/hle/service/hid/resource_manager.cpp b/src/hid_core/resource_manager.cpp index 1f41e645d..17dacef6e 100644 --- a/src/core/hle/service/hid/resource_manager.cpp +++ b/src/hid_core/resource_manager.cpp @@ -4,29 +4,29 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hid/hid_core.h" #include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/service/hid/resource_manager.h" #include "core/hle/service/ipc_helpers.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/console_six_axis.h" -#include "core/hle/service/hid/controllers/debug_mouse.h" -#include "core/hle/service/hid/controllers/debug_pad.h" -#include "core/hle/service/hid/controllers/digitizer.h" -#include "core/hle/service/hid/controllers/gesture.h" -#include "core/hle/service/hid/controllers/home_button.h" -#include "core/hle/service/hid/controllers/keyboard.h" -#include "core/hle/service/hid/controllers/mouse.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/controllers/palma.h" -#include "core/hle/service/hid/controllers/seven_six_axis.h" -#include "core/hle/service/hid/controllers/six_axis.h" -#include "core/hle/service/hid/controllers/sleep_button.h" -#include "core/hle/service/hid/controllers/touchscreen.h" -#include "core/hle/service/hid/controllers/types/shared_memory_format.h" -#include "core/hle/service/hid/controllers/unique_pad.h" +#include "hid_core/hid_core.h" +#include "hid_core/resource_manager.h" + +#include "hid_core/resources/applet_resource.h" +#include "hid_core/resources/debug_pad/debug_pad.h" +#include "hid_core/resources/digitizer/digitizer.h" +#include "hid_core/resources/keyboard/keyboard.h" +#include "hid_core/resources/mouse/debug_mouse.h" +#include "hid_core/resources/mouse/mouse.h" +#include "hid_core/resources/npad/npad.h" +#include "hid_core/resources/palma/palma.h" +#include "hid_core/resources/shared_memory_format.h" +#include "hid_core/resources/six_axis/console_six_axis.h" +#include "hid_core/resources/six_axis/seven_six_axis.h" +#include "hid_core/resources/six_axis/six_axis.h" +#include "hid_core/resources/system_buttons/capture_button.h" +#include "hid_core/resources/system_buttons/home_button.h" +#include "hid_core/resources/system_buttons/sleep_button.h" +#include "hid_core/resources/touch_screen/gesture.h" +#include "hid_core/resources/touch_screen/touch_screen.h" +#include "hid_core/resources/unique_pad/unique_pad.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/resource_manager.h b/src/hid_core/resource_manager.h index 7a21d8eb8..7a21d8eb8 100644 --- a/src/core/hle/service/hid/resource_manager.h +++ b/src/hid_core/resource_manager.h 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/hid_firmware_settings.cpp b/src/hid_core/resources/hid_firmware_settings.cpp index 59bd6825c..e76b3a016 100644 --- a/src/core/hle/service/hid/hid_firmware_settings.cpp +++ b/src/hid_core/resources/hid_firmware_settings.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/hid_firmware_settings.h" +#include "hid_core/resources/hid_firmware_settings.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hid_firmware_settings.h b/src/hid_core/resources/hid_firmware_settings.h index 6c10c440b..6c10c440b 100644 --- a/src/core/hle/service/hid/hid_firmware_settings.h +++ b/src/hid_core/resources/hid_firmware_settings.h diff --git a/src/core/hle/service/hid/irs_ring_lifo.h b/src/hid_core/resources/irs_ring_lifo.h index 255d1d296..255d1d296 100644 --- a/src/core/hle/service/hid/irs_ring_lifo.h +++ b/src/hid_core/resources/irs_ring_lifo.h 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/ring_lifo.h b/src/hid_core/resources/ring_lifo.h index 0816784e0..0816784e0 100644 --- a/src/core/hle/service/hid/ring_lifo.h +++ b/src/hid_core/resources/ring_lifo.h 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 { |