diff options
author | bunnei <bunneidev@gmail.com> | 2022-04-27 21:31:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-27 21:31:27 +0200 |
commit | 9ed0b5c5f9393e379a929131e2d8f7a21320b4f8 (patch) | |
tree | 157c7a8d8a5505e64b25fcd0e84dfb2c68c4295b /src/core/hle/service/hid/controllers/console_sixaxis.h | |
parent | Merge pull request #8262 from Morph1984/conan (diff) | |
parent | service: hid: Ensure all structs are initialized (diff) | |
download | yuzu-9ed0b5c5f9393e379a929131e2d8f7a21320b4f8.tar yuzu-9ed0b5c5f9393e379a929131e2d8f7a21320b4f8.tar.gz yuzu-9ed0b5c5f9393e379a929131e2d8f7a21320b4f8.tar.bz2 yuzu-9ed0b5c5f9393e379a929131e2d8f7a21320b4f8.tar.lz yuzu-9ed0b5c5f9393e379a929131e2d8f7a21320b4f8.tar.xz yuzu-9ed0b5c5f9393e379a929131e2d8f7a21320b4f8.tar.zst yuzu-9ed0b5c5f9393e379a929131e2d8f7a21320b4f8.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers/console_sixaxis.h')
-rw-r--r-- | src/core/hle/service/hid/controllers/console_sixaxis.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.h b/src/core/hle/service/hid/controllers/console_sixaxis.h index 6da5e9454..2fd11538f 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.h +++ b/src/core/hle/service/hid/controllers/console_sixaxis.h @@ -17,7 +17,7 @@ class EmulatedConsole; namespace Service::HID { class Controller_ConsoleSixAxis final : public ControllerBase { public: - explicit Controller_ConsoleSixAxis(Core::HID::HIDCore& hid_core_); + explicit Controller_ConsoleSixAxis(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_); ~Controller_ConsoleSixAxis() override; // Called when the controller is initialized @@ -27,7 +27,7 @@ public: void OnRelease() override; // When the controller is requesting an update for the shared memory - void OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data, size_t size) override; + void OnUpdate(const Core::Timing::CoreTiming& core_timing) override; // Called on InitializeSevenSixAxisSensor void SetTransferMemoryPointer(u8* t_mem); @@ -61,12 +61,13 @@ private: Lifo<SevenSixAxisState, 0x21> seven_sixaxis_lifo{}; static_assert(sizeof(seven_sixaxis_lifo) == 0xA70, "SevenSixAxisState is an invalid size"); - Core::HID::EmulatedConsole* console; + SevenSixAxisState next_seven_sixaxis_state{}; u8* transfer_memory = nullptr; + ConsoleSharedMemory* shared_memory = nullptr; + Core::HID::EmulatedConsole* console = nullptr; + bool is_transfer_memory_set = false; u64 last_saved_timestamp{}; u64 last_global_timestamp{}; - ConsoleSharedMemory console_six_axis{}; - SevenSixAxisState next_seven_sixaxis_state{}; }; } // namespace Service::HID |