cdrom: mask selector bits correctly

[pcsx_rearmed.git] / libpcsxcore / cdrom.c

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index a150db6..8785598 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -539,6 +539,7 @@ static void Create_Fake_Subq()
 static void cdrPlayInterrupt_Autopause()
 {
        struct SubQ *subq = (struct SubQ *)CDR_getBufferSub();
+       int track_changed = 0;
        if (subq != NULL ) {
 #ifdef CDR_LOG
                CDR_LOG( "CDDA SUB - %X:%X:%X\n",
@@ -552,8 +553,8 @@ static void cdrPlayInterrupt_Autopause()
                Tomb Raider 1 ($7)
                */
 
-               if( cdr.CurTrack >= btoi( subq->TrackNumber ) )
-                       return;
+               if( cdr.CurTrack < btoi( subq->TrackNumber ) )
+                       track_changed = 1;
        } else {
                Create_Fake_Subq();
 #ifdef CDR_LOG___0
@@ -561,13 +562,11 @@ static void cdrPlayInterrupt_Autopause()
                        fake_subq_real[0], fake_subq_real[1], fake_subq_real[2] );
 #endif
 
-               if( !fake_subq_change )
-                       return;
-
+               track_changed = fake_subq_change;
                fake_subq_change = 0;
        }
 
-       if (cdr.Mode & MODE_AUTOPAUSE) {
+       if ((cdr.Mode & MODE_AUTOPAUSE) && track_changed) {
 #ifdef CDR_LOG
                CDR_LOG( "CDDA STOP\n" );
 #endif
@@ -584,11 +583,6 @@ static void cdrPlayInterrupt_Autopause()
                StopCdda();
        }
        if (cdr.Mode & MODE_REPORT) {
-               // rearmed note: PCSX-Reloaded does this for every sector,
-               // but we try to get away with only track change here.
-               memset( cdr.Result, 0, 8 );
-               cdr.Result[0] |= 0x10;
-
                if (subq != NULL) {
 #ifdef CDR_LOG
                        CDR_LOG( "REPPLAY SUB - %X:%X:%X\n",
@@ -596,6 +590,10 @@ static void cdrPlayInterrupt_Autopause()
 #endif
                        cdr.CurTrack = btoi( subq->TrackNumber );
 
+                       if (subq->AbsoluteAddress[2] & 0xf)
+                               return;
+
+                       cdr.Result[0] = cdr.StatP;
                        // BIOS CD Player: data already BCD format
                        cdr.Result[1] = subq->TrackNumber;
                        cdr.Result[2] = subq->IndexNumber;
@@ -609,6 +607,10 @@ static void cdrPlayInterrupt_Autopause()
                                fake_subq_real[0], fake_subq_real[1], fake_subq_real[2] );
 #endif
 
+                       if (fake_subq_real[2] & 0xf)
+                               return;
+
+                       cdr.Result[0] = cdr.StatP;
                        // track # / index #
                        cdr.Result[1] = itob(cdr.CurTrack);
                        cdr.Result[2] = itob(fake_subq_index);
@@ -1448,7 +1450,7 @@ void cdrWrite0(unsigned char rt) {
 #ifdef CDR_LOG
        CDR_LOG("cdrWrite0() Log: CD0 write: %x\n", rt);
 #endif
-       cdr.Ctrl = rt | (cdr.Ctrl & ~0x3);
+       cdr.Ctrl = (rt & 3) | (cdr.Ctrl & ~3);
 
        if (rt == 0) {
                cdr.ParamP = 0;
@@ -1504,7 +1506,7 @@ void cdrWrite1(unsigned char rt) {
        }
 #endif
 
-       if (cdr.Ctrl & 0x1) return;
+       if (cdr.Ctrl & 0x3) return;
 
        switch (cdr.Cmd) {
        case CdlSync:
@@ -1859,7 +1861,7 @@ void cdrWrite2(unsigned char rt) {
                                cdr.Reg2 = rt;
                                break;
                }
-       } else if (!(cdr.Ctrl & 0x1) && cdr.ParamP < 8) {
+       } else if (!(cdr.Ctrl & 0x3) && cdr.ParamP < 8) {
                cdr.Param[cdr.ParamP++] = rt;
                cdr.ParamC++;
        }
@@ -1912,7 +1914,7 @@ void cdrWrite3(unsigned char rt) {
        }
 
 
-       if (rt == 0x07 && cdr.Ctrl & 0x1) {
+       if (rt == 0x07 && (cdr.Ctrl & 3) == 1) {
                cdr.Stat = 0;
 
                if (cdr.Irq == 0xff) {
@@ -1937,7 +1939,7 @@ void cdrWrite3(unsigned char rt) {
                return;
        }
 
-       if (rt == 0x80 && !(cdr.Ctrl & 0x1) && cdr.Readed == 0) {
+       if (rt == 0x80 && !(cdr.Ctrl & 0x3) && cdr.Readed == 0) {
                cdr.Readed = 1;
                cdr.pTransfer = cdr.Transfer;
 
@@ -2073,9 +2075,13 @@ int cdrFreeze(gzFile f, int Mode) {
 
        gzfreeze(&tmp, sizeof(tmp));
 
-       if (Mode == 0)
+       if (Mode == 0) {
                cdr.pTransfer = cdr.Transfer + tmp;
 
+               if (cdr.Play && !Config.Cdda)
+                       CDR_play(cdr.SetSectorPlay);
+       }
+
        return 0;
 }