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
Merge pull request #459 from libretro/revert-458-fixes-for-rpi-compilation
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.c
diff --git
a/libpcsxcore/cdrom.c
b/libpcsxcore/cdrom.c
index
a417a52
..
43d25d3
100644
(file)
--- a/
libpcsxcore/cdrom.c
+++ b/
libpcsxcore/cdrom.c
@@
-539,6
+539,7
@@
void cdrInterrupt() {
int start_rotating = 0;
int error = 0;
int delay;
int start_rotating = 0;
int error = 0;
int delay;
+ unsigned int seekTime = 0;
// Reschedule IRQ
if (cdr.Stat) {
// Reschedule IRQ
if (cdr.Stat) {
@@
-910,6
+911,8
@@
void cdrInterrupt() {
case CdlReadN:
case CdlReadS:
if (cdr.SetlocPending) {
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;
}
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
}
@@
-949,7
+952,7
@@
void cdrInterrupt() {
// - fix cutscene speech (startup)
// ??? - use more accurate seek time later
// - 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;
} else {
cdr.StatP |= STATUS_READ;
cdr.StatP &= ~STATUS_SEEK;