From b7d9eba72b504039548c5bb1fb64cfec9f3011cb Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sun, 18 Feb 2024 23:26:18 +0100 Subject: fsp: Move IMultiCommitManager to a seperate file --- .../filesystem/fsp/fs_i_multi_commit_manager.cpp | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp (limited to 'src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp') diff --git a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp new file mode 100644 index 000000000..054bf5054 --- /dev/null +++ b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp @@ -0,0 +1,34 @@ +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h" +#include "core/hle/service/ipc_helpers.h" + +namespace Service::FileSystem { + +IMultiCommitManager::IMultiCommitManager(Core::System& system_) + : ServiceFramework{system_, "IMultiCommitManager"} { + static const FunctionInfo functions[] = { + {1, &IMultiCommitManager::Add, "Add"}, + {2, &IMultiCommitManager::Commit, "Commit"}, + }; + RegisterHandlers(functions); +} + +IMultiCommitManager::~IMultiCommitManager() = default; + +void IMultiCommitManager::Add(HLERequestContext& ctx) { + LOG_WARNING(Service_FS, "(STUBBED) called"); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + +void IMultiCommitManager::Commit(HLERequestContext& ctx) { + LOG_WARNING(Service_FS, "(STUBBED) called"); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + +} // namespace Service::FileSystem -- cgit v1.2.3 From 4c71bf3d907efaeb97bc2b0461bece520a91d198 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 19 Feb 2024 02:58:25 +0100 Subject: fsp: Migrate remaining interfaces to cmif serialization --- .../service/filesystem/fsp/fs_i_multi_commit_manager.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp') diff --git a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp index 054bf5054..13914b5e1 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp +++ b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp @@ -1,34 +1,32 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/hle/service/cmif_serialization.h" #include "core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h" -#include "core/hle/service/ipc_helpers.h" namespace Service::FileSystem { IMultiCommitManager::IMultiCommitManager(Core::System& system_) : ServiceFramework{system_, "IMultiCommitManager"} { static const FunctionInfo functions[] = { - {1, &IMultiCommitManager::Add, "Add"}, - {2, &IMultiCommitManager::Commit, "Commit"}, + {1, D<&IMultiCommitManager::Add>, "Add"}, + {2, D<&IMultiCommitManager::Commit>, "Commit"}, }; RegisterHandlers(functions); } IMultiCommitManager::~IMultiCommitManager() = default; -void IMultiCommitManager::Add(HLERequestContext& ctx) { +Result IMultiCommitManager::Add() { LOG_WARNING(Service_FS, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + R_SUCCEED(); } -void IMultiCommitManager::Commit(HLERequestContext& ctx) { +Result IMultiCommitManager::Commit() { LOG_WARNING(Service_FS, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + R_SUCCEED(); } } // namespace Service::FileSystem -- cgit v1.2.3 From b5a17b501bf66c02495ae6d69a6d734792e3cc6f Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 19 Feb 2024 15:43:18 +0100 Subject: Address review comments --- src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp') diff --git a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp index 13914b5e1..626328234 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp +++ b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/service/cmif_serialization.h" +#include "core/hle/service/filesystem/fsp/fs_i_filesystem.h" #include "core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h" namespace Service::FileSystem { @@ -17,7 +18,7 @@ IMultiCommitManager::IMultiCommitManager(Core::System& system_) IMultiCommitManager::~IMultiCommitManager() = default; -Result IMultiCommitManager::Add() { +Result IMultiCommitManager::Add(std::shared_ptr filesystem) { LOG_WARNING(Service_FS, "(STUBBED) called"); R_SUCCEED(); -- cgit v1.2.3