diff options
Diffstat (limited to '')
-rw-r--r-- | src/hid_core/hid_util.h (renamed from src/core/hle/service/hid/hid_util.h) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/hid/hid_util.h b/src/hid_core/hid_util.h index b87cc10e3..94ff2d23a 100644 --- a/src/core/hle/service/hid/hid_util.h +++ b/src/hid_core/hid_util.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hid/hid_types.h" -#include "core/hle/service/hid/errors.h" +#include "hid_core/hid_result.h" +#include "hid_core/hid_types.h" namespace Service::HID { @@ -31,7 +31,7 @@ constexpr Result IsSixaxisHandleValid(const Core::HID::SixAxisSensorHandle& hand const bool device_index = handle.device_index < Core::HID::DeviceIndex::MaxDeviceIndex; if (!npad_id) { - return InvalidNpadId; + return ResultInvalidNpadId; } if (!device_index) { return NpadDeviceIndexOutOfRange; @@ -54,15 +54,15 @@ constexpr Result IsVibrationHandleValid(const Core::HID::VibrationDeviceHandle& // These support vibration break; default: - return VibrationInvalidStyleIndex; + return ResultVibrationInvalidStyleIndex; } if (!IsNpadIdValid(static_cast<Core::HID::NpadIdType>(handle.npad_id))) { - return VibrationInvalidNpadId; + return ResultVibrationInvalidNpadId; } if (handle.device_index >= Core::HID::DeviceIndex::MaxDeviceIndex) { - return VibrationDeviceIndexOutOfRange; + return ResultVibrationDeviceIndexOutOfRange; } return ResultSuccess; |