history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-07 08:15:41 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Prevent games which spam Reset from getting wedged

Browse Source
This commit is contained in:
Connor McLaughlin 2020-07-14 01:26:37 +10:00
parent 9a2f222da4
commit 6ed67468d2
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/cdrom.cpp
View File

@ -474,6 +474,8 @@ void CDROM::RemoveMedia(bool force /* = false */)
m_drive_event->Deactivate(); m_drive_event->Deactivate();
// The console sends an interrupt when the shell is opened regardless of whether a command was executing. // The console sends an interrupt when the shell is opened regardless of whether a command was executing.
if (HasPendingAsyncInterrupt())
ClearAsyncInterrupt();
SendAsyncErrorResponse(STAT_ERROR, 0x08); SendAsyncErrorResponse(STAT_ERROR, 0x08);
// Begin spin-down timer, we can't swap the new disc in immediately for some games (e.g. Metal Gear Solid). // Begin spin-down timer, we can't swap the new disc in immediately for some games (e.g. Metal Gear Solid).
@ -1184,7 +1186,7 @@ void CDROM::ExecuteCommand()
UpdatePositionWhileSeeking(); UpdatePositionWhileSeeking();
m_drive_state = DriveState::Resetting; m_drive_state = DriveState::Resetting;
m_drive_event->SetIntervalAndSchedule(BASE_RESET_TICKS + GetTicksForSeek(0)); m_drive_event->SetIntervalAndSchedule(BASE_RESET_TICKS + ((m_current_lba != 0) ? GetTicksForSeek(0) : 0));
m_seek_start_lba = m_current_lba; m_seek_start_lba = m_current_lba;
m_seek_end_lba = 0; m_seek_end_lba = 0;
@ -1631,13 +1633,22 @@ void CDROM::UpdatePositionWhileSeeking()
CDImage::LBA current_lba; CDImage::LBA current_lba;
if (m_seek_end_lba > m_seek_start_lba) if (m_seek_end_lba > m_seek_start_lba)
{ {
current_lba = m_seek_start_lba + current_lba =
static_cast<CDImage::LBA>(static_cast<float>(m_seek_end_lba - m_seek_start_lba) * completed_frac); m_seek_start_lba +
std::max<CDImage::LBA>(
static_cast<CDImage::LBA>(static_cast<float>(m_seek_end_lba - m_seek_start_lba) * completed_frac), 1);
}
else if (m_seek_end_lba < m_seek_start_lba)
{
current_lba =
m_seek_start_lba -
std::max<CDImage::LBA>(
static_cast<CDImage::LBA>(static_cast<float>(m_seek_start_lba - m_seek_end_lba) * completed_frac), 1);
} }
else else
{ {
current_lba = m_seek_start_lba - // strange seek...
static_cast<CDImage::LBA>(static_cast<float>(m_seek_start_lba - m_seek_end_lba) * completed_frac); return;
} }
Log_DevPrintf("Update position while seeking from %u to %u - %u (%.2f)", m_seek_start_lba, m_seek_end_lba, Log_DevPrintf("Update position while seeking from %u to %u - %u (%.2f)", m_seek_start_lba, m_seek_end_lba,