notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CDRom timings changes (#184)
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.c
diff --git
a/libpcsxcore/cdrom.c
b/libpcsxcore/cdrom.c
index
a725efa
..
16b7ca1
100644
(file)
--- a/
libpcsxcore/cdrom.c
+++ b/
libpcsxcore/cdrom.c
@@
-496,6
+496,7
@@
void cdrPlayInterrupt()
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
Find_CurTrack(cdr.SetSectorPlay);
ReadTrack(cdr.SetSectorPlay);
}
Find_CurTrack(cdr.SetSectorPlay);
ReadTrack(cdr.SetSectorPlay);
@@
-527,7
+528,15
@@
void cdrPlayInterrupt()
}
}
}
}
- CDRMISC_INT(cdReadTime);
+ if (cdr.m_locationChanged)
+ {
+ CDRMISC_INT(cdReadTime * 30);
+ cdr.m_locationChanged = FALSE;
+ }
+ else
+ {
+ CDRMISC_INT(cdReadTime);
+ }
// update for CdlGetlocP/autopause
generate_subq(cdr.SetSectorPlay);
// update for CdlGetlocP/autopause
generate_subq(cdr.SetSectorPlay);
@@
-589,6
+598,7
@@
void cdrInterrupt() {
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
// BIOS CD Player
}
// BIOS CD Player
@@
-914,6
+924,7
@@
void cdrInterrupt() {
if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
Find_CurTrack(cdr.SetSectorPlay);
}
Find_CurTrack(cdr.SetSectorPlay);
@@
-1130,7
+1141,13
@@
void cdrReadInterrupt() {
cdr.Readed = 0;
cdr.Readed = 0;
- CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime);
+ uint32_t delay = (cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime;
+ if (cdr.m_locationChanged) {
+ CDREAD_INT(delay * 30);
+ cdr.m_locationChanged = FALSE;
+ } else {
+ CDREAD_INT(delay);
+ }
/*
Croc 2: $40 - only FORM1 (*)
/*
Croc 2: $40 - only FORM1 (*)
@@
-1468,6
+1485,8
@@
void cdrReset() {
cdr.DriveState = DRIVESTATE_STANDBY;
cdr.StatP = STATUS_ROTATING;
pTransfer = cdr.Transfer;
cdr.DriveState = DRIVESTATE_STANDBY;
cdr.StatP = STATUS_ROTATING;
pTransfer = cdr.Transfer;
+ cdr.SetlocPending = 0;
+ cdr.m_locationChanged = FALSE;
// BIOS player - default values
cdr.AttenuatorLeftToLeft = 0x80;
// BIOS player - default values
cdr.AttenuatorLeftToLeft = 0x80;