diff options
| author | David Marcec <dmarcecguzman@gmail.com> | 2018-10-18 06:09:55 +0200 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-19 05:21:33 +0100 |
| commit | b9c1e4b0e75f13cde0508bc3d0bd252add03ae85 (patch) | |
| tree | 8fccfbd4de30cd33d9b1de5399204ae651c85720 /src/core/hle/service/hid/controllers/npad.h | |
| parent | Added multi-input support and controller assignment at any port (diff) | |
| download | yuzu-b9c1e4b0e75f13cde0508bc3d0bd252add03ae85.tar yuzu-b9c1e4b0e75f13cde0508bc3d0bd252add03ae85.tar.gz yuzu-b9c1e4b0e75f13cde0508bc3d0bd252add03ae85.tar.bz2 yuzu-b9c1e4b0e75f13cde0508bc3d0bd252add03ae85.tar.lz yuzu-b9c1e4b0e75f13cde0508bc3d0bd252add03ae85.tar.xz yuzu-b9c1e4b0e75f13cde0508bc3d0bd252add03ae85.tar.zst yuzu-b9c1e4b0e75f13cde0508bc3d0bd252add03ae85.zip | |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 1192cfcd9..ea12646f8 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -272,7 +272,7 @@ private: static_assert(sizeof(NPadEntry) == 0x5000, "NPadEntry is an invalid size"); struct ControllerHolder { - Controller_NPad::NPadControllerType type; + NPadControllerType type; bool is_connected; }; @@ -295,5 +295,7 @@ private: std::size_t NPadIdToIndex(u32 npad_id); u32 IndexToNPad(std::size_t index); std::array<ControllerPad, 10> npad_pad_states{}; + NPadControllerType DecideBestController(NPadControllerType priority); + bool IsControllerSupported(NPadControllerType controller); }; } // namespace Service::HID |