diff options
| author | Ameer <aj662@drexel.edu> | 2020-07-07 03:58:31 +0200 |
|---|---|---|
| committer | Ameer <aj662@drexel.edu> | 2020-07-07 03:58:31 +0200 |
| commit | 7ad423923dddb5e037d54e70cb066b03f8346dec (patch) | |
| tree | 5907a594637850d69e46fd26ae44da39264231d5 /src/input_common/gcadapter/gc_adapter.h | |
| parent | Merge pull request #4194 from ReinUsesLisp/fix-shader-cache (diff) | |
| download | yuzu-7ad423923dddb5e037d54e70cb066b03f8346dec.tar yuzu-7ad423923dddb5e037d54e70cb066b03f8346dec.tar.gz yuzu-7ad423923dddb5e037d54e70cb066b03f8346dec.tar.bz2 yuzu-7ad423923dddb5e037d54e70cb066b03f8346dec.tar.lz yuzu-7ad423923dddb5e037d54e70cb066b03f8346dec.tar.xz yuzu-7ad423923dddb5e037d54e70cb066b03f8346dec.tar.zst yuzu-7ad423923dddb5e037d54e70cb066b03f8346dec.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h index 0ea6263eb..8b08d667d 100644 --- a/src/input_common/gcadapter/gc_adapter.h +++ b/src/input_common/gcadapter/gc_adapter.h @@ -13,12 +13,6 @@ namespace GCAdapter { -enum { - PAD_USE_ORIGIN = 0x0080, - PAD_GET_ORIGIN = 0x2000, - PAD_ERR_STATUS = 0x8000, -}; - enum class PadButton { PAD_BUTTON_LEFT = 0x0001, PAD_BUTTON_RIGHT = 0x0002, @@ -102,6 +96,9 @@ public: std::array<GCState, 4>& GetPadState(); const std::array<GCState, 4>& GetPadState() const; + int GetOriginValue(int port, int axis); + const int GetOriginValue(int port, int axis) const; + private: GCPadStatus GetPadStatus(int port, const std::array<u8, 37>& adapter_payload); @@ -155,6 +152,8 @@ private: std::array<Common::SPSCQueue<GCPadStatus>, 4> pad_queue; std::array<GCState, 4> state; + std::array<bool, 4> get_origin; + std::array<GCPadStatus, 4> origin_status; }; } // namespace GCAdapter |