summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshinyquagsire23 <mtinc2@gmail.com>2018-02-26 00:18:55 +0100
committershinyquagsire23 <mtinc2@gmail.com>2018-02-26 00:34:29 +0100
commite29710818f7cd6ca2eadf52d74d039a593a98bb0 (patch)
tree3e59a99cc6a5740b42e0e279c79e0a511adb717a
parentloader: Check error on NPDM load, use TID for CodeSet (diff)
downloadyuzu-e29710818f7cd6ca2eadf52d74d039a593a98bb0.tar
yuzu-e29710818f7cd6ca2eadf52d74d039a593a98bb0.tar.gz
yuzu-e29710818f7cd6ca2eadf52d74d039a593a98bb0.tar.bz2
yuzu-e29710818f7cd6ca2eadf52d74d039a593a98bb0.tar.lz
yuzu-e29710818f7cd6ca2eadf52d74d039a593a98bb0.tar.xz
yuzu-e29710818f7cd6ca2eadf52d74d039a593a98bb0.tar.zst
yuzu-e29710818f7cd6ca2eadf52d74d039a593a98bb0.zip
-rw-r--r--src/core/file_sys/program_metadata.cpp3
-rw-r--r--src/core/file_sys/program_metadata.h13
2 files changed, 5 insertions, 11 deletions
diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp
index 041617bb5..a6dcebcc3 100644
--- a/src/core/file_sys/program_metadata.cpp
+++ b/src/core/file_sys/program_metadata.cpp
@@ -8,9 +8,6 @@
#include "core/file_sys/program_metadata.h"
#include "core/loader/loader.h"
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
namespace FileSys {
Loader::ResultStatus ProgramMetadata::Load(const std::string& file_path) {
diff --git a/src/core/file_sys/program_metadata.h b/src/core/file_sys/program_metadata.h
index 4e04a8e68..b80a08485 100644
--- a/src/core/file_sys/program_metadata.h
+++ b/src/core/file_sys/program_metadata.h
@@ -15,9 +15,6 @@ namespace Loader {
enum class ResultStatus;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
namespace FileSys {
enum class ProgramAddressSpaceType : u8 {
@@ -100,7 +97,7 @@ private:
u32_le sac_size;
u32_le kac_offset;
u32_le kac_size;
- std::array<u8, 0x8> padding;
+ INSERT_PADDING_BYTES(0x8);
};
static_assert(sizeof(AcidHeader) == 0x240, "ACID header structure size is wrong");
@@ -109,14 +106,14 @@ private:
std::array<char, 4> magic;
std::array<u8, 0xC> reserved;
u64_le title_id;
- std::array<u8, 0x8> padding;
+ INSERT_PADDING_BYTES(0x8);
u32_le fah_offset;
u32_le fah_size;
u32_le sac_offset;
u32_le sac_size;
u32_le kac_offset;
u32_le kac_size;
- std::array<u8, 0x8> padding_2;
+ INSERT_PADDING_BYTES(0x8);
};
static_assert(sizeof(AciHeader) == 0x40, "ACI0 header structure size is wrong");
@@ -125,7 +122,7 @@ private:
struct FileAccessControl {
u8 version;
- std::array<u8, 3> padding;
+ INSERT_PADDING_BYTES(3);
u64_le permissions;
std::array<u8, 0x20> unknown;
};
@@ -134,7 +131,7 @@ private:
struct FileAccessHeader {
u8 version;
- std::array<u8, 3> padding;
+ INSERT_PADDING_BYTES(3);
u64_le permissions;
u32_le unk_offset;
u32_le unk_size;