From 4b7cd0f97a8d9058390040c75946bf36a352ffff Mon Sep 17 00:00:00 2001 From: ifcaro Date: Mon, 29 Jun 2020 19:15:27 +0200 Subject: [PATCH 1/3] Fix crash on retrying mission in driver --- libpcsxcore/cdrom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 3e31c0aeb..eb58df16a 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -539,6 +539,7 @@ void cdrInterrupt() { int start_rotating = 0; int error = 0; int delay; + int seekTime = 0; // Reschedule IRQ if (cdr.Stat) { @@ -909,6 +910,7 @@ void cdrInterrupt() { case CdlReadN: case CdlReadS: if (cdr.SetlocPending) { + seekTime = abs(msf2sec(cdr.SetSectorPlay) - msf2sec(cdr.SetSector)) + 1; memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); cdr.SetlocPending = 0; } @@ -948,7 +950,7 @@ void cdrInterrupt() { // - fix cutscene speech (startup) // ??? - use more accurate seek time later - CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime * 1); + CDREAD_INT(((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime * 1) * seekTime / 100); } else { cdr.StatP |= STATUS_READ; cdr.StatP &= ~STATUS_SEEK; From 842f23ee284cbf69ac4bbb28f9a895e3d0659bb0 Mon Sep 17 00:00:00 2001 From: ifcaro Date: Tue, 30 Jun 2020 08:34:12 +0200 Subject: [PATCH 2/3] Prevent seekTime to be 0 and indentation fix --- libpcsxcore/cdrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index eb58df16a..adb4589c5 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -539,7 +539,7 @@ void cdrInterrupt() { int start_rotating = 0; int error = 0; int delay; - int seekTime = 0; + int seekTime = 1; // Reschedule IRQ if (cdr.Stat) { @@ -910,7 +910,7 @@ void cdrInterrupt() { case CdlReadN: case CdlReadS: if (cdr.SetlocPending) { - seekTime = abs(msf2sec(cdr.SetSectorPlay) - msf2sec(cdr.SetSector)) + 1; + seekTime = abs(msf2sec(cdr.SetSectorPlay) - msf2sec(cdr.SetSector)) + 1; memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); cdr.SetlocPending = 0; } From 5f399e5fc4eaa33372c5ad113ec48ee6b73e0bfb Mon Sep 17 00:00:00 2001 From: ifcaro Date: Fri, 3 Jul 2020 23:52:53 +0200 Subject: [PATCH 3/3] Change calculation of seekTime and set a maximum to avoid long waiting times --- libpcsxcore/cdrom.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index adb4589c5..a725efadd 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -539,7 +539,7 @@ void cdrInterrupt() { int start_rotating = 0; int error = 0; int delay; - int seekTime = 1; + unsigned int seekTime = 0; // Reschedule IRQ if (cdr.Stat) { @@ -910,7 +910,8 @@ void cdrInterrupt() { case CdlReadN: case CdlReadS: if (cdr.SetlocPending) { - seekTime = abs(msf2sec(cdr.SetSectorPlay) - msf2sec(cdr.SetSector)) + 1; + seekTime = abs(msf2sec(cdr.SetSectorPlay) - msf2sec(cdr.SetSector)) * (cdReadTime / 200); + if(seekTime > 1000000) seekTime = 1000000; memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); cdr.SetlocPending = 0; } @@ -950,7 +951,7 @@ void cdrInterrupt() { // - fix cutscene speech (startup) // ??? - use more accurate seek time later - CDREAD_INT(((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime * 1) * seekTime / 100); + CDREAD_INT(((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime * 1) + seekTime); } else { cdr.StatP |= STATUS_READ; cdr.StatP &= ~STATUS_SEEK;