flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

file_sys: Style tweaks

Browse source 
Asdf
This commit is contained in:
shinyquagsire23 2018-02-25 16:18:55 -07:00
parent 487f8bc018
commit e29710818f
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/file_sys/program_metadata.cpp
View file

@ -8,9 +8,6 @@
#include "core/file_sys/program_metadata.h" #include "core/file_sys/program_metadata.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace
namespace FileSys { namespace FileSys {
Loader::ResultStatus ProgramMetadata::Load(const std::string& file_path) { Loader::ResultStatus ProgramMetadata::Load(const std::string& file_path) {

13
src/core/file_sys/program_metadata.h
View file

@ -15,9 +15,6 @@ namespace Loader {
enum class ResultStatus; enum class ResultStatus;
} }
////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace
namespace FileSys { namespace FileSys {
enum class ProgramAddressSpaceType : u8 { enum class ProgramAddressSpaceType : u8 {
@ -100,7 +97,7 @@ private:
u32_le sac_size; u32_le sac_size;
u32_le kac_offset; u32_le kac_offset;
u32_le kac_size; u32_le kac_size;
std::array<u8, 0x8> padding; INSERT_PADDING_BYTES(0x8);
}; };
static_assert(sizeof(AcidHeader) == 0x240, "ACID header structure size is wrong"); static_assert(sizeof(AcidHeader) == 0x240, "ACID header structure size is wrong");
@ -109,14 +106,14 @@ private:
std::array<char, 4> magic; std::array<char, 4> magic;
std::array<u8, 0xC> reserved; std::array<u8, 0xC> reserved;
u64_le title_id; u64_le title_id;
std::array<u8, 0x8> padding; INSERT_PADDING_BYTES(0x8);
u32_le fah_offset; u32_le fah_offset;
u32_le fah_size; u32_le fah_size;
u32_le sac_offset; u32_le sac_offset;
u32_le sac_size; u32_le sac_size;
u32_le kac_offset; u32_le kac_offset;
u32_le kac_size; 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"); static_assert(sizeof(AciHeader) == 0x40, "ACI0 header structure size is wrong");
@ -125,7 +122,7 @@ private:
struct FileAccessControl { struct FileAccessControl {
u8 version; u8 version;
std::array<u8, 3> padding; INSERT_PADDING_BYTES(3);
u64_le permissions; u64_le permissions;
std::array<u8, 0x20> unknown; std::array<u8, 0x20> unknown;
}; };
@ -134,7 +131,7 @@ private:
struct FileAccessHeader { struct FileAccessHeader {
u8 version; u8 version;
std::array<u8, 3> padding; INSERT_PADDING_BYTES(3);
u64_le permissions; u64_le permissions;
u32_le unk_offset; u32_le unk_offset;
u32_le unk_size; u32_le unk_size;