diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-07 20:24:51 -0700 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-07-07 20:24:51 -0700 |
| commit | 913896cbd99e414c325c9d47a987376ed6d9fffd (patch) | |
| tree | b660920a49f538f0ee00486c50a0d153d53c423d /src/core/file_sys/program_metadata.h | |
| parent | 3417f46dd5a40a67204d5491d143bd6792e1e9fb (diff) | |
Revert "Virtual Filesystem (#597)"
This reverts commit 77c684c1140f6bf3fb7d4560d06d2efb1a2ee5e2.
Diffstat (limited to 'src/core/file_sys/program_metadata.h')
| -rw-r--r-- | src/core/file_sys/program_metadata.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/file_sys/program_metadata.h b/src/core/file_sys/program_metadata.h index 06a7315db..b80a08485 100644 --- a/src/core/file_sys/program_metadata.h +++ b/src/core/file_sys/program_metadata.h @@ -10,7 +10,6 @@ #include "common/bit_field.h" #include "common/common_types.h" #include "common/swap.h" -#include "partition_filesystem.h" namespace Loader { enum class ResultStatus; @@ -38,7 +37,8 @@ enum class ProgramFilePermission : u64 { */ class ProgramMetadata { public: - Loader::ResultStatus Load(VirtualFile file); + Loader::ResultStatus Load(const std::string& file_path); + Loader::ResultStatus Load(const std::vector<u8> file_data, size_t offset = 0); bool Is64BitProgram() const; ProgramAddressSpaceType GetAddressSpaceType() const; @@ -51,7 +51,6 @@ public: void Print() const; private: - // TODO(DarkLordZach): BitField is not trivially copyable. struct Header { std::array<char, 4> magic; std::array<u8, 8> reserved; @@ -78,7 +77,6 @@ private: static_assert(sizeof(Header) == 0x80, "NPDM header structure size is wrong"); - // TODO(DarkLordZach): BitField is not trivially copyable. struct AcidHeader { std::array<u8, 0x100> signature; std::array<u8, 0x100> nca_modulus; |
