diff --git a/src/core/hle/service/boss/online_service.cpp b/src/core/hle/service/boss/online_service.cpp index 0f6acbabb..8e3ab7c56 100644 --- a/src/core/hle/service/boss/online_service.cpp +++ b/src/core/hle/service/boss/online_service.cpp @@ -335,7 +335,7 @@ std::optional OnlineService::GetNsDataEntryFromId(const u32 ns_data } Result OnlineService::GetNsDataHeaderInfo(const u32 ns_data_id, const NsDataHeaderInfoType type, - const u32 size, Kernel::MappedBuffer& buffer) { + const u32 size, Kernel::MappedBuffer& buffer) { const auto entry = GetNsDataEntryFromId(ns_data_id); if (!entry.has_value()) { LOG_WARNING(Service_BOSS, "Failed to find NsData entry for ID {:#010X}", ns_data_id); diff --git a/src/core/hle/service/boss/online_service.h b/src/core/hle/service/boss/online_service.h index 17763e85e..6d20bc1e5 100644 --- a/src/core/hle/service/boss/online_service.h +++ b/src/core/hle/service/boss/online_service.h @@ -168,7 +168,7 @@ public: u16 GetNsDataIdList(const u32 filter, const u32 max_entries, Kernel::MappedBuffer& buffer); std::optional GetNsDataEntryFromId(const u32 ns_data_id); Result GetNsDataHeaderInfo(const u32 ns_data_id, const NsDataHeaderInfoType type, - const u32 size, Kernel::MappedBuffer& buffer); + const u32 size, Kernel::MappedBuffer& buffer); ResultVal ReadNsData(const u32 ns_data_id, const u64 offset, const u32 size, Kernel::MappedBuffer& buffer); Result SendProperty(const u16 id, const u32 size, Kernel::MappedBuffer& buffer); diff --git a/src/core/hle/service/cecd/cecd.cpp b/src/core/hle/service/cecd/cecd.cpp index 113a3f4c5..4d48cd1a6 100644 --- a/src/core/hle/service/cecd/cecd.cpp +++ b/src/core/hle/service/cecd/cecd.cpp @@ -842,7 +842,7 @@ void Module::Interface::GetCecInfoEventHandleSys(Kernel::HLERequestContext& ctx) rp.PopPID(); IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); - rb.Push(RESULT_SUCCESS); + rb.Push(ResultSuccess); rb.PushCopyObjects(cecd->cecinfosys_event); LOG_WARNING(Service_CECD, "(STUBBED) called"); diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp index 2b9b1cd18..d2c7d8438 100644 --- a/src/core/hle/service/gsp/gsp_gpu.cpp +++ b/src/core/hle/service/gsp/gsp_gpu.cpp @@ -96,7 +96,7 @@ void GSP_GPU::ClientDisconnected(std::shared_ptr server_s * @return ResultSuccess if the parameters are valid, error code otherwise */ static Result WriteHWRegs(u32 base_address, u32 size_in_bytes, std::span data, - VideoCore::GPU& gpu) { + VideoCore::GPU& gpu) { // This magic number is verified to be done by the gsp module const u32 max_size_in_bytes = 0x80; @@ -142,7 +142,7 @@ static Result WriteHWRegs(u32 base_address, u32 size_in_bytes, std::span data, - std::span masks, VideoCore::GPU& gpu) { + std::span masks, VideoCore::GPU& gpu) { // This magic number is verified to be done by the gsp module const u32 max_size_in_bytes = 0x80; @@ -557,8 +557,8 @@ void GSP_GPU::RestoreVramSysArea(Kernel::HLERequestContext& ctx) { } Result GSP_GPU::AcquireGpuRight(const Kernel::HLERequestContext& ctx, - const std::shared_ptr& process, u32 flag, - bool blocking) { + const std::shared_ptr& process, u32 flag, + bool blocking) { const auto session_data = GetSessionData(ctx.Session()); LOG_DEBUG(Service_GSP, "called flag={:08X} process={} thread_id={}", flag, process->process_id, @@ -653,7 +653,7 @@ void GSP_GPU::SetInternalPriorities(Kernel::HLERequestContext& ctx) { const auto priority_with_rights = rp.Pop(); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); - rb.Push(RESULT_SUCCESS); + rb.Push(ResultSuccess); LOG_DEBUG(Service_GSP, "(STUBBED) called priority={:#02X}, priority_with_rights={:#02X}", priority, priority_with_rights); diff --git a/src/core/hle/service/gsp/gsp_gpu.h b/src/core/hle/service/gsp/gsp_gpu.h index 30aeaee75..e1bc5eb4f 100644 --- a/src/core/hle/service/gsp/gsp_gpu.h +++ b/src/core/hle/service/gsp/gsp_gpu.h @@ -366,9 +366,9 @@ private: std::unique_ptr MakeSessionData() override; - ResultCode AcquireGpuRight(const Kernel::HLERequestContext& ctx, - const std::shared_ptr& process, u32 flag, - bool blocking); + Result AcquireGpuRight(const Kernel::HLERequestContext& ctx, + const std::shared_ptr& process, u32 flag, + bool blocking); Core::System& system; diff --git a/src/core/hle/service/soc/soc_u.cpp b/src/core/hle/service/soc/soc_u.cpp index d1985a32e..386a2ac06 100644 --- a/src/core/hle/service/soc/soc_u.cpp +++ b/src/core/hle/service/soc/soc_u.cpp @@ -1783,7 +1783,7 @@ void SOC_U::InitializeSockets(Kernel::HLERequestContext& ctx) { const u32 pid = rp.PopPID(); [[maybe_unused]] auto shared_memory = rp.PopObject(); - ResultCode res = ResultSuccess; + Result res = ResultSuccess; if (initialized_processes.find(pid) == initialized_processes.end()) { initialized_processes.insert(pid); } else {