diff options
| author | JosJuice <josjuice@gmail.com> | 2015-04-21 11:33:51 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-05-16 22:56:53 +0200 |
| commit | 74d84c5af2c82f5395ce2d67d4f901a4e1825185 (patch) | |
| tree | b3a4967b466adee2dfdf8ed41df2c8cf14513048 /Source/Core/DiscIO/VolumeWiiCrypted.cpp | |
| parent | 405643b902b5b4ec84822551269dfede780b38c7 (diff) | |
VolumeWiiCrypted: Turn m_dataOffset into a constant
Diffstat (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWiiCrypted.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index d37df8d9c7..a78b3017d5 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -29,10 +29,12 @@ namespace DiscIO { +constexpr u64 PARTITION_DATA_OFFSET = 0x20000; + CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr<IBlobReader> reader, u64 _VolumeOffset, const unsigned char* _pVolumeKey) : m_pReader(std::move(reader)), m_AES_ctx(std::make_unique<mbedtls_aes_context>()), - m_VolumeOffset(_VolumeOffset), m_dataOffset(0x20000), m_last_decrypted_block(-1) + m_VolumeOffset(_VolumeOffset), m_last_decrypted_block(-1) { _assert_(m_pReader); @@ -63,7 +65,7 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer, bool de { // Calculate offsets u64 block_offset_on_disc = - m_VolumeOffset + m_dataOffset + _ReadOffset / BLOCK_DATA_SIZE * BLOCK_TOTAL_SIZE; + _ReadOffset / BLOCK_DATA_SIZE * BLOCK_TOTAL_SIZE + m_VolumeOffset + PARTITION_DATA_OFFSET; u64 data_offset_in_block = _ReadOffset % BLOCK_DATA_SIZE; if (m_last_decrypted_block != block_offset_on_disc) @@ -143,7 +145,7 @@ IOS::ES::TMDReader CVolumeWiiCrypted::GetTMD() const u64 CVolumeWiiCrypted::PartitionOffsetToRawOffset(u64 offset) const { - return m_VolumeOffset + m_dataOffset + (offset / BLOCK_DATA_SIZE * BLOCK_TOTAL_SIZE) + + return m_VolumeOffset + PARTITION_DATA_OFFSET + (offset / BLOCK_DATA_SIZE * BLOCK_TOTAL_SIZE) + (offset % BLOCK_DATA_SIZE); } @@ -286,7 +288,7 @@ bool CVolumeWiiCrypted::CheckIntegrity() const u32 nClusters = (u32)(partDataSize / 0x8000); for (u32 clusterID = 0; clusterID < nClusters; ++clusterID) { - u64 clusterOff = m_VolumeOffset + m_dataOffset + (u64)clusterID * 0x8000; + u64 clusterOff = m_VolumeOffset + PARTITION_DATA_OFFSET + (u64)clusterID * 0x8000; // Read and decrypt the cluster metadata u8 clusterMDCrypted[0x400]; |