X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=fd09c7efcea96f83acd9957f0097e01a66d19b05;hb=6ca445e297c87f83b1e7af0a880a5a599861f066;hp=5404c469eb193b62d1fd2e151bb8d5fbd7713903;hpb=b9a092f587202b35fd32440f48899515e3924109;p=pcsx_rearmed.git diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 5404c469..fd09c7ef 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -26,6 +26,7 @@ #include "misc.h" #include "ppf.h" #include "psxdma.h" +#include "psxevents.h" #include "arm_features.h" /* logging */ @@ -105,7 +106,7 @@ static struct { u16 CmdInProgress; u8 Irq1Pending; u8 unused5; - u32 LastReadCycles; + u32 LastReadSeekCycles; u8 unused7; @@ -242,14 +243,6 @@ static void sec2msf(unsigned int s, u8 *msf) { msf[2] = s; } -// cdrInterrupt -#define CDR_INT(eCycle) { \ - psxRegs.interrupt |= (1 << PSXINT_CDR); \ - psxRegs.intCycle[PSXINT_CDR].cycle = eCycle; \ - psxRegs.intCycle[PSXINT_CDR].sCycle = psxRegs.cycle; \ - new_dyna_set_event(PSXINT_CDR, eCycle); \ -} - // cdrPlayReadInterrupt #define CDRPLAYREAD_INT(eCycle, isFirst) { \ u32 e_ = eCycle; \ @@ -259,15 +252,7 @@ static void sec2msf(unsigned int s, u8 *msf) { else \ psxRegs.intCycle[PSXINT_CDREAD].sCycle += psxRegs.intCycle[PSXINT_CDREAD].cycle; \ psxRegs.intCycle[PSXINT_CDREAD].cycle = e_; \ - new_dyna_set_event_abs(PSXINT_CDREAD, psxRegs.intCycle[PSXINT_CDREAD].sCycle + e_); \ -} - -// cdrLidSeekInterrupt -#define CDRLID_INT(eCycle) { \ - psxRegs.interrupt |= (1 << PSXINT_CDRLID); \ - psxRegs.intCycle[PSXINT_CDRLID].cycle = eCycle; \ - psxRegs.intCycle[PSXINT_CDRLID].sCycle = psxRegs.cycle; \ - new_dyna_set_event(PSXINT_CDRLID, eCycle); \ + set_event_raw_abs(PSXINT_CDREAD, psxRegs.intCycle[PSXINT_CDREAD].sCycle + e_); \ } #define StopReading() { \ @@ -331,7 +316,7 @@ void cdrLidSeekInterrupt(void) { memset(cdr.Prev, 0xff, sizeof(cdr.Prev)); cdr.DriveState = DRIVESTATE_LID_OPEN; - CDRLID_INT(0x800); + set_event(PSXINT_CDRLID, 0x800); } break; @@ -347,7 +332,7 @@ void cdrLidSeekInterrupt(void) // only sometimes does that // (not done when lots of commands are sent?) - CDRLID_INT(cdReadTime * 30); + set_event(PSXINT_CDRLID, cdReadTime * 30); break; } else if (cdr.StatP & STATUS_ROTATING) { @@ -361,12 +346,12 @@ void cdrLidSeekInterrupt(void) // and is only cleared by CdlNop cdr.DriveState = DRIVESTATE_RESCAN_CD; - CDRLID_INT(cdReadTime * 105); + set_event(PSXINT_CDRLID, cdReadTime * 105); break; } // recheck for close - CDRLID_INT(cdReadTime * 3); + set_event(PSXINT_CDRLID, cdReadTime * 3); break; case DRIVESTATE_RESCAN_CD: @@ -375,7 +360,7 @@ void cdrLidSeekInterrupt(void) // this is very long on real hardware, over 6 seconds // make it a bit faster here... - CDRLID_INT(cdReadTime * 150); + set_event(PSXINT_CDRLID, cdReadTime * 150); break; case DRIVESTATE_PREPARE_CD: @@ -385,7 +370,7 @@ void cdrLidSeekInterrupt(void) } else { SetPlaySeekRead(cdr.StatP, STATUS_SEEK); - CDRLID_INT(cdReadTime * 26); + set_event(PSXINT_CDRLID, cdReadTime * 26); } break; } @@ -463,11 +448,11 @@ static int ReadTrack(const u8 *time) tmp[1] = itob(time[1]); tmp[2] = itob(time[2]); + CDR_LOG("ReadTrack *** %02x:%02x:%02x\n", tmp[0], tmp[1], tmp[2]); + if (memcmp(cdr.Prev, tmp, 3) == 0) return 1; - CDR_LOG("ReadTrack *** %02x:%02x:%02x\n", tmp[0], tmp[1], tmp[2]); - read_ok = CDR_readTrack(tmp); if (read_ok) memcpy(cdr.Prev, tmp, 3); @@ -477,12 +462,13 @@ static int ReadTrack(const u8 *time) static void UpdateSubq(const u8 *time) { const struct SubQ *subq; + int s = MSF2SECT(time[0], time[1], time[2]); u16 crc; - if (CheckSBI(time)) + if (CheckSBI(s)) return; - subq = (struct SubQ *)CDR_getBufferSub(MSF2SECT(time[0], time[1], time[2])); + subq = (struct SubQ *)CDR_getBufferSub(s); if (subq != NULL && cdr.CurTrack == 1) { crc = calcCrc((u8 *)subq + 12, 10); if (crc == (((u16)subq->CRC[0] << 8) | subq->CRC[1])) { @@ -570,19 +556,25 @@ static void cdrPlayInterrupt_Autopause() cdr.ReportDelay--; } -// LastReadCycles static int cdrSeekTime(unsigned char *target) { int diff = msf2sec(cdr.SetSectorPlay) - msf2sec(target); - int pausePenalty, seekTime = abs(diff) * (cdReadTime / 2000); + int seekTime = abs(diff) * (cdReadTime / 2000); + int cyclesSinceRS = psxRegs.cycle - cdr.LastReadSeekCycles; seekTime = MAX_VALUE(seekTime, 20000); // need this stupidly long penalty or else Spyro2 intro desyncs - pausePenalty = (s32)(psxRegs.cycle - cdr.LastReadCycles) > cdReadTime * 8 ? cdReadTime * 25 : 0; - seekTime += pausePenalty; + // note: if misapplied this breaks MGS cutscenes among other things + if (cyclesSinceRS > cdReadTime * 50) + seekTime += cdReadTime * 25; + // Transformers Beast Wars Transmetals does Setloc(x),SeekL,Setloc(x),ReadN + // and then wants some slack time + else if (cyclesSinceRS < cdReadTime *3/2) + seekTime += cdReadTime; seekTime = MIN_VALUE(seekTime, PSXCLK * 2 / 3); - CDR_LOG("seek: %.2f %.2f\n", (float)seekTime / PSXCLK, (float)seekTime / cdReadTime); + CDR_LOG("seek: %.2f %.2f (%.2f)\n", (float)seekTime / PSXCLK, + (float)seekTime / cdReadTime, (float)cyclesSinceRS / cdReadTime); return seekTime; } @@ -648,7 +640,7 @@ static void msfiSub(u8 *msfi, u32 count) void cdrPlayReadInterrupt(void) { - cdr.LastReadCycles = psxRegs.cycle; + cdr.LastReadSeekCycles = psxRegs.cycle; if (cdr.Reading) { cdrReadInterrupt(); @@ -1086,6 +1078,7 @@ void cdrInterrupt(void) { memcpy(cdr.LocL, buf, 8); UpdateSubq(cdr.SetSectorPlay); cdr.TrackChanged = FALSE; + cdr.LastReadSeekCycles = psxRegs.cycle; break; case CdlTest: @@ -1142,7 +1135,7 @@ void cdrInterrupt(void) { // yes, it really sets STATUS_SHELLOPEN cdr.StatP |= STATUS_SHELLOPEN; cdr.DriveState = DRIVESTATE_RESCAN_CD; - CDRLID_INT(20480); + set_event(PSXINT_CDRLID, 20480); start_rotating = 1; break; @@ -1205,11 +1198,11 @@ void cdrInterrupt(void) { // FALLTHROUGH set_error: - CDR_LOG_I("cmd %02x error %02x\n", Cmd, error); SetResultSize(2); cdr.Result[0] = cdr.StatP | STATUS_ERROR; cdr.Result[1] = not_ready ? ERROR_NOTREADY : error; cdr.Stat = DiskError; + CDR_LOG_I("cmd %02x error %02x\n", Cmd, cdr.Result[1]); break; } @@ -1220,7 +1213,7 @@ void cdrInterrupt(void) { if (second_resp_time) { cdr.CmdInProgress = Cmd | 0x100; - CDR_INT(second_resp_time); + set_event(PSXINT_CDR, second_resp_time); } else if (cdr.Cmd && cdr.Cmd != (Cmd & 0xff)) { cdr.CmdInProgress = cdr.Cmd; @@ -1469,7 +1462,7 @@ void cdrWrite1(unsigned char rt) { if (!cdr.CmdInProgress) { cdr.CmdInProgress = rt; // should be something like 12k + controller delays - CDR_INT(5000); + set_event(PSXINT_CDR, 5000); } else { CDR_LOG_I("cmd while busy: %02x, prev %02x, busy %02x\n", @@ -1550,7 +1543,7 @@ void cdrWrite3(unsigned char rt) { c = 2048 - (psxRegs.cycle - nextCycle); c = MAX_VALUE(c, 512); } - CDR_INT(c); + set_event(PSXINT_CDR, c); } } cdr.Stat &= ~rt; @@ -1640,7 +1633,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) { } psxCpu->Clear(madr, cdsize / 4); - CDRDMA_INT((cdsize/4) * 24); + set_event(PSXINT_CDRDMA, (cdsize / 4) * 24); HW_DMA3_CHCR &= SWAPu32(~0x10000000); if (chcr & 0x100) {