diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-04-03 13:06:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 13:06:07 -0400 |
| commit | bbdfe1fab1f1706b7e6a62d93951bb451bbeec43 (patch) | |
| tree | 4e6409df2c104c48b14daa8ad182dba07d2110f4 /src/core/hle | |
| parent | ff386e794bfb5d4838296f4d8e276fb290c5a5af (diff) | |
| parent | d2ae39bf4ba59730c9c6e28f821b35297ec26566 (diff) | |
Merge pull request #10024 from german77/crysis
service: hid: Fix handle validation
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 6 |
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) { |