summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Charles Lombardo2024-02-18 13:30:54 -0500
committerGravatar GitHub2024-02-18 13:30:54 -0500
commit5361027ef09ef6e6a1bed320f174d01b8f9c154b (patch)
tree6a24e0722632eebe34937bfd82cf78ebdbb8dd20 /src
parentMerge pull request #13067 from t895/xbox-automap-invert (diff)
parentcore: hid: Remove driver errors from log (diff)
downloadyuzu-5361027ef09ef6e6a1bed320f174d01b8f9c154b.tar.gz
yuzu-5361027ef09ef6e6a1bed320f174d01b8f9c154b.tar.xz
yuzu-5361027ef09ef6e6a1bed320f174d01b8f9c154b.zip
Merge pull request #13068 from german77/no_errors
core: hid: Remove driver errors from log
Diffstat (limited to 'src')
-rw-r--r--src/hid_core/frontend/emulated_controller.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index 3fa06d188..d9d278fa3 100644
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -174,9 +174,13 @@ void EmulatedController::LoadDevices() {
174 // Only map virtual devices to the first controller 174 // Only map virtual devices to the first controller
175 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) { 175 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
176 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"}; 176 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
177 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
178 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"}; 177 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
178#ifdef HAVE_LIBUSB
179 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
180#endif
181#ifdef ANDROID
179 android_params = Common::ParamPackage{"engine:android,port:100"}; 182 android_params = Common::ParamPackage{"engine:android,port:100"};
183#endif
180 } 184 }
181 185
182 output_params[LeftIndex] = left_joycon; 186 output_params[LeftIndex] = left_joycon;