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 #8733 from JosJuice/di-baten-kaitos 

Adjust s_DIMAR/s_DILENGTH behavior (fixes Baten Kaitos music)
This commit is contained in:
JMC47 2020-04-16 18:28:09 -04:00 committed by GitHub
parent 19fc43f190 94f83db2b5
commit 85a8325701
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/HW/DVD/DVDInterface.cpp
View File

@ -1233,8 +1233,17 @@ void SetHighError(u32 high_error)
void FinishExecutingCommand(ReplyType reply_type, DIInterruptType interrupt_type, s64 cycles_late,
const std::vector<u8>& data)
{
s_DIMAR += s_DILENGTH;
s_DILENGTH = 0;
// The data parameter contains the requested data iff this was called from DVDThread, and is
// empty otherwise. DVDThread is the only source of ReplyType::NoReply and ReplyType::DTK.
u32 transfer_size = 0;
if (reply_type == ReplyType::NoReply)
transfer_size = static_cast<u32>(data.size());
else if (reply_type == ReplyType::Interrupt || reply_type == ReplyType::IOS)
transfer_size = s_DILENGTH;
s_DIMAR += transfer_size;
s_DILENGTH -= transfer_size;
switch (reply_type)
{