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

Merge pull request #8560 from Pokechu22/di-mios-fixes 

DI MIOS crash fixes
This commit is contained in:
JosJuice 2020-01-14 11:44:14 +01:00 committed by GitHub
parent 9596fe75f1 ddba80133a
commit a2f2536a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/IOS/DI/DI.cpp
View File

@ -526,6 +526,16 @@ std::optional<DI::DIResult> DI::StartImmediateTransfer(const IOCtlRequest& reque
return {}; return {};
} }
static std::shared_ptr<DI> GetDevice()
{
auto ios = IOS::HLE::GetIOS();
if (!ios)
return nullptr;
auto di = ios->GetDeviceByName("/dev/di");
// di may be empty, but static_pointer_cast returns empty in that case
return std::static_pointer_cast<DI>(di);
}
void DI::InterruptFromDVDInterface(DVDInterface::DIInterruptType interrupt_type) void DI::InterruptFromDVDInterface(DVDInterface::DIInterruptType interrupt_type)
{ {
DIResult result; DIResult result;
@ -544,10 +554,10 @@ void DI::InterruptFromDVDInterface(DVDInterface::DIInterruptType interrupt_type)
break; break;
} }
auto di = IOS::HLE::GetIOS()->GetDeviceByName("/dev/di"); auto di = GetDevice();
if (di) if (di)
{ {
std::static_pointer_cast<DI>(di)->FinishDICommand(result); di->FinishDICommand(result);
} }
else else
{ {
@ -560,9 +570,9 @@ void DI::FinishDICommandCallback(u64 userdata, s64 ticksbehind)
{ {
const DIResult result = static_cast<DIResult>(userdata); const DIResult result = static_cast<DIResult>(userdata);
auto di = IOS::HLE::GetIOS()->GetDeviceByName("/dev/di"); auto di = GetDevice();
if (di) if (di)
std::static_pointer_cast<DI>(di)->FinishDICommand(result); di->FinishDICommand(result);
else else
PanicAlert("IOS::HLE::Device::DI: Received interrupt from DI when device wasn't registered!"); PanicAlert("IOS::HLE::Device::DI: Received interrupt from DI when device wasn't registered!");
} }
@ -691,12 +701,12 @@ void DI::ChangePartition(const DiscIO::Partition partition)
DiscIO::Partition DI::GetCurrentPartition() DiscIO::Partition DI::GetCurrentPartition()
{ {
auto di = IOS::HLE::GetIOS()->GetDeviceByName("/dev/di"); auto di = GetDevice();
// Note that this function is called in Gamecube mode for UpdateRunningGameMetadata, // Note that this function is called in Gamecube mode for UpdateRunningGameMetadata,
// so both cases are hit in normal circumstances. // so both cases are hit in normal circumstances.
if (!di) if (!di)
return DiscIO::PARTITION_NONE; return DiscIO::PARTITION_NONE;
return std::static_pointer_cast<DI>(di)->m_current_partition; return di->m_current_partition;
} }
void DI::InitializeIfFirstTime() void DI::InitializeIfFirstTime()

5
Source/Core/Core/IOS/MIOS.cpp
View File

@ -34,7 +34,10 @@ static void ReinitHardware()
// IOS clears mem2 and overwrites it with pseudo-random data (for security). // IOS clears mem2 and overwrites it with pseudo-random data (for security).
std::memset(Memory::m_pEXRAM, 0, Memory::EXRAM_SIZE); std::memset(Memory::m_pEXRAM, 0, Memory::EXRAM_SIZE);
// MIOS appears to only reset the DI and the PPC. // MIOS appears to only reset the DI and the PPC.
DVDInterface::Reset(); // HACK However, resetting DI will reset the DTK config, which is set by the system menu
// (and not by MIOS), causing games that use DTK to break. Perhaps MIOS doesn't actually
// reset DI fully, in such a way that the DTK config isn't cleared?
// DVDInterface::Reset();
PowerPC::Reset(); PowerPC::Reset();
Wiimote::ResetAllWiimotes(); Wiimote::ResetAllWiimotes();
// Note: this is specific to Dolphin and is required because we initialised it in Wii mode. // Note: this is specific to Dolphin and is required because we initialised it in Wii mode.