diff options
| author | Léo Lam <leo@leolam.fr> | 2021-09-20 14:25:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 14:25:59 +0200 |
| commit | e7c0b8ecbdb877c896d44e0ab1f9c00d2f2b667e (patch) | |
| tree | ecc1578ff9ff9d503d642c0623b0b0efcbe4dbed /Source/Core/DiscIO/DiscScrubber.cpp | |
| parent | 70a9003947b12dc92821b99799d915e1de347daa (diff) | |
| parent | ad410009bb98f1dd849a402ff5ba337cece71c7e (diff) | |
Merge pull request #10114 from AdmiralCurtiss/disc-addresses
Core/DiscIO: Extract disc and partition constants to DiscUtils.h.
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DiscScrubber.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 1b2db29a77..de0f17bb64 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -132,11 +132,16 @@ bool DiscScrubber::ParseDisc() u64 h3_offset; // The H3 size is always 0x18000 - if (!ReadFromVolume(partition.offset + 0x2a4, tmd_size, PARTITION_NONE) || - !ReadFromVolume(partition.offset + 0x2a8, tmd_offset, PARTITION_NONE) || - !ReadFromVolume(partition.offset + 0x2ac, cert_chain_size, PARTITION_NONE) || - !ReadFromVolume(partition.offset + 0x2b0, cert_chain_offset, PARTITION_NONE) || - !ReadFromVolume(partition.offset + 0x2b4, h3_offset, PARTITION_NONE)) + if (!ReadFromVolume(partition.offset + WII_PARTITION_TMD_SIZE_ADDRESS, tmd_size, + PARTITION_NONE) || + !ReadFromVolume(partition.offset + WII_PARTITION_TMD_OFFSET_ADDRESS, tmd_offset, + PARTITION_NONE) || + !ReadFromVolume(partition.offset + WII_PARTITION_CERT_CHAIN_SIZE_ADDRESS, cert_chain_size, + PARTITION_NONE) || + !ReadFromVolume(partition.offset + WII_PARTITION_CERT_CHAIN_OFFSET_ADDRESS, + cert_chain_offset, PARTITION_NONE) || + !ReadFromVolume(partition.offset + WII_PARTITION_H3_OFFSET_ADDRESS, h3_offset, + PARTITION_NONE)) { return false; } @@ -145,7 +150,7 @@ bool DiscScrubber::ParseDisc() MarkAsUsed(partition.offset + tmd_offset, tmd_size); MarkAsUsed(partition.offset + cert_chain_offset, cert_chain_size); - MarkAsUsed(partition.offset + h3_offset, 0x18000); + MarkAsUsed(partition.offset + h3_offset, WII_PARTITION_H3_SIZE); // Parse Data! This is where the big gain is if (!ParsePartitionData(partition)) |