Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 14:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Hold position at end of track, not start of next

Browse source
This commit is contained in:
Connor McLaughlin 2021-03-19 01:58:43 +10:00
parent 11dcba1b68
commit 25d4060bce
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core/cdrom.cpp
View file

@ -1908,20 +1908,14 @@ void CDROM::StopReadingWithDataEnd()
void CDROM::DoSectorRead() void CDROM::DoSectorRead()
{ {
// TODO: Queue the next read here and swap the buffer.
if (!m_reader.WaitForReadToComplete()) if (!m_reader.WaitForReadToComplete())
Panic("Sector read failed"); Panic("Sector read failed");
// TODO: Queue the next read here and swap the buffer.
m_current_lba = m_reader.GetLastReadSector();
ResetPhysicalPosition();
// TODO: Error handling // TODO: Error handling
const CDImage::SubChannelQ& subq = m_reader.GetSectorSubQ(); const CDImage::SubChannelQ& subq = m_reader.GetSectorSubQ();
if (subq.IsCRCValid()) const bool subq_valid = subq.IsCRCValid();
{ if (!subq_valid)
m_last_subq = subq;
}
else
{ {
const CDImage::Position pos(CDImage::Position::FromLBA(m_current_lba)); const CDImage::Position pos(CDImage::Position::FromLBA(m_current_lba));
Log_DevPrintf("Sector %u [%02u:%02u:%02u] has invalid subchannel Q", m_current_lba, pos.minute, pos.second, Log_DevPrintf("Sector %u [%02u:%02u:%02u] has invalid subchannel Q", m_current_lba, pos.minute, pos.second,
@ -1930,8 +1924,9 @@ void CDROM::DoSectorRead()
if (subq.track_number_bcd == CDImage::LEAD_OUT_TRACK_NUMBER) if (subq.track_number_bcd == CDImage::LEAD_OUT_TRACK_NUMBER)
{ {
Log_DevPrintf("Read reached lead-out area of disc at LBA %u, pausing", m_reader.GetLastReadSector()); Log_DevPrintf("Read reached lead-out area of disc at LBA %u, stopping", m_reader.GetLastReadSector());
StopReadingWithDataEnd(); StopReadingWithDataEnd();
m_secondary_status.motor_on = false;
return; return;
} }
@ -1947,9 +1942,7 @@ void CDROM::DoSectorRead()
else if (m_mode.auto_pause && subq.track_number_bcd != m_play_track_number_bcd) else if (m_mode.auto_pause && subq.track_number_bcd != m_play_track_number_bcd)
{ {
// we don't want to update the position if the track changes, so we check it before reading the actual sector. // we don't want to update the position if the track changes, so we check it before reading the actual sector.
Log_DevPrintf("Auto pause at the end of track %u (LBA %u)", m_play_track_number_bcd, Log_DevPrintf("Auto pause at the end of track %02x (LBA %u)", m_last_subq.track_number_bcd, m_current_lba);
m_reader.GetLastReadSector());
StopReadingWithDataEnd(); StopReadingWithDataEnd();
return; return;
} }
@ -1959,6 +1952,11 @@ void CDROM::DoSectorRead()
ProcessDataSectorHeader(m_reader.GetSectorBuffer().data()); ProcessDataSectorHeader(m_reader.GetSectorBuffer().data());
} }
m_current_lba = m_reader.GetLastReadSector();
ResetPhysicalPosition();
if (subq_valid)
m_last_subq = subq;
u32 next_sector = m_current_lba + 1u; u32 next_sector = m_current_lba + 1u;
if (is_data_sector && m_drive_state == DriveState::Reading) if (is_data_sector && m_drive_state == DriveState::Reading)
{ {