diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2022-06-29 02:35:51 +0200 |
|---|---|---|
| committer | german77 <juangerman-13@hotmail.com> | 2022-07-24 02:40:25 +0200 |
| commit | 403bdc4dafe89a463f3d93b9a389a1010ca5ff16 (patch) | |
| tree | 88df3fada076b04c2ab2da8972d1d785f492b520 /src/core | |
| parent | service: irs: Move to IRS namespace and minor fixes (diff) | |
| download | yuzu-403bdc4dafe89a463f3d93b9a389a1010ca5ff16.tar yuzu-403bdc4dafe89a463f3d93b9a389a1010ca5ff16.tar.gz yuzu-403bdc4dafe89a463f3d93b9a389a1010ca5ff16.tar.bz2 yuzu-403bdc4dafe89a463f3d93b9a389a1010ca5ff16.tar.lz yuzu-403bdc4dafe89a463f3d93b9a389a1010ca5ff16.tar.xz yuzu-403bdc4dafe89a463f3d93b9a389a1010ca5ff16.tar.zst yuzu-403bdc4dafe89a463f3d93b9a389a1010ca5ff16.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/errors.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/hid/irs.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/irs.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/errors.h b/src/core/hle/service/hid/errors.h index accc2b646..4613a4e60 100644 --- a/src/core/hle/service/hid/errors.h +++ b/src/core/hle/service/hid/errors.h @@ -22,7 +22,7 @@ constexpr Result NpadNotConnected{ErrorModule::HID, 710}; namespace Service::IRS { -constexpr ResultCode InvalidProcessorState{ErrorModule::Irsensor, 78}; -constexpr ResultCode InvalidIrCameraHandle{ErrorModule::Irsensor, 204}; +constexpr Result InvalidProcessorState{ErrorModule::Irsensor, 78}; +constexpr Result InvalidIrCameraHandle{ErrorModule::Irsensor, 204}; } // namespace Service::IRS diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index b6e7c0792..d5107e41f 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp @@ -529,7 +529,7 @@ void IRS::ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -ResultCode IRS::IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const { +Result IRS::IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const { if (camera_handle.npad_id > static_cast<u8>(NpadIdTypeToIndex(Core::HID::NpadIdType::Handheld))) { return InvalidIrCameraHandle; diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h index 516620b4d..2e6115c73 100644 --- a/src/core/hle/service/hid/irs.h +++ b/src/core/hle/service/hid/irs.h @@ -57,7 +57,7 @@ private: void StopImageProcessorAsync(Kernel::HLERequestContext& ctx); void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx); - ResultCode IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const; + Result IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const; Core::IrSensor::DeviceFormat& GetIrCameraSharedMemoryDeviceEntry( const Core::IrSensor::IrCameraHandle& camera_handle); |