X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=950b6484ba5440424d1b48fb679f53b1a87f98c8;hb=5c5e6c0c5f739de80b7f8f9d6c36dda0c2fa579d;hp=2ce7fe97b048d9b398efbed95dd9acc37599c883;hpb=e7606d0edc6178f862d94164617e8c5ea4bbbe3b;p=pcsx_rearmed.git diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 2ce7fe97..950b6484 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -94,9 +94,12 @@ static struct { unsigned char Track; boolean Play, Muted; int CurTrack; - int Mode, File, Channel; + unsigned char Mode; + unsigned char FileChannelSelected; + unsigned char CurFile, CurChannel; + int FilterFile, FilterChannel; unsigned char LocL[8]; - int FirstSector; + int unused4; xa_decode_t Xa; @@ -105,7 +108,7 @@ static struct { u16 CmdInProgress; u8 Irq1Pending; - u8 unused5; + u8 AdpcmActive; u32 LastReadSeekCycles; u8 unused7; @@ -199,7 +202,7 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 }; #define STATUS_READ (1<<5) // 0x20 #define STATUS_SHELLOPEN (1<<4) // 0x10 #define STATUS_UNKNOWN3 (1<<3) // 0x08 -#define STATUS_UNKNOWN2 (1<<2) // 0x04 +#define STATUS_SEEKERROR (1<<2) // 0x04 #define STATUS_ROTATING (1<<1) // 0x02 #define STATUS_ERROR (1<<0) // 0x01 @@ -207,6 +210,7 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 }; #define ERROR_NOTREADY (1<<7) // 0x80 #define ERROR_INVALIDCMD (1<<6) // 0x40 #define ERROR_INVALIDARG (1<<5) // 0x20 +#define ERROR_SHELLOPEN (1<<3) // 0x08 // 1x = 75 sectors per second // PSXCLK = 1 sec in the ps @@ -306,7 +310,7 @@ void cdrLidSeekInterrupt(void) default: case DRIVESTATE_STANDBY: StopCdda(); - StopReading(); + //StopReading(); SetPlaySeekRead(cdr.StatP, 0); if (CDR_getStatus(&stat) == -1) @@ -326,11 +330,28 @@ void cdrLidSeekInterrupt(void) // 02, 12, 10 if (!(cdr.StatP & STATUS_SHELLOPEN)) { + SetPlaySeekRead(cdr.StatP, 0); cdr.StatP |= STATUS_SHELLOPEN; - // could generate error irq here, but real hardware - // only sometimes does that - // (not done when lots of commands are sent?) + // 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; + cdr.Stat = DiskError; + setIrq(0x1006); + } + 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; + cdr.Stat = DiskError; + setIrq(0x1007); + } set_event(PSXINT_CDRLID, cdReadTime * 30); break; @@ -448,11 +469,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); @@ -462,12 +483,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])) { @@ -498,14 +520,10 @@ static void cdrPlayInterrupt_Autopause() u32 i; if ((cdr.Mode & MODE_AUTOPAUSE) && cdr.TrackChanged) { - CDR_LOG( "CDDA STOP\n" ); - - // Magic the Gathering - // - looping territory cdda + CDR_LOG_I("autopause\n"); - // ...? - //cdr.ResultReady = 1; - //cdr.Stat = DataReady; + SetResultSize(1); + cdr.Result[0] = cdr.StatP; cdr.Stat = DataEnd; setIrq(0x1000); // 0x1000 just for logging purposes @@ -515,6 +533,7 @@ static void cdrPlayInterrupt_Autopause() else if ((cdr.Mode & MODE_REPORT) && !cdr.ReportDelay && ((cdr.subq.Absolute[2] & 0x0f) == 0 || cdr.FastForward || cdr.FastBackward)) { + SetResultSize(8); cdr.Result[0] = cdr.StatP; cdr.Result[1] = cdr.subq.Track; cdr.Result[2] = cdr.subq.Index; @@ -539,15 +558,10 @@ static void cdrPlayInterrupt_Autopause() cdr.Result[4] = cdr.subq.Absolute[1]; cdr.Result[5] = cdr.subq.Absolute[2]; } - cdr.Result[6] = abs_lev_max >> 0; cdr.Result[7] = abs_lev_max >> 8; - // Rayman: Logo freeze (resultready + dataready) - cdr.ResultReady = 1; cdr.Stat = DataReady; - - SetResultSize(8); setIrq(0x1001); } @@ -559,14 +573,21 @@ static int cdrSeekTime(unsigned char *target) { int diff = msf2sec(cdr.SetSectorPlay) - msf2sec(target); 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 - if ((s32)(psxRegs.cycle - cdr.LastReadSeekCycles) > cdReadTime * 8) + // 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; } @@ -641,11 +662,12 @@ void cdrPlayReadInterrupt(void) if (!cdr.Play) return; - CDR_LOG( "CDDA - %d:%d:%d\n", - cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); + CDR_LOG("CDDA - %02d:%02d:%02d m %02x\n", + cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], cdr.Mode); SetPlaySeekRead(cdr.StatP, STATUS_PLAY); if (memcmp(cdr.SetSectorPlay, cdr.SetSectorEnd, 3) == 0) { + CDR_LOG_I("end stop\n"); StopCdda(); SetPlaySeekRead(cdr.StatP, 0); cdr.TrackChanged = TRUE; @@ -657,11 +679,10 @@ void cdrPlayReadInterrupt(void) if (!cdr.Stat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT))) cdrPlayInterrupt_Autopause(); - if (!cdr.Muted && !Config.Cdda) { + if (!cdr.Muted && cdr.Play && !Config.Cdda) { cdrPrepCdda(read_buf, CD_FRAMESIZE_RAW / 4); cdrAttenuate(read_buf, CD_FRAMESIZE_RAW / 4, 1); - SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, cdr.FirstSector); - cdr.FirstSector = 0; + SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, 0); } msfiAdd(cdr.SetSectorPlay, 1); @@ -748,7 +769,7 @@ void cdrInterrupt(void) { break; case CdlSetloc: - case CdlSetloc + CMD_WHILE_NOT_READY: + // case CdlSetloc + CMD_WHILE_NOT_READY: // or is it? CDR_LOG("CDROM setloc command (%02X, %02X, %02X)\n", cdr.Param[0], cdr.Param[1], cdr.Param[2]); // MM must be BCD, SS must be BCD and <0x60, FF must be BCD and <0x75 @@ -822,7 +843,8 @@ void cdrInterrupt(void) { cdr.LocL[0] = LOCL_INVALID; cdr.SubqForwardSectors = 1; cdr.TrackChanged = FALSE; - cdr.FirstSector = 1; + cdr.FileChannelSelected = 0; + cdr.AdpcmActive = 0; cdr.ReportDelay = 60; cdr.sectorsRead = 0; @@ -960,8 +982,8 @@ void cdrInterrupt(void) { break; case CdlSetfilter: - cdr.File = cdr.Param[0]; - cdr.Channel = cdr.Param[1]; + cdr.FilterFile = cdr.Param[0]; + cdr.FilterChannel = cdr.Param[1]; break; case CdlSetmode: @@ -976,8 +998,8 @@ void cdrInterrupt(void) { SetResultSize(5); cdr.Result[1] = cdr.Mode; cdr.Result[2] = 0; - cdr.Result[3] = cdr.File; - cdr.Result[4] = cdr.Channel; + cdr.Result[3] = cdr.FilterFile; + cdr.Result[4] = cdr.FilterChannel; break; case CdlGetlocL: @@ -1113,6 +1135,8 @@ void cdrInterrupt(void) { cdr.Result[1] |= 0x80; } cdr.Result[0] |= (cdr.Result[1] >> 4) & 0x08; + CDR_LOG_I("CdlID: %02x %02x %02x %02x\n", cdr.Result[0], + cdr.Result[1], cdr.Result[2], cdr.Result[3]); /* This adds the string "PCSX" in Playstation bios boot screen */ memcpy((char *)&cdr.Result[4], "PCSX", 4); @@ -1165,7 +1189,8 @@ void cdrInterrupt(void) { cdr.SetlocPending = 0; } cdr.Reading = 1; - cdr.FirstSector = 1; + cdr.FileChannelSelected = 0; + cdr.AdpcmActive = 0; // Fighting Force 2 - update subq time immediately // - fixes new game @@ -1190,11 +1215,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; } @@ -1303,7 +1328,9 @@ static void cdrUpdateTransferBuf(const u8 *buf) static void cdrReadInterrupt(void) { - u8 *buf = NULL, *hdr; + const struct { u8 file, chan, mode, coding; } *subhdr; + const u8 *buf = NULL; + int deliver_data = 1; u8 subqPos[3]; int read_ok; @@ -1336,29 +1363,45 @@ static void cdrReadInterrupt(void) if (!cdr.Stat && !cdr.Irq1Pending) cdrUpdateTransferBuf(buf); - if ((!cdr.Muted) && (cdr.Mode & MODE_STRSND) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA - hdr = buf + 4; - // Firemen 2: Multi-XA files - briefings, cutscenes - if( cdr.FirstSector == 1 && (cdr.Mode & MODE_SF)==0 ) { - cdr.File = hdr[0]; - cdr.Channel = hdr[1]; + subhdr = (void *)(buf + 4); + do { + // try to process as adpcm + if (!(cdr.Mode & MODE_STRSND)) + break; + if (buf[3] != 2 || (subhdr->mode & 0x44) != 0x44) // or 0x64? + break; + CDR_LOG("f=%d m=%d %d,%3d | %d,%2d | %d,%2d\n", !!(cdr.Mode & MODE_SF), cdr.Muted, + subhdr->file, subhdr->chan, cdr.CurFile, cdr.CurChannel, cdr.FilterFile, cdr.FilterChannel); + if ((cdr.Mode & MODE_SF) && (subhdr->file != cdr.FilterFile || subhdr->chan != cdr.FilterChannel)) + break; + if (subhdr->chan & 0xe0) { // ? + if (subhdr->chan != 0xff) + log_unhandled("adpcm %d:%d\n", subhdr->file, subhdr->chan); + break; + } + if (!cdr.FileChannelSelected) { + cdr.CurFile = subhdr->file; + cdr.CurChannel = subhdr->chan; + cdr.FileChannelSelected = 1; } + else if (subhdr->file != cdr.CurFile || subhdr->chan != cdr.CurChannel) + break; - /* Gameblabla - * Skips playing on channel 255. - * Fixes missing audio in Blue's Clues : Blue's Big Musical. (Should also fix Taxi 2) - * TODO : Check if this is the proper behaviour. - * */ - if ((hdr[2] & 0x4) && hdr[0] == cdr.File && hdr[1] == cdr.Channel && cdr.Channel != 255) { - int ret = xa_decode_sector(&cdr.Xa, buf + 4, cdr.FirstSector); - if (!ret) { - cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo); - SPU_playADPCMchannel(&cdr.Xa, psxRegs.cycle, cdr.FirstSector); - cdr.FirstSector = 0; - } - else cdr.FirstSector = -1; + // accepted as adpcm + deliver_data = 0; + + if (Config.Xa) + break; + if (!cdr.Muted && cdr.AdpcmActive) { + cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo); + SPU_playADPCMchannel(&cdr.Xa, psxRegs.cycle, 0); } - } + // decode next + cdr.AdpcmActive = !xa_decode_sector(&cdr.Xa, buf + 4, !cdr.AdpcmActive); + } while (0); + + if ((cdr.Mode & MODE_SF) && (subhdr->mode & 0x44) == 0x44) // according to nocash + deliver_data = 0; /* Croc 2: $40 - only FORM1 (*) @@ -1366,7 +1409,7 @@ static void cdrReadInterrupt(void) Sim Theme Park - no adpcm at all (zero) */ - if (!(cdr.Mode & MODE_STRSND) || !(buf[4+2] & 0x4)) + if (deliver_data) cdrReadInterruptSetResult(cdr.StatP); msfiAdd(cdr.SetSectorPlay, 1); @@ -1376,20 +1419,17 @@ static void cdrReadInterrupt(void) /* cdrRead0: - bit 0,1 - mode - bit 2 - unknown - bit 3 - unknown - bit 4 - unknown + bit 0,1 - reg index + bit 2 - adpcm active bit 5 - 1 result ready bit 6 - 1 dma ready bit 7 - 1 command being processed */ unsigned char cdrRead0(void) { - if (cdr.ResultReady) - cdr.Ctrl |= 0x20; - else - cdr.Ctrl &= ~0x20; + cdr.Ctrl &= ~0x24; + cdr.Ctrl |= cdr.AdpcmActive << 2; + cdr.Ctrl |= cdr.ResultReady << 5; cdr.Ctrl |= 0x40; // data fifo not empty @@ -1670,12 +1710,18 @@ static void getCdInfo(void) void cdrReset() { memset(&cdr, 0, sizeof(cdr)); cdr.CurTrack = 1; - cdr.File = 1; - cdr.Channel = 1; + cdr.FilterFile = 0; + cdr.FilterChannel = 0; cdr.Reg2 = 0x1f; cdr.Stat = NoIntr; cdr.FifoOffset = DATA_SIZE; // fifo empty - if (CdromId[0] == '\0') { + + CDR_getStatus(&stat); + if (stat.Status & STATUS_SHELLOPEN) { + cdr.DriveState = DRIVESTATE_LID_OPEN; + cdr.StatP = STATUS_SHELLOPEN; + } + else if (CdromId[0] == '\0') { cdr.DriveState = DRIVESTATE_STOPPED; cdr.StatP = 0; }