psxbios: implement some cdrom related stuff

[pcsx_rearmed.git] / libpcsxcore / cdrom.c

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index fac5fd3..24ff961 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -344,26 +344,22 @@ void cdrLidSeekInterrupt(void)
 
                // 02, 12, 10
                if (!(cdr.StatP & STATUS_SHELLOPEN)) {
+                       StopReading();
                        SetPlaySeekRead(cdr.StatP, 0);
                        cdr.StatP |= STATUS_SHELLOPEN;
 
                        // IIRC this sometimes doesn't happen on real hw
                        // (when lots of commands are sent?)
-                       if (cdr.Reading) {
-                               StopReading();
-                               SetResultSize(2);
-                               cdr.Result[0] = cdr.StatP | STATUS_SEEKERROR;
-                               cdr.Result[1] = ERROR_SHELLOPEN;
-                               setIrq(DiskError, 0x1006);
-                       }
+                       SetResultSize(2);
+                       cdr.Result[0] = cdr.StatP | STATUS_SEEKERROR;
+                       cdr.Result[1] = ERROR_SHELLOPEN;
                        if (cdr.CmdInProgress) {
                                psxRegs.interrupt &= ~(1 << PSXINT_CDR);
                                cdr.CmdInProgress = 0;
-                               SetResultSize(2);
                                cdr.Result[0] = cdr.StatP | STATUS_ERROR;
                                cdr.Result[1] = ERROR_NOTREADY;
-                               setIrq(DiskError, 0x1007);
                        }
+                       setIrq(DiskError, 0x1006);
 
                        set_event(PSXINT_CDRLID, cdReadTime * 30);
                        break;
@@ -719,6 +715,7 @@ void cdrInterrupt(void) {
        int read_ok;
        u16 not_ready = 0;
        u8 IrqStat = Acknowledge;
+       u8 DriveStateOld;
        u16 Cmd;
        int i;
 
@@ -968,7 +965,16 @@ void cdrInterrupt(void) {
                                second_resp_time = (((cdr.Mode & MODE_SPEED) ? 1 : 2) * 1097107);
                        }
                        SetPlaySeekRead(cdr.StatP, 0);
+                       DriveStateOld = cdr.DriveState;
                        cdr.DriveState = DRIVESTATE_PAUSED;
+                       if (DriveStateOld == DRIVESTATE_SEEK) {
+                               // According to Duckstation this fails, but the
+                               // exact conditions and effects are not clear.
+                               // Moto Racer World Tour seems to rely on this.
+                               // For now assume pause works anyway, just errors out.
+                               error = ERROR_NOTREADY;
+                               goto set_error;
+                       }
                        break;
 
                case CdlPause + CMD_PART2:
@@ -1426,7 +1432,7 @@ unsigned char cdrRead0(void) {
 }
 
 void cdrWrite0(unsigned char rt) {
-       CDR_LOG_IO("cdr w0.idx: %02x\n", rt);
+       CDR_LOG_IO("cdr w0.x.idx: %02x\n", rt);
 
        cdr.Ctrl = (rt & 3) | (cdr.Ctrl & ~3);
 }
@@ -1440,13 +1446,13 @@ unsigned char cdrRead1(void) {
        if (cdr.ResultP == cdr.ResultC)
                cdr.ResultReady = 0;
 
-       CDR_LOG_IO("cdr r1.rsp: %02x #%u\n", psxHu8(0x1801), cdr.ResultP - 1);
+       CDR_LOG_IO("cdr r1.x.rsp: %02x #%u\n", psxHu8(0x1801), cdr.ResultP - 1);
 
        return psxHu8(0x1801);
 }
 
 void cdrWrite1(unsigned char rt) {
-       const char *rnames[] = { "cmd", "smd", "smc", "arr" }; (void)rnames;
+       const char *rnames[] = { "0.cmd", "1.smd", "2.smc", "3.arr" }; (void)rnames;
        CDR_LOG_IO("cdr w1.%s: %02x\n", rnames[cdr.Ctrl & 3], rt);
 
        switch (cdr.Ctrl & 3) {
@@ -1466,10 +1472,9 @@ void cdrWrite1(unsigned char rt) {
                SysPrintf(" Param[%d] = {", cdr.ParamC);
                for (i = 0; i < cdr.ParamC; i++)
                        SysPrintf(" %x,", cdr.Param[i]);
-               SysPrintf("}\n");
-       } else {
-               SysPrintf("\n");
+               SysPrintf("}");
        }
+       SysPrintf(" @%08x\n", psxRegs.pc);
 #endif
 
        cdr.ResultReady = 0;
@@ -1498,12 +1503,12 @@ unsigned char cdrRead2(void) {
        else
                CDR_LOG_I("read empty fifo (%d)\n", cdr.FifoSize);
 
-       CDR_LOG_IO("cdr r2.dat: %02x\n", ret);
+       CDR_LOG_IO("cdr r2.x.dat: %02x\n", ret);
        return ret;
 }
 
 void cdrWrite2(unsigned char rt) {
-       const char *rnames[] = { "prm", "ien", "all", "arl" }; (void)rnames;
+       const char *rnames[] = { "0.prm", "1.ien", "2.all", "3.arl" }; (void)rnames;
        CDR_LOG_IO("cdr w2.%s: %02x\n", rnames[cdr.Ctrl & 3], rt);
 
        switch (cdr.Ctrl & 3) {
@@ -1530,12 +1535,13 @@ unsigned char cdrRead3(void) {
        else
                psxHu8(0x1803) = cdr.IrqMask | 0xE0;
 
-       CDR_LOG_IO("cdr r3.%s: %02x\n", (cdr.Ctrl & 1) ? "ifl" : "ien", psxHu8(0x1803));
+       CDR_LOG_IO("cdr r3.%d.%s: %02x\n", cdr.Ctrl & 3,
+               (cdr.Ctrl & 1) ? "ifl" : "ien", psxHu8(0x1803));
        return psxHu8(0x1803);
 }
 
 void cdrWrite3(unsigned char rt) {
-       const char *rnames[] = { "req", "ifl", "alr", "ava" }; (void)rnames;
+       const char *rnames[] = { "0.req", "1.ifl", "2.alr", "3.ava" }; (void)rnames;
        u8 ll, lr, rl, rr;
        CDR_LOG_IO("cdr w3.%s: %02x\n", rnames[cdr.Ctrl & 3], rt);
 
@@ -1629,6 +1635,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
        switch (chcr & 0x71000000) {
                case 0x11000000:
+                       madr &= ~3;
                        ptr = getDmaRam(madr, &max_words);
                        if (ptr == INVALID_PTR) {
                                CDR_LOG_I("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");