summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/DiscScrubber.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-06-17 12:37:30 +0200
committerJosJuice <josjuice@gmail.com>2017-06-28 22:21:23 +0200
commitd06b532150bbf969476f73ea93213c65e203558c (patch)
treecac2ef4c951aca4808052523b448aff7297effe4 /Source/Core/DiscIO/DiscScrubber.cpp
parent23bb029250ddd3b71310c83ee977ba41bf75314f (diff)
DiscIO: Move parts of Filesystem to the new file DiscExtractor
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
-rw-r--r--Source/Core/DiscIO/DiscScrubber.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp
index 838df208cf..52d907be69 100644
--- a/Source/Core/DiscIO/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/DiscScrubber.cpp
@@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include "DiscIO/DiscScrubber.h"
+
#include <algorithm>
#include <cinttypes>
#include <cstddef>
@@ -14,7 +16,8 @@
#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/Logging/Log.h"
-#include "DiscIO/DiscScrubber.h"
+
+#include "DiscIO/DiscExtractor.h"
#include "DiscIO/Filesystem.h"
#include "DiscIO/Volume.h"
@@ -200,10 +203,10 @@ bool DiscScrubber::ParsePartitionData(const Partition& partition, PartitionHeade
0x2440 + header->apploader_size + header->apploader_trailer_size);
// DOL
- const std::optional<u64> dol_offset = filesystem->GetBootDOLOffset();
+ const std::optional<u64> dol_offset = GetBootDOLOffset(*m_disc, partition);
if (!dol_offset)
return false;
- const std::optional<u64> dol_size = filesystem->GetBootDOLSize(*dol_offset);
+ const std::optional<u64> dol_size = GetBootDOLSize(*m_disc, partition, *dol_offset);
if (!dol_size)
return false;
header->dol_offset = *dol_offset;