CDROM: Don't crash when booting the BIOS without media

This commit is contained in:
Connor McLaughlin 2019-09-30 01:08:17 +10:00
parent c4574027e0
commit 53ff458754

View file

@ -128,6 +128,12 @@ u8 CDROM::ReadRegister(u32 offset)
case 1: // always response FIFO case 1: // always response FIFO
{ {
if (m_response_fifo.IsEmpty())
{
Log_DebugPrintf("Response FIFO empty on read");
return 0xFF;
}
const u8 value = m_response_fifo.Pop(); const u8 value = m_response_fifo.Pop();
UpdateStatusRegister(); UpdateStatusRegister();
Log_DebugPrintf("CDROM read response FIFO <- 0x%08X", ZeroExtend32(value)); Log_DebugPrintf("CDROM read response FIFO <- 0x%08X", ZeroExtend32(value));
@ -749,7 +755,7 @@ void CDROM::DoSectorRead()
// return; // return;
} }
Log_DebugPrintf("Reading sector %llu", m_media->GetCurrentLBA()); Log_DevPrintf("Reading sector %llu", m_media->GetCurrentLBA());
// TODO: Error handling // TODO: Error handling
// TODO: Sector buffer should be two sectors? // TODO: Sector buffer should be two sectors?