From ce3e0fc091efccf84145fead400edf73f8effd8e Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 20 Sep 2018 19:32:52 +0200 Subject: Refactor DiscScrubber::MarkAsUsedE --- Source/Core/DiscIO/DiscScrubber.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/DiscScrubber.cpp') diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index dac858fcda..4830fbc403 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -106,10 +106,9 @@ void DiscScrubber::MarkAsUsed(u64 offset, u64 size) } } -// Compensate for 0x400 (SHA-1) per 0x8000 (cluster), and round to whole clusters void DiscScrubber::MarkAsUsedE(u64 partition_data_offset, u64 offset, u64 size) { - u64 first_cluster_start = offset / 0x7c00 * CLUSTER_SIZE + partition_data_offset; + u64 first_cluster_start = ToClusterOffset(offset) + partition_data_offset; u64 last_cluster_end; if (size == 0) @@ -119,12 +118,18 @@ void DiscScrubber::MarkAsUsedE(u64 partition_data_offset, u64 offset, u64 size) } else { - last_cluster_end = ((offset + size - 1) / 0x7c00 + 1) * CLUSTER_SIZE + partition_data_offset; + last_cluster_end = ToClusterOffset(offset + size - 1) + CLUSTER_SIZE + partition_data_offset; } MarkAsUsed(first_cluster_start, last_cluster_end - first_cluster_start); } +// Compensate for 0x400 (SHA-1) per 0x8000 (cluster), and round to whole clusters +u64 DiscScrubber::ToClusterOffset(u64 offset) const +{ + return offset / 0x7c00 * CLUSTER_SIZE; +} + // Helper functions for reading the BE volume bool DiscScrubber::ReadFromVolume(u64 offset, u32& buffer, const Partition& partition) { -- cgit v1.2.3