diff options
| author | JosJuice <josjuice@gmail.com> | 2017-06-09 21:42:26 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-08-01 11:36:40 +0200 |
| commit | 8afa230787b7ea945841cb28c149d4c7db31f593 (patch) | |
| tree | d80c722a972dc5e92786de730dbe9d16832445c3 /Source/Core/DiscIO/DirectoryBlob.cpp | |
| parent | 975b2b40fab867f95acb7e5266996e8f17e3e3fd (diff) | |
DirectoryBlob: Rename DISKHEADERINFO_ADDRESS to BI2_ADDRESS
Because DISKHEADERINFO is too easy confuse with DISKHEADER.
Also adding BI2_SIZE and DISKHEADER_SIZE contants.
Diffstat (limited to 'Source/Core/DiscIO/DirectoryBlob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DirectoryBlob.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index d2675a0f65..5d5bafb01a 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -43,8 +43,10 @@ constexpr u8 ENTRY_SIZE = 0x0c; constexpr u8 FILE_ENTRY = 0; constexpr u8 DIRECTORY_ENTRY = 1; constexpr u64 DISKHEADER_ADDRESS = 0; +constexpr u64 DISKHEADER_SIZE = 0x440; constexpr u64 NONPARTITION_DISKHEADER_SIZE = 0x100; -constexpr u64 DISKHEADERINFO_ADDRESS = 0x440; +constexpr u64 BI2_ADDRESS = 0x440; +constexpr u64 BI2_SIZE = 0x2000; constexpr u64 APPLOADER_ADDRESS = 0x2440; constexpr u64 GAME_PARTITION_ADDRESS = 0x50000; @@ -159,7 +161,7 @@ std::unique_ptr<DirectoryBlobReader> DirectoryBlobReader::Create(const std::stri DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory) : m_root_directory(root_directory), m_data_start_address(UINT64_MAX), - m_disk_header(DISKHEADERINFO_ADDRESS), m_fst_address(0), m_dol_address(0) + m_disk_header(DISKHEADER_SIZE), m_fst_address(0), m_dol_address(0) { SetDiscHeaderAndDiscType(); @@ -169,9 +171,8 @@ DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory) BuildFST(); - m_virtual_disc.emplace(DISKHEADER_ADDRESS, DISKHEADERINFO_ADDRESS, m_disk_header.data()); - AddFileToContents(&m_virtual_disc, m_root_directory + "sys/bi2.bin", DISKHEADERINFO_ADDRESS, - APPLOADER_ADDRESS - DISKHEADERINFO_ADDRESS); + m_virtual_disc.emplace(DISKHEADER_ADDRESS, DISKHEADER_SIZE, m_disk_header.data()); + AddFileToContents(&m_virtual_disc, m_root_directory + "sys/bi2.bin", BI2_ADDRESS, BI2_SIZE); m_virtual_disc.emplace(APPLOADER_ADDRESS, m_apploader.size(), m_apploader.data()); m_virtual_disc.emplace(m_fst_address, m_fst_data.size(), m_fst_data.data()); |