summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2023-04-02 10:21:54 +0200
committergerman77 <juangerman-13@hotmail.com>2023-04-02 10:21:54 +0200
commitd2ae39bf4ba59730c9c6e28f821b35297ec26566 (patch)
treec5598510d80b0503e2f7755143d595c702a0bb82
parentMerge pull request #10020 from merryhime/update-dynarmic (diff)
downloadyuzu-d2ae39bf4ba59730c9c6e28f821b35297ec26566.tar
yuzu-d2ae39bf4ba59730c9c6e28f821b35297ec26566.tar.gz
yuzu-d2ae39bf4ba59730c9c6e28f821b35297ec26566.tar.bz2
yuzu-d2ae39bf4ba59730c9c6e28f821b35297ec26566.tar.lz
yuzu-d2ae39bf4ba59730c9c6e28f821b35297ec26566.tar.xz
yuzu-d2ae39bf4ba59730c9c6e28f821b35297ec26566.tar.zst
yuzu-d2ae39bf4ba59730c9c6e28f821b35297ec26566.zip
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index b070327ec..8abf71608 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -70,7 +70,6 @@ Result Controller_NPad::VerifyValidSixAxisSensorHandle(
const Core::HID::SixAxisSensorHandle& device_handle) {
const auto npad_id = IsNpadIdValid(static_cast<Core::HID::NpadIdType>(device_handle.npad_id));
const bool device_index = device_handle.device_index < Core::HID::DeviceIndex::MaxDeviceIndex;
- const bool npad_type = device_handle.npad_type < Core::HID::NpadStyleIndex::MaxNpadType;
if (!npad_id) {
return InvalidNpadId;
@@ -78,10 +77,6 @@ Result Controller_NPad::VerifyValidSixAxisSensorHandle(
if (!device_index) {
return NpadDeviceIndexOutOfRange;
}
- // This doesn't get validated on nnsdk
- if (!npad_type) {
- return NpadInvalidHandle;
- }
return ResultSuccess;
}
@@ -1131,6 +1126,7 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) {
WriteEmptyEntry(shared_memory);
return ResultSuccess;
}
+
Result Controller_NPad::SetGyroscopeZeroDriftMode(
const Core::HID::SixAxisSensorHandle& sixaxis_handle,
Core::HID::GyroscopeZeroDriftMode drift_mode) {