diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-11-02 03:03:17 +0100 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-19 05:22:36 +0100 |
| commit | 55ded706d67a6f2dd6e01d0abf7351e69588ac3a (patch) | |
| tree | ab495e8522cfcfa00ef54b46a43f12583b03466a /src/core/hle/service/hid/controllers/npad.h | |
| parent | hid/touchscreen: Update Touchscreen to use advanced parameters (diff) | |
| download | yuzu-55ded706d67a6f2dd6e01d0abf7351e69588ac3a.tar yuzu-55ded706d67a6f2dd6e01d0abf7351e69588ac3a.tar.gz yuzu-55ded706d67a6f2dd6e01d0abf7351e69588ac3a.tar.bz2 yuzu-55ded706d67a6f2dd6e01d0abf7351e69588ac3a.tar.lz yuzu-55ded706d67a6f2dd6e01d0abf7351e69588ac3a.tar.xz yuzu-55ded706d67a6f2dd6e01d0abf7351e69588ac3a.tar.zst yuzu-55ded706d67a6f2dd6e01d0abf7351e69588ac3a.zip | |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 7222bca72..52f92a4f1 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -285,9 +285,14 @@ private: NPadType style{}; std::array<NPadEntry, 10> shared_memory_entries{}; - std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeButton::NUM_BUTTONS_HID> + std::array< + std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeButton::NUM_BUTTONS_HID>, + 10> buttons; - std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID> sticks; + std::array< + std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID>, + 10> + sticks; std::vector<u32> supported_npad_id_types{}; NpadHoldType hold_type{NpadHoldType::Vertical}; Kernel::SharedPtr<Kernel::Event> styleset_changed_event; |