From e19b42de58ad40a702282548cfaee2000d52c736 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Thu, 25 Dec 2025 23:11:42 -0300 Subject: [PATCH] [hle] Update to prevent Shadow-ing a global declaration Signed-off-by: Caio Oliveira --- src/core/hle/result.h | 6 +++--- src/core/hle/service/psc/time/errors.h | 29 ++++++++++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 3322839e6a..1418c1b1de 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -12,7 +12,7 @@ #include "common/common_types.h" #include "common/expected.h" -// All the constants in this file come from +// All the constants in this file come from /** * Identifies the module which caused the error. Error codes can be propagated through a call @@ -43,7 +43,7 @@ enum class ErrorModule : u32 { NCMContent = 20, SM = 21, RO = 22, - GC = 23, + Gc = 23, SDMMC = 24, OVLN = 25, SPL = 26, @@ -72,7 +72,7 @@ enum class ErrorModule : u32 { Bluetooth = 113, VI = 114, NFP = 115, - Time = 116, + TimeService = 116, FGM = 117, OE = 118, BH1730FVC = 119, diff --git a/src/core/hle/service/psc/time/errors.h b/src/core/hle/service/psc/time/errors.h index 6d833a0060..a295cc057e 100644 --- a/src/core/hle/service/psc/time/errors.h +++ b/src/core/hle/service/psc/time/errors.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -7,18 +10,18 @@ namespace Service::PSC::Time { -constexpr Result ResultPermissionDenied{ErrorModule::Time, 1}; -constexpr Result ResultClockMismatch{ErrorModule::Time, 102}; -constexpr Result ResultClockUninitialized{ErrorModule::Time, 103}; -constexpr Result ResultTimeNotFound{ErrorModule::Time, 200}; -constexpr Result ResultOverflow{ErrorModule::Time, 201}; -constexpr Result ResultFailed{ErrorModule::Time, 801}; -constexpr Result ResultInvalidArgument{ErrorModule::Time, 901}; -constexpr Result ResultTimeZoneOutOfRange{ErrorModule::Time, 902}; -constexpr Result ResultTimeZoneParseFailed{ErrorModule::Time, 903}; -constexpr Result ResultRtcTimeout{ErrorModule::Time, 988}; -constexpr Result ResultTimeZoneNotFound{ErrorModule::Time, 989}; -constexpr Result ResultNotImplemented{ErrorModule::Time, 990}; -constexpr Result ResultAlarmNotRegistered{ErrorModule::Time, 1502}; +constexpr Result ResultPermissionDenied{ErrorModule::TimeService, 1}; +constexpr Result ResultClockMismatch{ErrorModule::TimeService, 102}; +constexpr Result ResultClockUninitialized{ErrorModule::TimeService, 103}; +constexpr Result ResultTimeNotFound{ErrorModule::TimeService, 200}; +constexpr Result ResultOverflow{ErrorModule::TimeService, 201}; +constexpr Result ResultFailed{ErrorModule::TimeService, 801}; +constexpr Result ResultInvalidArgument{ErrorModule::TimeService, 901}; +constexpr Result ResultTimeZoneOutOfRange{ErrorModule::TimeService, 902}; +constexpr Result ResultTimeZoneParseFailed{ErrorModule::TimeService, 903}; +constexpr Result ResultRtcTimeout{ErrorModule::TimeService, 988}; +constexpr Result ResultTimeZoneNotFound{ErrorModule::TimeService, 989}; +constexpr Result ResultNotImplemented{ErrorModule::TimeService, 990}; +constexpr Result ResultAlarmNotRegistered{ErrorModule::TimeService, 1502}; } // namespace Service::PSC::Time