Skip to content

Driver fix when you retry a mission #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gameblabla wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Driver fix when you retry a mission #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b7cd0f
Fix crash on retrying mission in driver
ifcaro Jun 29, 2020
842f23e
Prevent seekTime to be 0 and indentation fix
ifcaro Jun 30, 2020
5f399e5
Change calculation of seekTime and set a maximum to avoid long waitin…
ifcaro Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion libpcsxcore/cdrom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ void cdrInterrupt() {
int start_rotating = 0;
int error = 0;
int delay;
unsigned int seekTime = 0;

// Reschedule IRQ
if (cdr.Stat) {
Expand Down Expand Up @@ -909,6 +910,8 @@ void cdrInterrupt() {
case CdlReadN:
case CdlReadS:
if (cdr.SetlocPending) {
seekTime = abs(msf2sec(cdr.SetSectorPlay) - msf2sec(cdr.SetSector)) * (cdReadTime / 200);
if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
}
Expand Down Expand Up @@ -948,7 +951,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);
} else {
cdr.StatP |= STATUS_READ;
cdr.StatP &= ~STATUS_SEEK;
Expand Down