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
drc: rm unneeded &63 masking
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.c
diff --git
a/libpcsxcore/cdrom.c
b/libpcsxcore/cdrom.c
index
8054d81
..
e6692e9
100644
(file)
--- a/
libpcsxcore/cdrom.c
+++ b/
libpcsxcore/cdrom.c
@@
-451,7
+451,6
@@
static void cdrPlayInterrupt_Autopause()
StopCdda();
}
else if (((cdr.Mode & MODE_REPORT) || cdr.FastForward || cdr.FastBackward)) {
StopCdda();
}
else if (((cdr.Mode & MODE_REPORT) || cdr.FastForward || cdr.FastBackward)) {
- CDR_readCDDA(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], (u8 *)read_buf);
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;
@@
-527,13
+526,14
@@
void cdrPlayInterrupt()
StopCdda();
cdr.TrackChanged = TRUE;
}
StopCdda();
cdr.TrackChanged = TRUE;
}
+ else {
+ CDR_readCDDA(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], (u8 *)read_buf);
+ }
if (!cdr.Irq && !cdr.Stat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT)))
cdrPlayInterrupt_Autopause();
if (!cdr.Irq && !cdr.Stat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT)))
cdrPlayInterrupt_Autopause();
- if (!cdr.Play) return;
-
- if (CDR_readCDDA && !cdr.Muted && cdr.Mode & MODE_REPORT) {
+ if (CDR_readCDDA && !cdr.Muted && !Config.Cdda) {
cdrAttenuate(read_buf, CD_FRAMESIZE_RAW / 4, 1);
if (SPU_playCDDAchannel)
SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW);
cdrAttenuate(read_buf, CD_FRAMESIZE_RAW / 4, 1);
if (SPU_playCDDAchannel)
SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW);
@@
-774,7
+774,7
@@
void cdrInterrupt() {
*
* We will need to get around this for Bedlam/Rise 2 later...
* */
*
* We will need to get around this for Bedlam/Rise 2 later...
* */
- if (cdr.DriveState
!
= DRIVESTATE_STANDBY)
+ if (cdr.DriveState
=
= DRIVESTATE_STANDBY)
{
delay = 7000;
}
{
delay = 7000;
}
@@
-1279,8
+1279,8
@@
unsigned char cdrRead0(void) {
if (cdr.OCUP)
cdr.Ctrl |= 0x40;
if (cdr.OCUP)
cdr.Ctrl |= 0x40;
-
//
else
-
//
cdr.Ctrl &= ~0x40;
+
else
+
cdr.Ctrl &= ~0x40;
// What means the 0x10 and the 0x08 bits? I only saw it used by the bios
cdr.Ctrl |= 0x18;
// What means the 0x10 and the 0x08 bits? I only saw it used by the bios
cdr.Ctrl |= 0x18;
@@
-1375,6
+1375,7
@@
unsigned char cdrRead2(void) {
unsigned char ret;
if (cdr.Readed == 0) {
unsigned char ret;
if (cdr.Readed == 0) {
+ cdr.OCUP = 0;
ret = 0;
} else {
ret = *pTransfer++;
ret = 0;
} else {
ret = *pTransfer++;