ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DirectoryBlob: Prepare more for supporting multiple partitions

This commit is contained in:
JosJuice 2017-06-10 17:51:22 +02:00
parent a3ee61e1a9
commit d84bee3ff4
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/DiscIO/DirectoryBlob.cpp
View File

@ -10,6 +10,7 @@
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
#include <locale> #include <locale>
#include <map>
#include <memory> #include <memory>
#include <set> #include <set>
#include <string> #include <string>
@ -156,13 +157,21 @@ std::unique_ptr<DirectoryBlobReader> DirectoryBlobReader::Create(const std::stri
} }
DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory) DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory)
: m_root_directory(root_directory), m_game_partition(root_directory, {}) : m_root_directory(root_directory)
{ {
m_is_wii = m_game_partition.IsWii(); DirectoryBlobPartition game_partition(root_directory, {});
m_is_wii = game_partition.IsWii();
if (m_is_wii) if (!m_is_wii)
{ {
SetNonpartitionDiscHeader(m_game_partition.GetHeader()); m_gamecube_pseudopartition = std::move(game_partition);
}
else
{
SetNonpartitionDiscHeader(game_partition.GetHeader());
m_partitions.emplace(GAME_PARTITION_ADDRESS, std::move(game_partition));
SetPartitionTable(); SetPartitionTable();
SetWiiRegionData(); SetWiiRegionData();
SetTMDAndTicket(); SetTMDAndTicket();
@ -205,8 +214,9 @@ bool DirectoryBlobReader::Read(u64 offset, u64 length, u8* buffer)
{ {
// TODO: We don't handle raw access to the encrypted area of Wii discs correctly. // TODO: We don't handle raw access to the encrypted area of Wii discs correctly.
return ReadInternal(offset, length, buffer, const std::set<DiscContent>& contents =
m_is_wii ? m_nonpartition_contents : m_game_partition.GetContents()); m_is_wii ? m_nonpartition_contents : m_gamecube_pseudopartition.GetContents();
return ReadInternal(offset, length, buffer, contents);
} }
bool DirectoryBlobReader::SupportsReadWiiDecrypted() const bool DirectoryBlobReader::SupportsReadWiiDecrypted() const
@ -216,10 +226,14 @@ bool DirectoryBlobReader::SupportsReadWiiDecrypted() const
bool DirectoryBlobReader::ReadWiiDecrypted(u64 offset, u64 size, u8* buffer, u64 partition_offset) bool DirectoryBlobReader::ReadWiiDecrypted(u64 offset, u64 size, u8* buffer, u64 partition_offset)
{ {
if (!m_is_wii || partition_offset != GAME_PARTITION_ADDRESS) if (!m_is_wii)
return false; return false;
return ReadInternal(offset, size, buffer, m_game_partition.GetContents()); auto it = m_partitions.find(partition_offset);
if (it == m_partitions.end())
return false;
return ReadInternal(offset, size, buffer, it->second.GetContents());
} }
BlobType DirectoryBlobReader::GetBlobType() const BlobType DirectoryBlobReader::GetBlobType() const

12
Source/Core/DiscIO/DirectoryBlob.h
View File

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <map>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <set> #include <set>
@ -55,6 +56,7 @@ private:
class DirectoryBlobPartition class DirectoryBlobPartition
{ {
public: public:
DirectoryBlobPartition() = default;
DirectoryBlobPartition(const std::string& root_directory, std::optional<bool> is_wii); DirectoryBlobPartition(const std::string& root_directory, std::optional<bool> is_wii);
// We do not allow copying, because it might mess up the pointers inside DiscContents // We do not allow copying, because it might mess up the pointers inside DiscContents
@ -90,9 +92,9 @@ private:
std::vector<u8> m_fst_data; std::vector<u8> m_fst_data;
std::string m_root_directory; std::string m_root_directory;
bool m_is_wii; bool m_is_wii = false;
// GameCube has no shift, Wii has 2 bit shift // GameCube has no shift, Wii has 2 bit shift
u32 m_address_shift; u32 m_address_shift = 0;
}; };
class DirectoryBlobReader : public BlobReader class DirectoryBlobReader : public BlobReader
@ -126,8 +128,12 @@ private:
std::string m_root_directory; std::string m_root_directory;
DirectoryBlobPartition m_game_partition; // For GameCube:
DirectoryBlobPartition m_gamecube_pseudopartition;
// For Wii:
std::set<DiscContent> m_nonpartition_contents; std::set<DiscContent> m_nonpartition_contents;
std::map<u64, DirectoryBlobPartition> m_partitions;
bool m_is_wii; bool m_is_wii;