summaryrefslogtreecommitdiff
path: root/src/input_common/gcadapter/gc_adapter.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/input_common/gcadapter/gc_adapter.h')
-rw-r--r--src/input_common/gcadapter/gc_adapter.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h
index 75bf9fe74..4f5f3de8e 100644
--- a/src/input_common/gcadapter/gc_adapter.h
+++ b/src/input_common/gcadapter/gc_adapter.h
@@ -60,7 +60,7 @@ struct GCPadStatus {
60 60
61struct GCState { 61struct GCState {
62 std::unordered_map<int, bool> buttons; 62 std::unordered_map<int, bool> buttons;
63 std::unordered_map<int, u16> axes; 63 std::unordered_map<u32, u16> axes;
64}; 64};
65 65
66enum class ControllerTypes { None, Wired, Wireless }; 66enum class ControllerTypes { None, Wired, Wireless };
@@ -89,13 +89,11 @@ public:
89 std::array<GCState, 4>& GetPadState(); 89 std::array<GCState, 4>& GetPadState();
90 const std::array<GCState, 4>& GetPadState() const; 90 const std::array<GCState, 4>& GetPadState() const;
91 91
92 int GetOriginValue(int port, int axis) const; 92 int GetOriginValue(u32 port, u32 axis) const;
93 93
94private: 94private:
95 GCPadStatus GetPadStatus(std::size_t port, const std::array<u8, 37>& adapter_payload); 95 GCPadStatus GetPadStatus(std::size_t port, const std::array<u8, 37>& adapter_payload);
96 96
97 void PadToState(const GCPadStatus& pad, GCState& state);
98
99 void Read(); 97 void Read();
100 98
101 /// Resets status of device connected to port 99 /// Resets status of device connected to port