From b5a17b501bf66c02495ae6d69a6d734792e3cc6f Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 19 Feb 2024 15:43:18 +0100 Subject: Address review comments --- .../hle/service/filesystem/fsp/fs_i_filesystem.h | 2 +- .../filesystem/fsp/fs_i_multi_commit_manager.cpp | 3 +- .../filesystem/fsp/fs_i_multi_commit_manager.h | 2 +- .../filesystem/fsp/fs_i_save_data_info_reader.h | 4 +-- src/core/hle/service/filesystem/fsp/fsp_srv.h | 13 +-------- src/core/hle/service/filesystem/fsp/fsp_types.h | 34 ++++++++++++++++++++++ src/core/hle/service/filesystem/fsp/fsp_util.h | 22 -------------- 7 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 src/core/hle/service/filesystem/fsp/fsp_types.h delete mode 100644 src/core/hle/service/filesystem/fsp/fsp_util.h (limited to 'src/core/hle') diff --git a/src/core/hle/service/filesystem/fsp/fs_i_filesystem.h b/src/core/hle/service/filesystem/fsp/fs_i_filesystem.h index b06b3ef0e..b1f3ab5dd 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_filesystem.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_filesystem.h @@ -5,7 +5,7 @@ #include "core/file_sys/vfs/vfs.h" #include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/filesystem/fsp/fsp_util.h" +#include "core/hle/service/filesystem/fsp/fsp_types.h" #include "core/hle/service/service.h" namespace Service::FileSystem { 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(); diff --git a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h index 274ef0513..8ebf7c7d9 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h @@ -14,7 +14,7 @@ public: ~IMultiCommitManager() override; private: - Result Add(); + Result Add(std::shared_ptr filesystem); Result Commit(); FileSys::VirtualFile backend; diff --git a/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h b/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h index 7b21b029b..e45ad852b 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h @@ -23,14 +23,14 @@ public: u64_le save_id_unknown; FileSys::SaveDataSpaceId space; FileSys::SaveDataType type; - INSERT_PADDING_BYTES_NOINIT(0x6); + INSERT_PADDING_BYTES(0x6); std::array user_id; u64_le save_id; u64_le title_id; u64_le save_image_size; u16_le index; FileSys::SaveDataRank rank; - INSERT_PADDING_BYTES_NOINIT(0x25); + INSERT_PADDING_BYTES(0x25); }; static_assert(sizeof(SaveDataInfo) == 0x60, "SaveDataInfo has incorrect size."); diff --git a/src/core/hle/service/filesystem/fsp/fsp_srv.h b/src/core/hle/service/filesystem/fsp/fsp_srv.h index 7a29d17c9..ee67f6bc1 100644 --- a/src/core/hle/service/filesystem/fsp/fsp_srv.h +++ b/src/core/hle/service/filesystem/fsp/fsp_srv.h @@ -6,6 +6,7 @@ #include #include "core/file_sys/fs_save_data_types.h" #include "core/hle/service/cmif_types.h" +#include "core/hle/service/filesystem/fsp/fsp_types.h" #include "core/hle/service/service.h" namespace Core { @@ -39,18 +40,6 @@ enum class AccessLogMode : u32 { SdCard, }; -enum class FileSystemProxyType : u8 { - Code = 0, - Rom = 1, - Logo = 2, - Control = 3, - Manual = 4, - Meta = 5, - Data = 6, - Package = 7, - RegisteredUpdate = 8, -}; - class FSP_SRV final : public ServiceFramework { public: explicit FSP_SRV(Core::System& system_); diff --git a/src/core/hle/service/filesystem/fsp/fsp_types.h b/src/core/hle/service/filesystem/fsp/fsp_types.h new file mode 100644 index 000000000..294da6a2d --- /dev/null +++ b/src/core/hle/service/filesystem/fsp/fsp_types.h @@ -0,0 +1,34 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "core/hle/service/filesystem/filesystem.h" + +namespace Service::FileSystem { + +enum class FileSystemProxyType : u8 { + Code = 0, + Rom = 1, + Logo = 2, + Control = 3, + Manual = 4, + Meta = 5, + Data = 6, + Package = 7, + RegisteredUpdate = 8, +}; + +struct SizeGetter { + std::function get_free_size; + std::function get_total_size; + + static SizeGetter FromStorageId(const FileSystemController& fsc, FileSys::StorageId id) { + return { + [&fsc, id] { return fsc.GetFreeSpaceSize(id); }, + [&fsc, id] { return fsc.GetTotalSpaceSize(id); }, + }; + } +}; + +} // namespace Service::FileSystem diff --git a/src/core/hle/service/filesystem/fsp/fsp_util.h b/src/core/hle/service/filesystem/fsp/fsp_util.h deleted file mode 100644 index 253f866db..000000000 --- a/src/core/hle/service/filesystem/fsp/fsp_util.h +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/filesystem/filesystem.h" - -namespace Service::FileSystem { - -struct SizeGetter { - std::function get_free_size; - std::function get_total_size; - - static SizeGetter FromStorageId(const FileSystemController& fsc, FileSys::StorageId id) { - return { - [&fsc, id] { return fsc.GetFreeSpaceSize(id); }, - [&fsc, id] { return fsc.GetTotalSpaceSize(id); }, - }; - } -}; - -} // namespace Service::FileSystem -- cgit v1.2.3