summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2024-01-12 16:02:13 +0100
committerGitHub <noreply@github.com>2024-01-12 16:02:13 +0100
commitf7a3c135e2f17cc00d1f006146afc73a21408e3a (patch)
treef5439b576b7ba8e2d6835b49d45a558c66121ae7 /src/core
parentMerge pull request #12642 from t895/adapter-refactor (diff)
parentservice: hid: Create abstracted pad structure (diff)
downloadyuzu-f7a3c135e2f17cc00d1f006146afc73a21408e3a.tar
yuzu-f7a3c135e2f17cc00d1f006146afc73a21408e3a.tar.gz
yuzu-f7a3c135e2f17cc00d1f006146afc73a21408e3a.tar.bz2
yuzu-f7a3c135e2f17cc00d1f006146afc73a21408e3a.tar.lz
yuzu-f7a3c135e2f17cc00d1f006146afc73a21408e3a.tar.xz
yuzu-f7a3c135e2f17cc00d1f006146afc73a21408e3a.tar.zst
yuzu-f7a3c135e2f17cc00d1f006146afc73a21408e3a.zip
Diffstat (limited to '')
-rw-r--r--src/core/frontend/applets/controller.cpp2
-rw-r--r--src/core/hle/service/hid/hid_server.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp
index 34fe23b6a..e04d884ba 100644
--- a/src/core/frontend/applets/controller.cpp
+++ b/src/core/frontend/applets/controller.cpp
@@ -47,7 +47,7 @@ void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callbac
// Connect controllers based on the following priority list from highest to lowest priority:
// Pro Controller -> Dual Joycons -> Left Joycon/Right Joycon -> Handheld
if (parameters.allow_pro_controller) {
- controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController);
+ controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Fullkey);
controller->Connect(true);
} else if (parameters.allow_dual_joycons) {
controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::JoyconDual);
diff --git a/src/core/hle/service/hid/hid_server.cpp b/src/core/hle/service/hid/hid_server.cpp
index 74898888a..1951da33b 100644
--- a/src/core/hle/service/hid/hid_server.cpp
+++ b/src/core/hle/service/hid/hid_server.cpp
@@ -1498,7 +1498,7 @@ void IHidServer::GetVibrationDeviceInfo(HLERequestContext& ctx) {
bool check_device_index = false;
switch (vibration_device_handle.npad_type) {
- case Core::HID::NpadStyleIndex::ProController:
+ case Core::HID::NpadStyleIndex::Fullkey:
case Core::HID::NpadStyleIndex::Handheld:
case Core::HID::NpadStyleIndex::JoyconDual:
case Core::HID::NpadStyleIndex::JoyconLeft: