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
Add compile-time option to drop psxMemRLUT, psxMemWLUT
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.c
diff --git
a/libpcsxcore/cdrom.c
b/libpcsxcore/cdrom.c
index
6f48df0
..
e232d05
100644
(file)
--- a/
libpcsxcore/cdrom.c
+++ b/
libpcsxcore/cdrom.c
@@
-23,6
+23,7
@@
#include <assert.h>
#include "cdrom.h"
#include <assert.h>
#include "cdrom.h"
+#include "misc.h"
#include "ppf.h"
#include "psxdma.h"
#include "arm_features.h"
#include "ppf.h"
#include "psxdma.h"
#include "arm_features.h"
@@
-65,7
+66,8
@@
static struct {
unsigned char Absolute[3];
} subq;
unsigned char TrackChanged;
unsigned char Absolute[3];
} subq;
unsigned char TrackChanged;
- unsigned char unused3[3];
+ unsigned char ReportDelay;
+ unsigned char unused3[2];
unsigned int freeze_ver;
unsigned char Prev[4];
unsigned int freeze_ver;
unsigned char Prev[4];
@@
-524,7
+526,9
@@
static void cdrPlayInterrupt_Autopause()
StopCdda();
SetPlaySeekRead(cdr.StatP, 0);
}
StopCdda();
SetPlaySeekRead(cdr.StatP, 0);
}
- else if (((cdr.Mode & MODE_REPORT) || cdr.FastForward || cdr.FastBackward)) {
+ else if ((cdr.Mode & MODE_REPORT) && !cdr.ReportDelay &&
+ ((cdr.subq.Absolute[2] & 0x0f) == 0 || cdr.FastForward || cdr.FastBackward))
+ {
cdr.Result[0] = cdr.StatP;
cdr.Result[1] = cdr.subq.Track;
cdr.Result[2] = cdr.subq.Index;
cdr.Result[0] = cdr.StatP;
cdr.Result[1] = cdr.subq.Track;
cdr.Result[2] = cdr.subq.Index;
@@
-560,6
+564,9
@@
static void cdrPlayInterrupt_Autopause()
SetResultSize(8);
setIrq(0x1001);
}
SetResultSize(8);
setIrq(0x1001);
}
+
+ if (cdr.ReportDelay)
+ cdr.ReportDelay--;
}
// LastReadCycles
}
// LastReadCycles
@@
-817,6
+824,7
@@
void cdrInterrupt(void) {
cdr.SubqForwardSectors = 1;
cdr.TrackChanged = FALSE;
cdr.FirstSector = 1;
cdr.SubqForwardSectors = 1;
cdr.TrackChanged = FALSE;
cdr.FirstSector = 1;
+ cdr.ReportDelay = 60;
if (!Config.Cdda)
CDR_play(cdr.SetSectorPlay);
if (!Config.Cdda)
CDR_play(cdr.SetSectorPlay);