From 2164702cf7f878c84a1f148daca2416911e6e939 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Thu, 16 Aug 2018 17:02:31 -0400
Subject: nax: Add AppLoader_NAX and update loader to support it

---
 src/core/loader/nax.h | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/core/loader/nax.h

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

diff --git a/src/core/loader/nax.h b/src/core/loader/nax.h
new file mode 100644
index 000000000..08d6ef346
--- /dev/null
+++ b/src/core/loader/nax.h
@@ -0,0 +1,43 @@
+// Copyright 2018 yuzu emulator team
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include "common/common_types.h"
+#include "core/file_sys/card_image.h"
+#include "core/file_sys/xts_archive.h"
+#include "core/loader/loader.h"
+#include "core/loader/nca.h"
+
+namespace Loader {
+
+/// Loads a NAX file
+class AppLoader_NAX final : public AppLoader {
+public:
+    explicit AppLoader_NAX(FileSys::VirtualFile file);
+    ~AppLoader_NAX();
+
+    /**
+     * Returns the type of the file
+     * @param file std::shared_ptr<VfsFile> open file
+     * @return FileType found, or FileType::Error if this loader doesn't know it
+     */
+    static FileType IdentifyType(const FileSys::VirtualFile& file);
+
+    FileType GetFileType() override {
+        return IdentifyType(file);
+    }
+
+    ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
+
+    ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override;
+    ResultStatus ReadProgramId(u64& out_program_id) override;
+
+private:
+    std::unique_ptr<FileSys::NAX> nax;
+    std::unique_ptr<AppLoader_NCA> nca_loader;
+};
+
+} // namespace Loader
-- 
cgit v1.2.3


From a7e8d10969f280cd5a869b3525c3339357a958a6 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sat, 18 Aug 2018 21:16:20 -0400
Subject: file_sys: Cut down on includes and copies

---
 src/core/loader/nax.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/src/core/loader/nax.h b/src/core/loader/nax.h
index 08d6ef346..4dbae2918 100644
--- a/src/core/loader/nax.h
+++ b/src/core/loader/nax.h
@@ -6,18 +6,23 @@
 
 #include <memory>
 #include "common/common_types.h"
-#include "core/file_sys/card_image.h"
-#include "core/file_sys/xts_archive.h"
 #include "core/loader/loader.h"
-#include "core/loader/nca.h"
+
+namespace FileSys {
+
+class NAX;
+
+} // namespace FileSys
 
 namespace Loader {
 
+class AppLoader_NCA;
+
 /// Loads a NAX file
 class AppLoader_NAX final : public AppLoader {
 public:
     explicit AppLoader_NAX(FileSys::VirtualFile file);
-    ~AppLoader_NAX();
+    ~AppLoader_NAX() override;
 
     /**
      * Returns the type of the file
-- 
cgit v1.2.3