Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 13:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Ignore Read/Play command without setloc/param

Browse source 
Fixes title screen music in Monkey Magic.
This commit is contained in:
Connor McLaughlin 2020-05-11 22:55:13 +10:00
parent 65c42cd30e
commit 37d9f6344d
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/cdrom.cpp
View file

@ -477,7 +477,7 @@ void CDROM::ClearAsyncInterrupt()
void CDROM::DeliverAsyncInterrupt() void CDROM::DeliverAsyncInterrupt()
{ {
Assert(m_pending_async_interrupt != 0 && !HasPendingInterrupt()); Assert(m_pending_async_interrupt != 0 && !HasPendingInterrupt());
Log_DevPrintf("Delivering async interrupt %u", m_pending_async_interrupt); Log_DebugPrintf("Delivering async interrupt %u", m_pending_async_interrupt);
m_response_fifo.Clear(); m_response_fifo.Clear();
m_response_fifo.PushFromQueue(&m_async_response_fifo); m_response_fifo.PushFromQueue(&m_async_response_fifo);
@ -760,7 +760,18 @@ void CDROM::ExecuteCommand()
else else
{ {
SendACKAndStat(); SendACKAndStat();
BeginReading();
if (!m_setloc_pending &&
(m_drive_state == DriveState::Reading ||
((m_drive_state == DriveState::SeekingPhysical || m_drive_state == DriveState::SeekingLogical) &&
m_read_after_seek)))
{
Log_DevPrintf("Ignoring read command with no setloc, already reading/reading after seek");
}
else
{
BeginReading();
}
} }
EndCommand(); EndCommand();
@ -779,7 +790,18 @@ void CDROM::ExecuteCommand()
else else
{ {
SendACKAndStat(); SendACKAndStat();
BeginPlaying(track);
if (!m_setloc_pending && track == 0 &&
(m_drive_state == DriveState::Playing ||
((m_drive_state == DriveState::SeekingPhysical || m_drive_state == DriveState::SeekingLogical) &&
m_play_after_seek)))
{
Log_DevPrintf("Ignoring play command with no setloc/track, already playing/playing after seek");
}
else
{
BeginPlaying(track);
}
} }
EndCommand(); EndCommand();
@ -1867,7 +1889,7 @@ void CDROM::LoadDataFIFO()
sb.size = 0; sb.size = 0;
} }
Log_DevPrintf("Loaded %u bytes to data FIFO from buffer %u", m_data_fifo.GetSize(), m_current_read_sector_buffer); Log_DebugPrintf("Loaded %u bytes to data FIFO from buffer %u", m_data_fifo.GetSize(), m_current_read_sector_buffer);
m_current_read_sector_buffer = m_current_write_sector_buffer; m_current_read_sector_buffer = m_current_write_sector_buffer;
} }