Merge pull request #163 from ogniK5377/istorage_to_romfs

Changed .istorage to .romfs
This commit is contained in:
bunnei 2018-02-05 08:02:14 -08:00 committed by GitHub
commit e33117c00a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -29,7 +29,7 @@ static std::string FindRomFS(const std::string& directory) {
// Verify extension // Verify extension
const std::string extension = physical_name.substr(physical_name.find_last_of(".") + 1); const std::string extension = physical_name.substr(physical_name.find_last_of(".") + 1);
if (Common::ToLower(extension) != "istorage") { if (Common::ToLower(extension) != "romfs") {
return true; return true;
} }
@ -38,7 +38,7 @@ static std::string FindRomFS(const std::string& directory) {
return false; return false;
}; };
// Search the specified directory recursively, looking for the first .istorage file, which will // Search the specified directory recursively, looking for the first .romfs file, which will
// be used for the RomFS // be used for the RomFS
FileUtil::ForeachDirectoryEntry(nullptr, directory, callback); FileUtil::ForeachDirectoryEntry(nullptr, directory, callback);
@ -128,10 +128,10 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load(
Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION);
process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE); process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE);
// Find the RomFS by searching for a ".istorage" file in this directory // Find the RomFS by searching for a ".romfs" file in this directory
filepath_romfs = FindRomFS(directory); filepath_romfs = FindRomFS(directory);
// Register the RomFS if a ".istorage" file was found // Register the RomFS if a ".romfs" file was found
if (!filepath_romfs.empty()) { if (!filepath_romfs.empty()) {
Service::FileSystem::RegisterFileSystem(std::make_unique<FileSys::RomFS_Factory>(*this), Service::FileSystem::RegisterFileSystem(std::make_unique<FileSys::RomFS_Factory>(*this),
Service::FileSystem::Type::RomFS); Service::FileSystem::Type::RomFS);

View File

@ -15,7 +15,7 @@ namespace Loader {
* This class loads a "deconstructed ROM directory", which are the typical format we see for Switch * This class loads a "deconstructed ROM directory", which are the typical format we see for Switch
* game dumps. The path should be a "main" NSO, which must be in a directory that contains the other * game dumps. The path should be a "main" NSO, which must be in a directory that contains the other
* standard ExeFS NSOs (e.g. rtld, sdk, etc.). It will automatically find and load these. * standard ExeFS NSOs (e.g. rtld, sdk, etc.). It will automatically find and load these.
* Furthermore, it will look for the first .istorage file (optionally) and use this for the RomFS. * Furthermore, it will look for the first .romfs file (optionally) and use this for the RomFS.
*/ */
class AppLoader_DeconstructedRomDirectory final : public AppLoader { class AppLoader_DeconstructedRomDirectory final : public AppLoader {
public: public: