From 4d77d12f01c8608be2c9a745626ba39f1c199155 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 17 Oct 2015 17:48:24 +0200 Subject: [PATCH] Remove length parameter from DiscScrubber::ReadFromVolume The function only makes sense when the length is 4. All current callers use the length 4, so this change doesn't affect any behavior. --- Source/Core/DiscIO/DiscScrubber.cpp | 44 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 938b0d04eb..db68027f8c 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -74,8 +74,8 @@ static SPartitionGroup PartitionGroup[4]; void MarkAsUsed(u64 _Offset, u64 _Size); void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size); -void ReadFromVolume(u64 _Offset, u64 _Length, u32& _Buffer, bool _Decrypt); -void ReadFromVolume(u64 _Offset, u64 _Length, u64& _Buffer, bool _Decrypt); +void ReadFromVolume(u64 _Offset, u32& _Buffer, bool _Decrypt); +void ReadFromVolume(u64 _Offset, u64& _Buffer, bool _Decrypt); bool ParseDisc(); bool ParsePartitionData(SPartition& _rPartition); @@ -189,14 +189,14 @@ void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size) } // Helper functions for reading the BE volume -void ReadFromVolume(u64 _Offset, u64 _Length, u32& _Buffer, bool _Decrypt) +void ReadFromVolume(u64 _Offset, u32& _Buffer, bool _Decrypt) { - m_Disc->Read(_Offset, _Length, (u8*)&_Buffer, _Decrypt); + m_Disc->Read(_Offset, sizeof(u32), (u8*)&_Buffer, _Decrypt); _Buffer = Common::swap32(_Buffer); } -void ReadFromVolume(u64 _Offset, u64 _Length, u64& _Buffer, bool _Decrypt) +void ReadFromVolume(u64 _Offset, u64& _Buffer, bool _Decrypt) { - m_Disc->Read(_Offset, _Length, (u8*)&_Buffer, _Decrypt); + m_Disc->Read(_Offset, sizeof(u32), (u8*)&_Buffer, _Decrypt); _Buffer = Common::swap32((u32)_Buffer); _Buffer <<= 2; } @@ -208,8 +208,8 @@ bool ParseDisc() for (int x = 0; x < 4; x++) { - ReadFromVolume(0x40000 + (x * 8) + 0, 4, PartitionGroup[x].numPartitions, false); - ReadFromVolume(0x40000 + (x * 8) + 4, 4, PartitionGroup[x].PartitionsOffset, false); + ReadFromVolume(0x40000 + (x * 8) + 0, PartitionGroup[x].numPartitions, false); + ReadFromVolume(0x40000 + (x * 8) + 4, PartitionGroup[x].PartitionsOffset, false); // Read all partitions for (u32 i = 0; i < PartitionGroup[x].numPartitions; i++) @@ -219,16 +219,16 @@ bool ParseDisc() Partition.GroupNumber = x; Partition.Number = i; - ReadFromVolume(PartitionGroup[x].PartitionsOffset + (i * 8) + 0, 4, Partition.Offset, false); - ReadFromVolume(PartitionGroup[x].PartitionsOffset + (i * 8) + 4, 4, Partition.Type, false); + ReadFromVolume(PartitionGroup[x].PartitionsOffset + (i * 8) + 0, Partition.Offset, false); + ReadFromVolume(PartitionGroup[x].PartitionsOffset + (i * 8) + 4, Partition.Type, false); - ReadFromVolume(Partition.Offset + 0x2a4, 4, Partition.Header.TMDSize, false); - ReadFromVolume(Partition.Offset + 0x2a8, 4, Partition.Header.TMDOffset, false); - ReadFromVolume(Partition.Offset + 0x2ac, 4, Partition.Header.CertChainSize, false); - ReadFromVolume(Partition.Offset + 0x2b0, 4, Partition.Header.CertChainOffset, false); - ReadFromVolume(Partition.Offset + 0x2b4, 4, Partition.Header.H3Offset, false); - ReadFromVolume(Partition.Offset + 0x2b8, 4, Partition.Header.DataOffset, false); - ReadFromVolume(Partition.Offset + 0x2bc, 4, Partition.Header.DataSize, false); + ReadFromVolume(Partition.Offset + 0x2a4, Partition.Header.TMDSize, false); + ReadFromVolume(Partition.Offset + 0x2a8, Partition.Header.TMDOffset, false); + ReadFromVolume(Partition.Offset + 0x2ac, Partition.Header.CertChainSize, false); + ReadFromVolume(Partition.Offset + 0x2b0, Partition.Header.CertChainOffset, false); + ReadFromVolume(Partition.Offset + 0x2b4, Partition.Header.H3Offset, false); + ReadFromVolume(Partition.Offset + 0x2b8, Partition.Header.DataOffset, false); + ReadFromVolume(Partition.Offset + 0x2bc, Partition.Header.DataSize, false); PartitionGroup[x].PartitionsVec.push_back(Partition); } @@ -282,8 +282,8 @@ bool ParsePartitionData(SPartition& _rPartition) { // Mark things as used which are not in the filesystem // Header, Header Information, Apploader - ReadFromVolume(0x2440 + 0x14, 4, _rPartition.Header.ApploaderSize, true); - ReadFromVolume(0x2440 + 0x18, 4, _rPartition.Header.ApploaderTrailerSize, true); + ReadFromVolume(0x2440 + 0x14, _rPartition.Header.ApploaderSize, true); + ReadFromVolume(0x2440 + 0x18, _rPartition.Header.ApploaderTrailerSize, true); MarkAsUsedE(_rPartition.Offset + _rPartition.Header.DataOffset , 0 @@ -292,7 +292,7 @@ bool ParsePartitionData(SPartition& _rPartition) + _rPartition.Header.ApploaderTrailerSize); // DOL - ReadFromVolume(0x420, 4, _rPartition.Header.DOLOffset, true); + ReadFromVolume(0x420, _rPartition.Header.DOLOffset, true); _rPartition.Header.DOLSize = filesystem->GetBootDOLSize(_rPartition.Header.DOLOffset); MarkAsUsedE(_rPartition.Offset + _rPartition.Header.DataOffset @@ -300,8 +300,8 @@ bool ParsePartitionData(SPartition& _rPartition) , _rPartition.Header.DOLSize); // FST - ReadFromVolume(0x424, 4, _rPartition.Header.FSTOffset, true); - ReadFromVolume(0x428, 4, _rPartition.Header.FSTSize, true); + ReadFromVolume(0x424, _rPartition.Header.FSTOffset, true); + ReadFromVolume(0x428, _rPartition.Header.FSTSize, true); MarkAsUsedE(_rPartition.Offset + _rPartition.Header.DataOffset , _rPartition.Header.FSTOffset