cdrom: adjust pause behavior

[pcsx_rearmed.git] / libpcsxcore / cdrom.c

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 90ec0d3..5404c46 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -23,6 +23,7 @@
 
 #include <assert.h>
 #include "cdrom.h"
+#include "misc.h"
 #include "ppf.h"
 #include "psxdma.h"
 #include "arm_features.h"
@@ -65,7 +66,9 @@ static struct {
                unsigned char Absolute[3];
        } subq;
        unsigned char TrackChanged;
-       unsigned char unused3[3];
+       unsigned char ReportDelay;
+       unsigned char unused3;
+       unsigned short sectorsRead;
        unsigned int  freeze_ver;
 
        unsigned char Prev[4];
@@ -109,7 +112,7 @@ static struct {
        u8 DriveState;
        u8 FastForward;
        u8 FastBackward;
-       u8 unused8;
+       u8 errorRetryhack;
 
        u8 AttenuatorLeftToLeft, AttenuatorLeftToRight;
        u8 AttenuatorRightToRight, AttenuatorRightToLeft;
@@ -524,7 +527,9 @@ static void cdrPlayInterrupt_Autopause()
                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;
@@ -560,6 +565,9 @@ static void cdrPlayInterrupt_Autopause()
                SetResultSize(8);
                setIrq(0x1001);
        }
+
+       if (cdr.ReportDelay)
+               cdr.ReportDelay--;
 }
 
 // LastReadCycles
@@ -570,7 +578,7 @@ static int cdrSeekTime(unsigned char *target)
        seekTime = MAX_VALUE(seekTime, 20000);
 
        // need this stupidly long penalty or else Spyro2 intro desyncs
-       pausePenalty = (s32)(psxRegs.cycle - cdr.LastReadCycles) > cdReadTime * 4 ? cdReadTime * 25 : 0;
+       pausePenalty = (s32)(psxRegs.cycle - cdr.LastReadCycles) > cdReadTime * 8 ? cdReadTime * 25 : 0;
        seekTime += pausePenalty;
 
        seekTime = MIN_VALUE(seekTime, PSXCLK * 2 / 3);
@@ -624,6 +632,20 @@ static void msfiAdd(u8 *msfi, u32 count)
        }
 }
 
+static void msfiSub(u8 *msfi, u32 count)
+{
+       assert(count < 75);
+       msfi[2] -= count;
+       if ((s8)msfi[2] < 0) {
+               msfi[2] += 75;
+               msfi[1]--;
+               if ((s8)msfi[1] < 0) {
+                       msfi[1] = 60;
+                       msfi[0]--;
+               }
+       }
+}
+
 void cdrPlayReadInterrupt(void)
 {
        cdr.LastReadCycles = psxRegs.cycle;
@@ -749,6 +771,8 @@ void cdrInterrupt(void) {
                        if (((cdr.Param[0] & 0x0F) > 0x09) || (cdr.Param[0] > 0x99) || ((cdr.Param[1] & 0x0F) > 0x09) || (cdr.Param[1] >= 0x60) || ((cdr.Param[2] & 0x0F) > 0x09) || (cdr.Param[2] >= 0x75))
                        {
                                CDR_LOG_I("Invalid/out of range seek to %02X:%02X:%02X\n", cdr.Param[0], cdr.Param[1], cdr.Param[2]);
+                               if (++cdr.errorRetryhack > 100)
+                                       break;
                                error = ERROR_INVALIDARG;
                                goto set_error;
                        }
@@ -759,6 +783,7 @@ void cdrInterrupt(void) {
                                memcpy(cdr.SetSector, set_loc, 3);
                                cdr.SetSector[3] = 0;
                                cdr.SetlocPending = 1;
+                               cdr.errorRetryhack = 0;
                        }
                        break;
 
@@ -814,6 +839,8 @@ void cdrInterrupt(void) {
                        cdr.SubqForwardSectors = 1;
                        cdr.TrackChanged = FALSE;
                        cdr.FirstSector = 1;
+                       cdr.ReportDelay = 60;
+                       cdr.sectorsRead = 0;
 
                        if (!Config.Cdda)
                                CDR_play(cdr.SetSectorPlay);
@@ -887,6 +914,12 @@ void cdrInterrupt(void) {
                case CdlPause:
                        StopCdda();
                        StopReading();
+
+                       // how the drive maintains the position while paused is quite
+                       // complicated, this is the minimum to make "Bedlam" happy
+                       msfiSub(cdr.SetSectorPlay, MIN_VALUE(cdr.sectorsRead, 4));
+                       cdr.sectorsRead = 0;
+
                        /*
                        Gundam Battle Assault 2: much slower (*)
                        - Fixes boot, gameplay
@@ -1154,6 +1187,7 @@ void cdrInterrupt(void) {
                        UpdateSubq(cdr.SetSectorPlay);
                        cdr.LocL[0] = LOCL_INVALID;
                        cdr.SubqForwardSectors = 1;
+                       cdr.sectorsRead = 0;
 
                        cycles = (cdr.Mode & MODE_SPEED) ? cdReadTime : cdReadTime * 2;
                        cycles += seekTime;
@@ -1276,7 +1310,8 @@ static void cdrUpdateTransferBuf(const u8 *buf)
                return;
        memcpy(cdr.Transfer, buf, DATA_SIZE);
        CheckPPFCache(cdr.Transfer, cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
-       CDR_LOG("cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]);
+       CDR_LOG("cdr.Transfer  %02x:%02x:%02x\n",
+               cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]);
        if (cdr.FifoOffset < 2048 + 12)
                CDR_LOG("FifoOffset(1) %d/%d\n", cdr.FifoOffset, cdr.FifoSize);
 }
@@ -1298,6 +1333,7 @@ static void cdrReadInterrupt(void)
 
        // note: CdlGetlocL should work as soon as STATUS_READ is indicated
        SetPlaySeekRead(cdr.StatP, STATUS_READ | STATUS_ROTATING);
+       cdr.sectorsRead++;
 
        read_ok = ReadTrack(cdr.SetSectorPlay);
        if (read_ok)
@@ -1711,8 +1747,6 @@ int cdrFreeze(void *f, int Mode) {
                        Find_CurTrack(cdr.SetSectorPlay);
                        if (!Config.Cdda)
                                CDR_play(cdr.SetSectorPlay);
-                       if (psxRegs.interrupt & (1 << PSXINT_CDRPLAY_OLD))
-                               CDRPLAYREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime, 1);
                }
 
                if ((cdr.freeze_ver & 0xffffff00) != 0x63647200) {