summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-21 02:24:13 +0200
committerLioncash <mathew1800@gmail.com>2018-08-21 02:27:00 +0200
commit96463d0a55b11f73417941f2c29ca24f08196878 (patch)
treeea1fb4b71ce40a62213f02a5ddbaa4502bbe54ec
parentMerge pull request #1095 from DarkLordZach/sysarchives (diff)
downloadyuzu-96463d0a55b11f73417941f2c29ca24f08196878.tar
yuzu-96463d0a55b11f73417941f2c29ca24f08196878.tar.gz
yuzu-96463d0a55b11f73417941f2c29ca24f08196878.tar.bz2
yuzu-96463d0a55b11f73417941f2c29ca24f08196878.tar.lz
yuzu-96463d0a55b11f73417941f2c29ca24f08196878.tar.xz
yuzu-96463d0a55b11f73417941f2c29ca24f08196878.tar.zst
yuzu-96463d0a55b11f73417941f2c29ca24f08196878.zip
-rw-r--r--src/core/file_sys/nca_metadata.h1
-rw-r--r--src/core/file_sys/romfs_factory.cpp6
-rw-r--r--src/core/file_sys/romfs_factory.h8
3 files changed, 12 insertions, 3 deletions
diff --git a/src/core/file_sys/nca_metadata.h b/src/core/file_sys/nca_metadata.h
index 88e66d4da..ce05b4c1d 100644
--- a/src/core/file_sys/nca_metadata.h
+++ b/src/core/file_sys/nca_metadata.h
@@ -7,6 +7,7 @@
#include <cstring>
#include <memory>
#include <vector>
+#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/vfs.h"
diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp
index 1b3824a61..ab67bc749 100644
--- a/src/core/file_sys/romfs_factory.cpp
+++ b/src/core/file_sys/romfs_factory.cpp
@@ -6,15 +6,17 @@
#include <memory>
#include "common/common_types.h"
#include "common/logging/log.h"
-#include "core/core.h"
+#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/romfs_factory.h"
#include "core/hle/kernel/process.h"
+#include "core/hle/service/filesystem/filesystem.h"
+#include "core/loader/loader.h"
namespace FileSys {
RomFSFactory::RomFSFactory(Loader::AppLoader& app_loader) {
// Load the RomFS from the app
- if (Loader::ResultStatus::Success != app_loader.ReadRomFS(file)) {
+ if (app_loader.ReadRomFS(file) != Loader::ResultStatus::Success) {
LOG_ERROR(Service_FS, "Unable to read RomFS!");
}
}
diff --git a/src/core/file_sys/romfs_factory.h b/src/core/file_sys/romfs_factory.h
index 455cd4159..f38ddc4f7 100644
--- a/src/core/file_sys/romfs_factory.h
+++ b/src/core/file_sys/romfs_factory.h
@@ -6,11 +6,17 @@
#include <memory>
#include "common/common_types.h"
+#include "core/file_sys/vfs.h"
#include "core/hle/result.h"
-#include "core/loader/loader.h"
+
+namespace Loader {
+class AppLoader;
+} // namespace Loader
namespace FileSys {
+enum class ContentRecordType : u8;
+
enum class StorageId : u8 {
None = 0,
Host = 1,