summaryrefslogtreecommitdiffstats
path: root/src/input_common/drivers
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2023-01-28 03:35:51 +0100
committergerman77 <juangerman-13@hotmail.com>2023-01-30 02:11:46 +0100
commit11fea5deea6dd72badbed521ac5639a48d591dc6 (patch)
tree22edff6c56eb1861020481cac86aacbf599162e2 /src/input_common/drivers
parentMerge pull request #9706 from Morph1984/github-tagged-merge (diff)
downloadyuzu-11fea5deea6dd72badbed521ac5639a48d591dc6.tar
yuzu-11fea5deea6dd72badbed521ac5639a48d591dc6.tar.gz
yuzu-11fea5deea6dd72badbed521ac5639a48d591dc6.tar.bz2
yuzu-11fea5deea6dd72badbed521ac5639a48d591dc6.tar.lz
yuzu-11fea5deea6dd72badbed521ac5639a48d591dc6.tar.xz
yuzu-11fea5deea6dd72badbed521ac5639a48d591dc6.tar.zst
yuzu-11fea5deea6dd72badbed521ac5639a48d591dc6.zip
Diffstat (limited to 'src/input_common/drivers')
-rw-r--r--src/input_common/drivers/joycon.cpp4
-rw-r--r--src/input_common/drivers/joycon.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp
index cedc94e63..4fcfb4510 100644
--- a/src/input_common/drivers/joycon.cpp
+++ b/src/input_common/drivers/joycon.cpp
@@ -668,12 +668,10 @@ std::string Joycons::JoyconName(Joycon::ControllerType type) const {
return "Right Joycon";
case Joycon::ControllerType::Pro:
return "Pro Controller";
- case Joycon::ControllerType::Grip:
- return "Grip Controller";
case Joycon::ControllerType::Dual:
return "Dual Joycon";
default:
- return "Unknown Joycon";
+ return "Unknown Switch Controller";
}
}
} // namespace InputCommon
diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h
index 316d383d8..2149ab7fd 100644
--- a/src/input_common/drivers/joycon.h
+++ b/src/input_common/drivers/joycon.h
@@ -15,7 +15,7 @@ using SerialNumber = std::array<u8, 15>;
struct Battery;
struct Color;
struct MotionData;
-enum class ControllerType;
+enum class ControllerType : u8;
enum class DriverResult;
enum class IrsResolution;
class JoyconDriver;