VERY experimental Nintendo Switch 2 emulator
C++
Merge pull request #13073 from FearlessTobi/fsp-srv-ipc
liamwhite0e16d64fbc82
diff --cc src/core/CMakeLists.txtindex a7b760fa24,de945fa704..65bbf4818a--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@@ -58,13 -58,10 +58,14 @@@ add_library(core STATIfile_sys/fs_operate_range.hfile_sys/fs_path.hfile_sys/fs_path_utility.h+ file_sys/fs_save_data_types.hfile_sys/fs_string_util.h+ file_sys/fsa/fs_i_directory.h+ file_sys/fsa/fs_i_file.h+ file_sys/fsa/fs_i_filesystem.hfile_sys/fsmitm_romfsbuild.cppfile_sys/fsmitm_romfsbuild.h+ file_sys/fssrv/fssrv_sf_path.hfile_sys/fssystem/fs_i_storage.hfile_sys/fssystem/fs_types.hfile_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cppdiff --cc src/core/hle/service/filesystem/fsp/fs_i_filesystem.hindex 1133692038,b1f3ab5dd2..dd069f36f3--- a/src/core/hle/service/filesystem/fsp/fs_i_filesystem.h+++ b/src/core/hle/service/filesystem/fsp/fs_i_filesystem.h@@@ -3,58 -3,36 +3,58 @@@#pragma once+#include "common/common_funcs.h"+#include "core/file_sys/fs_filesystem.h"+#include "core/file_sys/fsa/fs_i_filesystem.h"#include "core/file_sys/vfs/vfs.h"+#include "core/hle/service/cmif_types.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 FileSys::Sf {+struct Path;+}+namespace Service::FileSystem {+class IFile;+class IDirectory;+class IFileSystem final : public ServiceFramework<IFileSystem> {public:- explicit IFileSystem(Core::System& system_, FileSys::VirtualDir backend_, SizeGetter size_);-- void CreateFile(HLERequestContext& ctx);- void DeleteFile(HLERequestContext& ctx);- void CreateDirectory(HLERequestContext& ctx);- void DeleteDirectory(HLERequestContext& ctx);- void DeleteDirectoryRecursively(HLERequestContext& ctx);- void CleanDirectoryRecursively(HLERequestContext& ctx);- void RenameFile(HLERequestContext& ctx);- void OpenFile(HLERequestContext& ctx);- void OpenDirectory(HLERequestContext& ctx);- void GetEntryType(HLERequestContext& ctx);- void Commit(HLERequestContext& ctx);- void GetFreeSpaceSize(HLERequestContext& ctx);- void GetTotalSpaceSize(HLERequestContext& ctx);- void GetFileTimeStampRaw(HLERequestContext& ctx);- void GetFileSystemAttribute(HLERequestContext& ctx);+ explicit IFileSystem(Core::System& system_, FileSys::VirtualDir dir_, SizeGetter size_getter_);++ Result CreateFile(const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path, s32 option,+ s64 size);+ Result DeleteFile(const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result CreateDirectory(const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result DeleteDirectory(const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result DeleteDirectoryRecursively(+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result CleanDirectoryRecursively(+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result RenameFile(const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> old_path,+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> new_path);+ Result OpenFile(OutInterface<IFile> out_interface,+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path, u32 mode);+ Result OpenDirectory(OutInterface<IDirectory> out_interface,+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path,+ u32 mode);+ Result GetEntryType(Out<u32> out_type,+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result Commit();+ Result GetFreeSpaceSize(Out<s64> out_size,+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result GetTotalSpaceSize(Out<s64> out_size,+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result GetFileTimeStampRaw(Out<FileSys::FileTimeStampRaw> out_timestamp,+ const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path);+ Result GetFileSystemAttribute(Out<FileSys::FileSystemAttribute> out_attribute);private:- VfsDirectoryServiceWrapper backend;- SizeGetter size;+ std::unique_ptr<FileSys::Fsa::IFileSystem> backend;+ SizeGetter size_getter;};} // namespace Service::FileSystem