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/resources/six_axis | |
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/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 |
6 files changed, 21 insertions, 21 deletions
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; |