ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDROM: Don't queue up a second INT1 when one is still pending

This commit is contained in:
Connor McLaughlin 2020-03-24 00:21:22 +10:00
parent 40d6be7142
commit c8af4abad8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/cdrom.cpp
View File

@ -422,6 +422,14 @@ void CDROM::SetInterrupt(Interrupt interrupt)
void CDROM::SetAsyncInterrupt(Interrupt interrupt)
{
if (m_interrupt_flag_register == static_cast<u8>(interrupt))
{
Log_WarningPrintf("Not setting async interrupt %u because there is already one unacknowledged",
static_cast<u8>(interrupt));
m_async_response_fifo.Clear();
return;
}
Assert(m_pending_async_interrupt == 0);
m_pending_async_interrupt = static_cast<u8>(interrupt);
if (!HasPendingInterrupt())
@ -1418,13 +1426,6 @@ void CDROM::ProcessDataSector(const u8* raw_sector, const CDImage::SubChannelQ&
}
}
// Deliver to CPU
if (HasPendingAsyncInterrupt())
{
Log_WarningPrintf("Data interrupt was not delivered");
ClearAsyncInterrupt();
}
// TODO: How does XA relate to this buffering?
SectorBuffer* sb = &m_sector_buffers[0];
if (sb->size > 0)
@ -1450,6 +1451,13 @@ void CDROM::ProcessDataSector(const u8* raw_sector, const CDImage::SubChannelQ&
sb->size = DATA_SECTOR_OUTPUT_SIZE;
}
// Deliver to CPU
if (HasPendingAsyncInterrupt())
{
Log_WarningPrintf("Data interrupt was not delivered");
ClearAsyncInterrupt();
}
m_async_response_fifo.Push(m_secondary_status.bits);
SetAsyncInterrupt(Interrupt::DataReady);
}