From 913896cbd99e414c325c9d47a987376ed6d9fffd Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 7 Jul 2018 20:24:51 -0700
Subject: Revert "Virtual Filesystem (#597)"

This reverts commit 77c684c1140f6bf3fb7d4560d06d2efb1a2ee5e2.
---
 src/core/loader/nca.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/core/loader/nca.h')

diff --git a/src/core/loader/nca.h b/src/core/loader/nca.h
index a5639f149..3b6c451d0 100644
--- a/src/core/loader/nca.h
+++ b/src/core/loader/nca.h
@@ -6,37 +6,44 @@
 
 #include <string>
 #include "common/common_types.h"
-#include "core/file_sys/content_archive.h"
+#include "core/file_sys/partition_filesystem.h"
 #include "core/file_sys/program_metadata.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/loader/loader.h"
 
 namespace Loader {
 
+class Nca;
+
 /// Loads an NCA file
 class AppLoader_NCA final : public AppLoader {
 public:
-    explicit AppLoader_NCA(FileSys::VirtualFile file);
+    AppLoader_NCA(FileUtil::IOFile&& file, std::string filepath);
 
     /**
      * Returns the type of the file
-     * @param file std::shared_ptr<VfsFile> open file
+     * @param file FileUtil::IOFile open file
+     * @param filepath Path of the file that we are opening.
      * @return FileType found, or FileType::Error if this loader doesn't know it
      */
-    static FileType IdentifyType(const FileSys::VirtualFile& file);
+    static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
 
     FileType GetFileType() override {
-        return IdentifyType(file);
+        return IdentifyType(file, filepath);
     }
 
     ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
 
+    ResultStatus ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset,
+                           u64& size) override;
+
     ~AppLoader_NCA();
 
 private:
+    std::string filepath;
     FileSys::ProgramMetadata metadata;
 
-    std::unique_ptr<FileSys::NCA> nca;
+    std::unique_ptr<Nca> nca;
 };
 
 } // namespace Loader
-- 
cgit v1.2.3