summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar german772024-01-07 09:05:12 -0600
committerGravatar Narr the Reg2024-01-11 19:35:04 -0600
commitb5dac5f525e8d5884506ebd98a530e237b518480 (patch)
tree6ceee925ba897dc3450bdad209982f0be4bc3f7a /src/core
parentMerge pull request #12653 from liamwhite/once-more (diff)
downloadyuzu-b5dac5f525e8d5884506ebd98a530e237b518480.tar.gz
yuzu-b5dac5f525e8d5884506ebd98a530e237b518480.tar.xz
yuzu-b5dac5f525e8d5884506ebd98a530e237b518480.zip
service: hid: Create abstracted pad structure
Diffstat (limited to 'src/core')
-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
47 // Connect controllers based on the following priority list from highest to lowest priority: 47 // Connect controllers based on the following priority list from highest to lowest priority:
48 // Pro Controller -> Dual Joycons -> Left Joycon/Right Joycon -> Handheld 48 // Pro Controller -> Dual Joycons -> Left Joycon/Right Joycon -> Handheld
49 if (parameters.allow_pro_controller) { 49 if (parameters.allow_pro_controller) {
50 controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController); 50 controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Fullkey);
51 controller->Connect(true); 51 controller->Connect(true);
52 } else if (parameters.allow_dual_joycons) { 52 } else if (parameters.allow_dual_joycons) {
53 controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::JoyconDual); 53 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) {
1498 bool check_device_index = false; 1498 bool check_device_index = false;
1499 1499
1500 switch (vibration_device_handle.npad_type) { 1500 switch (vibration_device_handle.npad_type) {
1501 case Core::HID::NpadStyleIndex::ProController: 1501 case Core::HID::NpadStyleIndex::Fullkey:
1502 case Core::HID::NpadStyleIndex::Handheld: 1502 case Core::HID::NpadStyleIndex::Handheld:
1503 case Core::HID::NpadStyleIndex::JoyconDual: 1503 case Core::HID::NpadStyleIndex::JoyconDual:
1504 case Core::HID::NpadStyleIndex::JoyconLeft: 1504 case Core::HID::NpadStyleIndex::JoyconLeft: