ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DirectoryBlob: Make some constants local

This commit is contained in:
JosJuice 2017-06-10 13:06:39 +02:00
parent 0d4ad0e39e
commit 2ea0a1a086
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DiscIO/DirectoryBlob.cpp
View File

@ -46,14 +46,6 @@ static void ConvertUTF8NamesToSHIFTJIS(File::FSTEntry& parent_entry);
constexpr u8 ENTRY_SIZE = 0x0c; constexpr u8 ENTRY_SIZE = 0x0c;
constexpr u8 FILE_ENTRY = 0; constexpr u8 FILE_ENTRY = 0;
constexpr u8 DIRECTORY_ENTRY = 1; constexpr u8 DIRECTORY_ENTRY = 1;
constexpr u64 DISKHEADER_ADDRESS = 0;
constexpr u64 DISKHEADER_SIZE = 0x440;
constexpr u64 NONPARTITION_DISKHEADER_SIZE = 0x100;
constexpr u64 BI2_ADDRESS = 0x440;
constexpr u64 BI2_SIZE = 0x2000;
constexpr u64 APPLOADER_ADDRESS = 0x2440;
constexpr u64 WII_REGION_DATA_ADDRESS = 0x4E000;
constexpr u64 WII_REGION_DATA_SIZE = 0x20;
constexpr u64 GAME_PARTITION_ADDRESS = 0x50000; constexpr u64 GAME_PARTITION_ADDRESS = 0x50000;
DiscContent::DiscContent(u64 offset, u64 size, const std::string& path) DiscContent::DiscContent(u64 offset, u64 size, const std::string& path)
@ -161,10 +153,12 @@ std::unique_ptr<DirectoryBlobReader> DirectoryBlobReader::Create(const std::stri
} }
DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory) DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory)
: m_root_directory(root_directory), m_disk_header(DISKHEADER_SIZE) : m_root_directory(root_directory)
{ {
SetDiscHeaderAndDiscType(); SetDiscHeaderAndDiscType();
constexpr u64 BI2_ADDRESS = 0x440;
constexpr u64 BI2_SIZE = 0x2000;
AddFileToContents(&m_virtual_disc, m_root_directory + "sys/bi2.bin", BI2_ADDRESS, BI2_SIZE); AddFileToContents(&m_virtual_disc, m_root_directory + "sys/bi2.bin", BI2_ADDRESS, BI2_SIZE);
BuildFST(SetDOL(SetApploader())); BuildFST(SetDOL(SetApploader()));
@ -248,6 +242,11 @@ u64 DirectoryBlobReader::GetDataSize() const
void DirectoryBlobReader::SetDiscHeaderAndDiscType() void DirectoryBlobReader::SetDiscHeaderAndDiscType()
{ {
constexpr u64 DISKHEADER_ADDRESS = 0;
constexpr u64 DISKHEADER_SIZE = 0x440;
constexpr u64 NONPARTITION_DISKHEADER_SIZE = 0x100;
m_disk_header.resize(DISKHEADER_SIZE);
const std::string boot_bin_path = m_root_directory + "sys/boot.bin"; const std::string boot_bin_path = m_root_directory + "sys/boot.bin";
if (ReadFileToVector(boot_bin_path, &m_disk_header) < 0x20) if (ReadFileToVector(boot_bin_path, &m_disk_header) < 0x20)
ERROR_LOG(DISCIO, "%s doesn't exist or is too small", boot_bin_path.c_str()); ERROR_LOG(DISCIO, "%s doesn't exist or is too small", boot_bin_path.c_str());
@ -310,6 +309,8 @@ void DirectoryBlobReader::SetWiiRegionData()
else if (bytes_read < 0x20) else if (bytes_read < 0x20)
ERROR_LOG(DISCIO, "Couldn't read age ratings from %s", region_bin_path.c_str()); ERROR_LOG(DISCIO, "Couldn't read age ratings from %s", region_bin_path.c_str());
constexpr u64 WII_REGION_DATA_ADDRESS = 0x4E000;
constexpr u64 WII_REGION_DATA_SIZE = 0x20;
m_nonpartition_contents.emplace(WII_REGION_DATA_ADDRESS, WII_REGION_DATA_SIZE, m_nonpartition_contents.emplace(WII_REGION_DATA_ADDRESS, WII_REGION_DATA_SIZE,
m_wii_region_data.data()); m_wii_region_data.data());
} }
@ -358,6 +359,8 @@ u64 DirectoryBlobReader::SetApploader()
Write32(static_cast<u32>(-1), 0x10, &m_apploader); Write32(static_cast<u32>(-1), 0x10, &m_apploader);
} }
constexpr u64 APPLOADER_ADDRESS = 0x2440;
m_virtual_disc.emplace(APPLOADER_ADDRESS, m_apploader.size(), m_apploader.data()); m_virtual_disc.emplace(APPLOADER_ADDRESS, m_apploader.size(), m_apploader.data());
// Return DOL address, 32 byte aligned (plus 32 byte padding) // Return DOL address, 32 byte aligned (plus 32 byte padding)