diff options
author | wwylele <wwylele@gmail.com> | 2017-02-10 17:15:26 +0200 |
---|---|---|
committer | wwylele <wwylele@gmail.com> | 2017-02-13 13:57:38 +0200 |
commit | 20544977dab5b00a86c73572b94e7e75a7499f7a (patch) | |
tree | 1c5f2e443a8c73d70cfbf52b0e5783f99d831802 /src/core/file_sys | |
parent | a0df747325291ba38f0383df4cbd8ff3408c636e (diff) |
loader: use self NCCH archive
Diffstat (limited to 'src/core/file_sys')
-rw-r--r-- | src/core/file_sys/archive_romfs.cpp | 43 | ||||
-rw-r--r-- | src/core/file_sys/archive_romfs.h | 38 |
2 files changed, 0 insertions, 81 deletions
diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp deleted file mode 100644 index 6c99ca5b4..000000000 --- a/src/core/file_sys/archive_romfs.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include <algorithm> -#include <memory> -#include "common/common_types.h" -#include "common/logging/log.h" -#include "core/file_sys/archive_romfs.h" -#include "core/file_sys/ivfc_archive.h" - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// FileSys namespace - -namespace FileSys { - -ArchiveFactory_RomFS::ArchiveFactory_RomFS(Loader::AppLoader& app_loader) { - // Load the RomFS from the app - if (Loader::ResultStatus::Success != app_loader.ReadRomFS(romfs_file, data_offset, data_size)) { - LOG_ERROR(Service_FS, "Unable to read RomFS!"); - } -} - -ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_RomFS::Open(const Path& path) { - auto archive = std::make_unique<IVFCArchive>(romfs_file, data_offset, data_size); - return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive)); -} - -ResultCode ArchiveFactory_RomFS::Format(const Path& path, - const FileSys::ArchiveFormatInfo& format_info) { - LOG_ERROR(Service_FS, "Attempted to format a RomFS archive."); - // TODO: Verify error code - return ResultCode(ErrorDescription::NotAuthorized, ErrorModule::FS, ErrorSummary::NotSupported, - ErrorLevel::Permanent); -} - -ResultVal<ArchiveFormatInfo> ArchiveFactory_RomFS::GetFormatInfo(const Path& path) const { - // TODO(Subv): Implement - LOG_ERROR(Service_FS, "Unimplemented GetFormatInfo archive %s", GetName().c_str()); - return ResultCode(-1); -} - -} // namespace FileSys diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h deleted file mode 100644 index 1eaf99b54..000000000 --- a/src/core/file_sys/archive_romfs.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include <memory> -#include <string> -#include <vector> -#include "common/common_types.h" -#include "core/file_sys/archive_backend.h" -#include "core/hle/result.h" -#include "core/loader/loader.h" - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// FileSys namespace - -namespace FileSys { - -/// File system interface to the RomFS archive -class ArchiveFactory_RomFS final : public ArchiveFactory { -public: - explicit ArchiveFactory_RomFS(Loader::AppLoader& app_loader); - - std::string GetName() const override { - return "RomFS"; - } - ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) override; - ResultCode Format(const Path& path, const FileSys::ArchiveFormatInfo& format_info) override; - ResultVal<ArchiveFormatInfo> GetFormatInfo(const Path& path) const override; - -private: - std::shared_ptr<FileUtil::IOFile> romfs_file; - u64 data_offset; - u64 data_size; -}; - -} // namespace FileSys |