summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFernando S <fsahmkow27@gmail.com>2023-12-19 16:14:29 +0100
committerGitHub <noreply@github.com>2023-12-19 16:14:29 +0100
commitb14547b8b6335536a5773bb67521f1983e1a8ec5 (patch)
treefa6a3a6ab6e916236ba825534b0bf09225a05a1b /src
parentMerge pull request #12391 from yuzu-emu/revert-12344-its-free-real-estate (diff)
parentfs: implement OpenDirectoryMode (diff)
downloadyuzu-b14547b8b6335536a5773bb67521f1983e1a8ec5.tar
yuzu-b14547b8b6335536a5773bb67521f1983e1a8ec5.tar.gz
yuzu-b14547b8b6335536a5773bb67521f1983e1a8ec5.tar.bz2
yuzu-b14547b8b6335536a5773bb67521f1983e1a8ec5.tar.lz
yuzu-b14547b8b6335536a5773bb67521f1983e1a8ec5.tar.xz
yuzu-b14547b8b6335536a5773bb67521f1983e1a8ec5.tar.zst
yuzu-b14547b8b6335536a5773bb67521f1983e1a8ec5.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/filesystem/filesystem.h7
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp18
2 files changed, 17 insertions, 8 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.h b/src/core/hle/service/filesystem/filesystem.h
index e7e7c4c28..276d264e1 100644
--- a/src/core/hle/service/filesystem/filesystem.h
+++ b/src/core/hle/service/filesystem/filesystem.h
@@ -54,6 +54,13 @@ enum class ImageDirectoryId : u32 {
SdCard,
};
+enum class OpenDirectoryMode : u64 {
+ Directory = (1 << 0),
+ File = (1 << 1),
+ All = Directory | File
+};
+DECLARE_ENUM_FLAG_OPERATORS(OpenDirectoryMode);
+
class FileSystemController {
public:
explicit FileSystemController(Core::System& system_);
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index b1310d6e4..82ecc1b90 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -259,7 +259,7 @@ static void BuildEntryIndex(std::vector<FileSys::Entry>& entries, const std::vec
class IDirectory final : public ServiceFramework<IDirectory> {
public:
- explicit IDirectory(Core::System& system_, FileSys::VirtualDir backend_)
+ explicit IDirectory(Core::System& system_, FileSys::VirtualDir backend_, OpenDirectoryMode mode)
: ServiceFramework{system_, "IDirectory"}, backend(std::move(backend_)) {
static const FunctionInfo functions[] = {
{0, &IDirectory::Read, "Read"},
@@ -269,8 +269,12 @@ public:
// TODO(DarkLordZach): Verify that this is the correct behavior.
// Build entry index now to save time later.
- BuildEntryIndex(entries, backend->GetFiles(), FileSys::EntryType::File);
- BuildEntryIndex(entries, backend->GetSubdirectories(), FileSys::EntryType::Directory);
+ if (True(mode & OpenDirectoryMode::Directory)) {
+ BuildEntryIndex(entries, backend->GetSubdirectories(), FileSys::EntryType::Directory);
+ }
+ if (True(mode & OpenDirectoryMode::File)) {
+ BuildEntryIndex(entries, backend->GetFiles(), FileSys::EntryType::File);
+ }
}
private:
@@ -446,11 +450,9 @@ public:
const auto file_buffer = ctx.ReadBuffer();
const std::string name = Common::StringFromBuffer(file_buffer);
+ const auto mode = rp.PopRaw<OpenDirectoryMode>();
- // TODO(Subv): Implement this filter.
- const u32 filter_flags = rp.Pop<u32>();
-
- LOG_DEBUG(Service_FS, "called. directory={}, filter={}", name, filter_flags);
+ LOG_DEBUG(Service_FS, "called. directory={}, mode={}", name, mode);
FileSys::VirtualDir vfs_dir{};
auto result = backend.OpenDirectory(&vfs_dir, name);
@@ -460,7 +462,7 @@ public:
return;
}
- auto directory = std::make_shared<IDirectory>(system, vfs_dir);
+ auto directory = std::make_shared<IDirectory>(system, vfs_dir, mode);
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess);