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

CDROM: Hack around missing pregap in images

This commit is contained in:
Connor McLaughlin 2019-09-22 02:32:45 +10:00
parent 948ac50020
commit 3fb08a72a4
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cd_image.cpp
View File

@ -92,7 +92,7 @@ u32 CDImage::Read(ReadMode read_mode, u32 sector_count, void* buffer)
switch (read_mode) switch (read_mode)
{ {
case ReadMode::DataOnly: case ReadMode::DataOnly:
std::memcpy(buffer_ptr, raw_sector + SECTOR_SYNC_SIZE, DATA_SECTOR_SIZE); std::memcpy(buffer_ptr, raw_sector + 24, DATA_SECTOR_SIZE);
buffer_ptr += DATA_SECTOR_SIZE; buffer_ptr += DATA_SECTOR_SIZE;
break; break;

33
src/pse/cdrom.cpp
View File

@ -278,7 +278,7 @@ u32 CDROM::DMARead()
m_data_fifo.Clear(); m_data_fifo.Clear();
} }
Log_DebugPrintf("DMA Read -> 0x%08X", data); // Log_DebugPrintf("DMA Read -> 0x%08X", data);
return data; return data;
} }
@ -430,9 +430,9 @@ void CDROM::ExecuteCommand()
case Command::Setloc: case Command::Setloc:
{ {
// TODO: Verify parameter count // TODO: Verify parameter count
m_setloc.minute = m_param_fifo.Peek(0); m_setloc.minute = BCDToDecimal(m_param_fifo.Peek(0));
m_setloc.second = m_param_fifo.Peek(1); m_setloc.second = BCDToDecimal(m_param_fifo.Peek(1));
m_setloc.frame = m_param_fifo.Peek(2); m_setloc.frame = BCDToDecimal(m_param_fifo.Peek(2));
Log_DebugPrintf("CDROM setloc command (%u, %u, %u)", ZeroExtend32(m_setloc.minute), ZeroExtend32(m_setloc.second), Log_DebugPrintf("CDROM setloc command (%u, %u, %u)", ZeroExtend32(m_setloc.minute), ZeroExtend32(m_setloc.second),
ZeroExtend32(m_setloc.frame)); ZeroExtend32(m_setloc.frame));
m_response_fifo.Push(m_secondary_status.bits); m_response_fifo.Push(m_secondary_status.bits);
@ -450,7 +450,7 @@ void CDROM::ExecuteCommand()
if (m_command_stage == 0) if (m_command_stage == 0)
{ {
StopReading(); StopReading();
if (!m_media || !m_media->Seek(m_setloc.minute, m_setloc.second, m_setloc.frame)) if (!m_media || !m_media->Seek(m_setloc.minute, m_setloc.second - 2 /* pregap */, m_setloc.frame))
{ {
Panic("Error in Setloc command"); Panic("Error in Setloc command");
return; return;
@ -517,6 +517,27 @@ void CDROM::ExecuteCommand()
return; return;
} }
case Command::Init:
{
if (m_command_stage == 0)
{
Log_DebugPrintf("CDROM init command");
m_response_fifo.Push(m_secondary_status.bits);
SetInterrupt(Interrupt::INT3);
StopReading();
NextCommandStage(true, 100);
}
else
{
m_response_fifo.Push(m_secondary_status.bits);
SetInterrupt(Interrupt::INT2);
EndCommand();
}
return;
}
break;
default: default:
Panic("Unknown command"); Panic("Unknown command");
break; break;
@ -575,7 +596,7 @@ void CDROM::DoSectorRead()
if (HasPendingInterrupt()) if (HasPendingInterrupt())
{ {
// can't read with a pending interrupt? // can't read with a pending interrupt?
m_sector_read_remaining_ticks += 100; m_sector_read_remaining_ticks += 10;
m_system->SetDowncount(m_sector_read_remaining_ticks); m_system->SetDowncount(m_sector_read_remaining_ticks);
return; return;
} }