diff options
| author | 2018-02-05 00:01:10 -0800 | |
|---|---|---|
| committer | 2018-02-05 00:01:10 -0800 | |
| commit | f9ba5a7e11883e208bc159652f64f765a56ed7e1 (patch) | |
| tree | ac9c82156b69f9482c30c1e14ee9b4908ee9841e /src/core/loader | |
| parent | Merge pull request #161 from bunnei/service-improvements (diff) | |
| download | yuzu-f9ba5a7e11883e208bc159652f64f765a56ed7e1.tar.gz yuzu-f9ba5a7e11883e208bc159652f64f765a56ed7e1.tar.xz yuzu-f9ba5a7e11883e208bc159652f64f765a56ed7e1.zip | |
Changed .istorage to .romfs
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 8 | ||||
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 37030683b..c4e003b74 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp | |||
| @@ -29,7 +29,7 @@ static std::string FindRomFS(const std::string& directory) { | |||
| 29 | 29 | ||
| 30 | // Verify extension | 30 | // Verify extension |
| 31 | const std::string extension = physical_name.substr(physical_name.find_last_of(".") + 1); | 31 | const std::string extension = physical_name.substr(physical_name.find_last_of(".") + 1); |
| 32 | if (Common::ToLower(extension) != "istorage") { | 32 | if (Common::ToLower(extension) != "romfs") { |
| 33 | return true; | 33 | return true; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| @@ -38,7 +38,7 @@ static std::string FindRomFS(const std::string& directory) { | |||
| 38 | return false; | 38 | return false; |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | // Search the specified directory recursively, looking for the first .istorage file, which will | 41 | // Search the specified directory recursively, looking for the first .romfs file, which will |
| 42 | // be used for the RomFS | 42 | // be used for the RomFS |
| 43 | FileUtil::ForeachDirectoryEntry(nullptr, directory, callback); | 43 | FileUtil::ForeachDirectoryEntry(nullptr, directory, callback); |
| 44 | 44 | ||
| @@ -128,10 +128,10 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( | |||
| 128 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 128 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 129 | process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE); | 129 | process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE); |
| 130 | 130 | ||
| 131 | // Find the RomFS by searching for a ".istorage" file in this directory | 131 | // Find the RomFS by searching for a ".romfs" file in this directory |
| 132 | filepath_romfs = FindRomFS(directory); | 132 | filepath_romfs = FindRomFS(directory); |
| 133 | 133 | ||
| 134 | // Register the RomFS if a ".istorage" file was found | 134 | // Register the RomFS if a ".romfs" file was found |
| 135 | if (!filepath_romfs.empty()) { | 135 | if (!filepath_romfs.empty()) { |
| 136 | Service::FileSystem::RegisterFileSystem(std::make_unique<FileSys::RomFS_Factory>(*this), | 136 | Service::FileSystem::RegisterFileSystem(std::make_unique<FileSys::RomFS_Factory>(*this), |
| 137 | Service::FileSystem::Type::RomFS); | 137 | Service::FileSystem::Type::RomFS); |
diff --git a/src/core/loader/deconstructed_rom_directory.h b/src/core/loader/deconstructed_rom_directory.h index 26493de5e..536a2dab7 100644 --- a/src/core/loader/deconstructed_rom_directory.h +++ b/src/core/loader/deconstructed_rom_directory.h | |||
| @@ -15,7 +15,7 @@ namespace Loader { | |||
| 15 | * This class loads a "deconstructed ROM directory", which are the typical format we see for Switch | 15 | * This class loads a "deconstructed ROM directory", which are the typical format we see for Switch |
| 16 | * game dumps. The path should be a "main" NSO, which must be in a directory that contains the other | 16 | * game dumps. The path should be a "main" NSO, which must be in a directory that contains the other |
| 17 | * standard ExeFS NSOs (e.g. rtld, sdk, etc.). It will automatically find and load these. | 17 | * standard ExeFS NSOs (e.g. rtld, sdk, etc.). It will automatically find and load these. |
| 18 | * Furthermore, it will look for the first .istorage file (optionally) and use this for the RomFS. | 18 | * Furthermore, it will look for the first .romfs file (optionally) and use this for the RomFS. |
| 19 | */ | 19 | */ |
| 20 | class AppLoader_DeconstructedRomDirectory final : public AppLoader { | 20 | class AppLoader_DeconstructedRomDirectory final : public AppLoader { |
| 21 | public: | 21 | public: |