summaryrefslogtreecommitdiff
path: root/src/input_common/drivers/joycon.h
diff options
context:
space:
mode:
authorGravatar liamwhite2023-06-29 10:01:19 -0400
committerGravatar GitHub2023-06-29 10:01:19 -0400
commit4c705db73edfa3c7210eb5821b3f4e5324d642d1 (patch)
tree470116d2d52b3a74ad0cd761304f0f65386af708 /src/input_common/drivers/joycon.h
parentMerge pull request #10946 from goldenx86/amdBlending (diff)
parentinput_common: Allow timeouts to happen while scanning for a ring (diff)
downloadyuzu-4c705db73edfa3c7210eb5821b3f4e5324d642d1.tar.gz
yuzu-4c705db73edfa3c7210eb5821b3f4e5324d642d1.tar.xz
yuzu-4c705db73edfa3c7210eb5821b3f4e5324d642d1.zip
Merge pull request #10937 from german77/ring
input_common: Remove duplicated enum and fix ring detection
Diffstat (limited to 'src/input_common/drivers/joycon.h')
-rw-r--r--src/input_common/drivers/joycon.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h
index 4c323d7d6..112e970e1 100644
--- a/src/input_common/drivers/joycon.h
+++ b/src/input_common/drivers/joycon.h
@@ -17,7 +17,6 @@ struct Color;
17struct MotionData; 17struct MotionData;
18struct TagInfo; 18struct TagInfo;
19enum class ControllerType : u8; 19enum class ControllerType : u8;
20enum class DriverResult;
21enum class IrsResolution; 20enum class IrsResolution;
22class JoyconDriver; 21class JoyconDriver;
23} // namespace InputCommon::Joycon 22} // namespace InputCommon::Joycon
@@ -112,7 +111,7 @@ private:
112 /// Returns the name of the device in text format 111 /// Returns the name of the device in text format
113 std::string JoyconName(Joycon::ControllerType type) const; 112 std::string JoyconName(Joycon::ControllerType type) const;
114 113
115 Common::Input::NfcState TranslateDriverResult(Joycon::DriverResult result) const; 114 Common::Input::NfcState TranslateDriverResult(Common::Input::DriverResult result) const;
116 115
117 std::jthread scan_thread; 116 std::jthread scan_thread;
118 117