diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2024-02-22 18:34:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-22 18:34:47 +0100 |
commit | d12d9dad4096af6280c6c418cf36a2faacede102 (patch) | |
tree | ba52bf26efd8b2f7bf282b0564a68870022cccb7 /src/core/hle/service/filesystem/fsp/fs_i_directory.h | |
parent | Merge pull request #13000 from liamwhite/skip-null-memory (diff) | |
parent | Address review comments pt. 2 (diff) | |
download | yuzu-d12d9dad4096af6280c6c418cf36a2faacede102.tar yuzu-d12d9dad4096af6280c6c418cf36a2faacede102.tar.gz yuzu-d12d9dad4096af6280c6c418cf36a2faacede102.tar.bz2 yuzu-d12d9dad4096af6280c6c418cf36a2faacede102.tar.lz yuzu-d12d9dad4096af6280c6c418cf36a2faacede102.tar.xz yuzu-d12d9dad4096af6280c6c418cf36a2faacede102.tar.zst yuzu-d12d9dad4096af6280c6c418cf36a2faacede102.zip |
Diffstat (limited to 'src/core/hle/service/filesystem/fsp/fs_i_directory.h')
-rw-r--r-- | src/core/hle/service/filesystem/fsp/fs_i_directory.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/filesystem/fsp/fs_i_directory.h b/src/core/hle/service/filesystem/fsp/fs_i_directory.h index 793ecfcd7..b6251f7fd 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_directory.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_directory.h @@ -3,7 +3,9 @@ #pragma once +#include "core/file_sys/fsa/fs_i_directory.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/service.h" @@ -15,16 +17,15 @@ namespace Service::FileSystem { class IDirectory final : public ServiceFramework<IDirectory> { public: - explicit IDirectory(Core::System& system_, FileSys::VirtualDir backend_, + explicit IDirectory(Core::System& system_, FileSys::VirtualDir directory_, FileSys::OpenDirectoryMode mode); private: - FileSys::VirtualDir backend; - std::vector<FileSys::DirectoryEntry> entries; - u64 next_entry_index = 0; + std::unique_ptr<FileSys::Fsa::IDirectory> backend; - void Read(HLERequestContext& ctx); - void GetEntryCount(HLERequestContext& ctx); + Result Read(Out<s64> out_count, + const OutArray<FileSys::DirectoryEntry, BufferAttr_HipcMapAlias> out_entries); + Result GetEntryCount(Out<s64> out_count); }; } // namespace Service::FileSystem |