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/keyboard.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/keyboard.h')
-rw-r--r-- | src/core/hle/service/hid/controllers/keyboard.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/core/hle/service/hid/controllers/keyboard.h b/src/core/hle/service/hid/controllers/keyboard.h index 39c6085f1..7532f53c6 100644 --- a/src/core/hle/service/hid/controllers/keyboard.h +++ b/src/core/hle/service/hid/controllers/keyboard.h @@ -16,7 +16,7 @@ struct KeyboardKey; namespace Service::HID { class Controller_Keyboard final : public ControllerBase { public: - explicit Controller_Keyboard(Core::HID::HIDCore& hid_core_); + explicit Controller_Keyboard(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_); ~Controller_Keyboard() override; // Called when the controller is initialized @@ -26,23 +26,28 @@ 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, std::size_t size) override; + void OnUpdate(const Core::Timing::CoreTiming& core_timing) override; private: // This is nn::hid::detail::KeyboardState struct KeyboardState { - s64 sampling_number; - Core::HID::KeyboardModifier modifier; - Core::HID::KeyboardAttribute attribute; - Core::HID::KeyboardKey key; + s64 sampling_number{}; + Core::HID::KeyboardModifier modifier{}; + Core::HID::KeyboardAttribute attribute{}; + Core::HID::KeyboardKey key{}; }; static_assert(sizeof(KeyboardState) == 0x30, "KeyboardState is an invalid size"); - // This is nn::hid::detail::KeyboardLifo - Lifo<KeyboardState, hid_entry_count> keyboard_lifo{}; - static_assert(sizeof(keyboard_lifo) == 0x3D8, "keyboard_lifo is an invalid size"); - KeyboardState next_state{}; + struct KeyboardSharedMemory { + // This is nn::hid::detail::KeyboardLifo + Lifo<KeyboardState, hid_entry_count> keyboard_lifo{}; + static_assert(sizeof(keyboard_lifo) == 0x3D8, "keyboard_lifo is an invalid size"); + INSERT_PADDING_WORDS(0xA); + }; + static_assert(sizeof(KeyboardSharedMemory) == 0x400, "KeyboardSharedMemory is an invalid size"); - Core::HID::EmulatedDevices* emulated_devices; + KeyboardState next_state{}; + KeyboardSharedMemory* shared_memory = nullptr; + Core::HID::EmulatedDevices* emulated_devices = nullptr; }; } // namespace Service::HID |