diff options
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 7 | ||||
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index a4426af96..04c9d750f 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include "core/file_sys/bis_factory.h" | 10 | #include "core/file_sys/bis_factory.h" |
| 11 | #include "core/file_sys/errors.h" | 11 | #include "core/file_sys/errors.h" |
| 12 | #include "core/file_sys/mode.h" | 12 | #include "core/file_sys/mode.h" |
| 13 | #include "core/file_sys/registered_cache.h" | ||
| 13 | #include "core/file_sys/romfs_factory.h" | 14 | #include "core/file_sys/romfs_factory.h" |
| 14 | #include "core/file_sys/savedata_factory.h" | 15 | #include "core/file_sys/savedata_factory.h" |
| 15 | #include "core/file_sys/sdmc_factory.h" | 16 | #include "core/file_sys/sdmc_factory.h" |
| @@ -307,6 +308,12 @@ ResultVal<FileSys::VirtualDir> OpenSDMC() { | |||
| 307 | return sdmc_factory->Open(); | 308 | return sdmc_factory->Open(); |
| 308 | } | 309 | } |
| 309 | 310 | ||
| 311 | std::shared_ptr<FileSys::RegisteredCacheUnion> GetUnionContents() { | ||
| 312 | return std::make_shared<FileSys::RegisteredCacheUnion>( | ||
| 313 | std::vector<std::shared_ptr<FileSys::RegisteredCache>>{ | ||
| 314 | GetSystemNANDContents(), GetUserNANDContents(), GetSDMCContents()}); | ||
| 315 | } | ||
| 316 | |||
| 310 | std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents() { | 317 | std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents() { |
| 311 | LOG_TRACE(Service_FS, "Opening System NAND Contents"); | 318 | LOG_TRACE(Service_FS, "Opening System NAND Contents"); |
| 312 | 319 | ||
diff --git a/src/core/hle/service/filesystem/filesystem.h b/src/core/hle/service/filesystem/filesystem.h index 9ba0e2eab..793a7b06f 100644 --- a/src/core/hle/service/filesystem/filesystem.h +++ b/src/core/hle/service/filesystem/filesystem.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | namespace FileSys { | 13 | namespace FileSys { |
| 14 | class BISFactory; | 14 | class BISFactory; |
| 15 | class RegisteredCache; | 15 | class RegisteredCache; |
| 16 | class RegisteredCacheUnion; | ||
| 16 | class RomFSFactory; | 17 | class RomFSFactory; |
| 17 | class SaveDataFactory; | 18 | class SaveDataFactory; |
| 18 | class SDMCFactory; | 19 | class SDMCFactory; |
| @@ -45,6 +46,8 @@ ResultVal<FileSys::VirtualDir> OpenSaveData(FileSys::SaveDataSpaceId space, | |||
| 45 | FileSys::SaveDataDescriptor save_struct); | 46 | FileSys::SaveDataDescriptor save_struct); |
| 46 | ResultVal<FileSys::VirtualDir> OpenSDMC(); | 47 | ResultVal<FileSys::VirtualDir> OpenSDMC(); |
| 47 | 48 | ||
| 49 | std::shared_ptr<FileSys::RegisteredCacheUnion> GetUnionContents(); | ||
| 50 | |||
| 48 | std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents(); | 51 | std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents(); |
| 49 | std::shared_ptr<FileSys::RegisteredCache> GetUserNANDContents(); | 52 | std::shared_ptr<FileSys::RegisteredCache> GetUserNANDContents(); |
| 50 | std::shared_ptr<FileSys::RegisteredCache> GetSDMCContents(); | 53 | std::shared_ptr<FileSys::RegisteredCache> GetSDMCContents(); |