Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-19 06:45:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Don't choke on non-mode2 sectors

Browse source 
Fixes Formula One 99 circuit selection.
This commit is contained in:
Connor McLaughlin 2020-09-25 00:25:32 +10:00
parent f2c5a51924
commit b05d80ef5c
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/cdrom.cpp
View file

@ -1800,8 +1800,8 @@ void CDROM::ProcessDataSector(const u8* raw_sector, const CDImage::SubChannelQ&
} }
// TODO: How does XA relate to this buffering? // TODO: How does XA relate to this buffering?
m_current_write_sector_buffer = (m_current_write_sector_buffer + 1) % NUM_SECTOR_BUFFERS; const u32 sb_num = (m_current_write_sector_buffer + 1) % NUM_SECTOR_BUFFERS;
SectorBuffer* sb = &m_sector_buffers[m_current_write_sector_buffer]; SectorBuffer* sb = &m_sector_buffers[sb_num];
if (sb->size > 0) if (sb->size > 0)
{ {
Log_DevPrintf("Sector buffer %u was not read, previous sector dropped", Log_DevPrintf("Sector buffer %u was not read, previous sector dropped",
@ -1819,11 +1819,18 @@ void CDROM::ProcessDataSector(const u8* raw_sector, const CDImage::SubChannelQ&
else else
{ {
// TODO: This should actually depend on the mode... // TODO: This should actually depend on the mode...
Assert(m_last_sector_header.sector_mode == 2); if (m_last_sector_header.sector_mode != 2)
{
Log_WarningPrintf("Ignoring non-mode2 sector at %u", m_current_lba);
return;
}
std::memcpy(sb->data.data(), raw_sector + CDImage::SECTOR_SYNC_SIZE + 12, DATA_SECTOR_OUTPUT_SIZE); std::memcpy(sb->data.data(), raw_sector + CDImage::SECTOR_SYNC_SIZE + 12, DATA_SECTOR_OUTPUT_SIZE);
sb->size = DATA_SECTOR_OUTPUT_SIZE; sb->size = DATA_SECTOR_OUTPUT_SIZE;
} }
m_current_write_sector_buffer = sb_num;
// Deliver to CPU // Deliver to CPU
if (HasPendingAsyncInterrupt()) if (HasPendingAsyncInterrupt())
{ {