diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2023-12-31 07:42:23 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-12-31 17:51:01 +0100 |
commit | 865abfc37c5b3e8945d833bd44db428ad720bd58 (patch) | |
tree | af37ccf552aad0403898fb371e639393efe7b9d4 /src/core/hle/service/hid/controllers/console_six_axis.cpp | |
parent | Merge pull request #12509 from liamwhite/ktrace (diff) | |
download | yuzu-865abfc37c5b3e8945d833bd44db428ad720bd58.tar yuzu-865abfc37c5b3e8945d833bd44db428ad720bd58.tar.gz yuzu-865abfc37c5b3e8945d833bd44db428ad720bd58.tar.bz2 yuzu-865abfc37c5b3e8945d833bd44db428ad720bd58.tar.lz yuzu-865abfc37c5b3e8945d833bd44db428ad720bd58.tar.xz yuzu-865abfc37c5b3e8945d833bd44db428ad720bd58.tar.zst yuzu-865abfc37c5b3e8945d833bd44db428ad720bd58.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/hid/controllers/console_six_axis.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/controllers/console_six_axis.cpp b/src/core/hle/service/hid/controllers/console_six_axis.cpp index 3961d2b5f..8eba2c292 100644 --- a/src/core/hle/service/hid/controllers/console_six_axis.cpp +++ b/src/core/hle/service/hid/controllers/console_six_axis.cpp @@ -5,13 +5,11 @@ #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/shared_memory_format.h" +#include "core/hle/service/hid/controllers/types/shared_memory_format.h" namespace Service::HID { -ConsoleSixAxis::ConsoleSixAxis(Core::HID::HIDCore& hid_core_, - ConsoleSixAxisSensorSharedMemoryFormat& console_shared_memory) - : ControllerBase{hid_core_}, shared_memory{console_shared_memory} { +ConsoleSixAxis::ConsoleSixAxis(Core::HID::HIDCore& hid_core_) : ControllerBase{hid_core_} { console = hid_core.GetEmulatedConsole(); } @@ -22,6 +20,15 @@ void ConsoleSixAxis::OnInit() {} void ConsoleSixAxis::OnRelease() {} void ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) { + const u64 aruid = applet_resource->GetActiveAruid(); + auto* data = applet_resource->GetAruidData(aruid); + + if (data == nullptr) { + return; + } + + ConsoleSixAxisSensorSharedMemoryFormat& shared_memory = data->shared_memory_format->console; + if (!IsControllerActivated()) { return; } |