From 0dc1b4a95dcf382f60b097c2b266ca6b7e676c00 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 26 Dec 2012 22:50:29 +0200 Subject: configure: handle ARM machine names with version like armv6l-unknown-linux-gnueabihf in Arch Linux --- configure | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/configure b/configure index c03d41f..4d3bb5f 100755 --- a/configure +++ b/configure @@ -181,16 +181,18 @@ cat > $TMPC <&1 | grep -i 'target:' | awk '{print $2}' \ - | awk -F '-' '{print $1}'` + ARCH=`$CC -dumpmachine | awk -F '-' '{print $1}'` fi -# ARM stuff -if [ "$ARCH" = "arm" ]; then +case "$ARCH" in +arm*) + # ARM stuff + ARCH="arm" + if [ "$optimize_cortexa8" = "yes" ]; then CFLAGS="$CFLAGS -mcpu=cortex-a8 -mtune=cortex-a8" ASFLAGS="$ASFLAGS -mcpu=cortex-a8" @@ -266,10 +268,12 @@ if [ "$ARCH" = "arm" ]; then echo "You probably want to specify -mcpu= or -march= like this:" echo " CFLAGS=-march=armv7-a ./configure ..." fi -else + ;; +*) # dynarec only available on ARM enable_dynarec="no" -fi + ;; +esac if [ "x$builtin_gpu" = "x" ]; then builtin_gpu="peops" -- cgit v1.2.3 From f9ccca15495c5d2ac9ca098ec171d76907a7bccc Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 27 Dec 2012 02:21:55 +0200 Subject: cdrom: fix irq check --- libpcsxcore/cdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 6b3285c..61e1e7a 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -656,7 +656,7 @@ void cdrPlayInterrupt() cdr.Result[0] = cdr.StatP; if (cdr.Irq == 0 || cdr.Irq == 0xff) { cdr.Stat = Complete; - if (cdr.Stat != NoIntr) + if (cdr.Reg2 != 0x18) psxHu32ref(0x1070) |= SWAP32(0x4); } -- cgit v1.2.3 From e7e33ef281952a0e413f2c1f969472da5d2b6b37 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 27 Dec 2012 02:24:06 +0200 Subject: cdrom: tune and log stat hack --- libpcsxcore/cdrom.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 61e1e7a..d7e36cc 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -650,6 +650,11 @@ static void cdrPlayInterrupt_Autopause() void cdrPlayInterrupt() { if (cdr.Seeked == SEEK_DOING_CMD) { + if (cdr.Stat) { + SysPrintf("cdrom: seek stat hack\n"); + CDRMISC_INT(0x1000); + return; + } SetResultSize(1); cdr.StatP |= STATUS_ROTATING; cdr.StatP &= ~STATUS_SEEK; @@ -704,7 +709,8 @@ void cdrInterrupt() { // Reschedule IRQ if (cdr.Stat) { - CDR_INT( 0x100 ); + SysPrintf("cdrom: stat hack: %02x %x\n", cdr.Irq, cdr.Stat); + CDR_INT(0x1000); return; } @@ -1294,7 +1300,8 @@ void cdrReadInterrupt() { return; if (cdr.Irq || cdr.Stat) { - CDREAD_INT(0x100); + SysPrintf("cdrom: read stat hack %02x %x\n", cdr.Irq, cdr.Stat); + CDREAD_INT(0x1000); return; } -- cgit v1.2.3 From 8b380e97ccb16808ea31f1cc89af11c0f063bdb3 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 27 Dec 2012 02:48:49 +0200 Subject: cdrom: cleanup logging --- libpcsxcore/cdrom.c | 140 ++++++++++++++++++---------------------------------- 1 file changed, 49 insertions(+), 91 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index d7e36cc..614f0d9 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -25,6 +25,24 @@ #include "ppf.h" #include "psxdma.h" +/* logging */ +#if 0 +#define CDR_LOG SysPrintf +#else +#define CDR_LOG(...) +#endif +#if 0 +#define CDR_LOG_I SysPrintf +#else +#define CDR_LOG_I(...) +#endif +#if 0 +#define CDR_LOG_IO SysPrintf +#else +#define CDR_LOG_IO(...) +#endif +//#define CDR_LOG_CMD_IRQ + cdrStruct cdr; static unsigned char *pTransfer; @@ -267,9 +285,7 @@ static void Check_Shell( int Irq ) // check case open/close if (cdr.LidCheck > 0) { -#ifdef CDR_LOG CDR_LOG( "LidCheck\n" ); -#endif // $20 = check lid state if( cdr.LidCheck == 0x20 ) @@ -382,12 +398,10 @@ void Find_CurTrack() { if (CDR_getTD((u8)(lcv), cdr.ResultTD) != -1) { u32 sect1, sect2; -#ifdef CDR_LOG___0 CDR_LOG( "curtrack %d %d %d | %d %d %d | %d\n", cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], cdr.ResultTD[2], cdr.ResultTD[1], cdr.ResultTD[0], cdr.CurTrack ); -#endif // find next track boundary - only need m:s accuracy sect1 = cdr.SetSectorPlay[0] * 60 * 75 + cdr.SetSectorPlay[1] * 75; @@ -413,16 +427,14 @@ static void ReadTrack( u8 *time ) { cdr.Prev[1] = itob( time[1] ); cdr.Prev[2] = itob( time[2] ); -#ifdef CDR_LOG CDR_LOG("ReadTrack() Log: KEY *** %x:%x:%x\n", cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]); -#endif cdr.RErr = CDR_readTrack(cdr.Prev); } static void AddIrqQueue(unsigned char irq, unsigned long ecycle) { - //if (cdr.Irq != 0 && cdr.Irq != 0xff) - // printf("cdr: override cmd %02x -> %02x\n", cdr.Irq, irq); + if (cdr.Irq != 0 && cdr.Irq != 0xff) + CDR_LOG_I("cdr: override cmd %02x -> %02x\n", cdr.Irq, irq); cdr.Irq = irq; cdr.eCycle = ecycle; @@ -438,12 +450,10 @@ void Set_Track() for( lcv = 1; lcv < cdr.ResultTN[1]; lcv++ ) { if (CDR_getTD((u8)(lcv), cdr.ResultTD) != -1) { -#ifdef CDR_LOG___0 CDR_LOG( "settrack %d %d %d | %d %d %d | %d\n", cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], cdr.ResultTD[2], cdr.ResultTD[1], cdr.ResultTD[0], cdr.CurTrack ); -#endif // check if time matches track start (only need min, sec accuracy) // - m:s:f vs f:s:m @@ -524,12 +534,10 @@ static void Create_Fake_Subq() temp_start[2] = cdr.ResultTD[0]; -#ifdef CDR_LOG CDR_LOG( "CDDA FAKE SUB - %d:%d:%d / %d:%d:%d / %d:%d:%d\n", temp_cur[0], temp_cur[1], temp_cur[2], temp_start[0], temp_start[1], temp_start[2], temp_next[0], temp_next[1], temp_next[2]); -#endif @@ -555,10 +563,8 @@ static void cdrPlayInterrupt_Autopause() // update subq ReadTrack( cdr.SetSectorPlay ); -#ifdef CDR_LOG CDR_LOG( "CDDA SUB - %X:%X:%X\n", subq->AbsoluteAddress[0], subq->AbsoluteAddress[1], subq->AbsoluteAddress[2] ); -#endif /* CDDA Autopause @@ -573,19 +579,15 @@ static void cdrPlayInterrupt_Autopause() track_changed = 1; } else { Create_Fake_Subq(); -#ifdef CDR_LOG___0 CDR_LOG( "CDDA FAKE SUB - %d:%d:%d\n", fake_subq_real[0], fake_subq_real[1], fake_subq_real[2] ); -#endif track_changed = fake_subq_change; fake_subq_change = 0; } if ((cdr.Mode & MODE_AUTOPAUSE) && track_changed) { -#ifdef CDR_LOG CDR_LOG( "CDDA STOP\n" ); -#endif // Magic the Gathering // - looping territory cdda @@ -600,10 +602,9 @@ static void cdrPlayInterrupt_Autopause() } else if (cdr.Mode & MODE_REPORT) { if (subq != NULL) { -#ifdef CDR_LOG CDR_LOG( "REPPLAY SUB - %X:%X:%X\n", subq->AbsoluteAddress[0], subq->AbsoluteAddress[1], subq->AbsoluteAddress[2] ); -#endif + // breaks when .sub doesn't have index 0 for some reason (bad rip?) //cdr.CurTrack = btoi( subq->TrackNumber ); @@ -619,10 +620,8 @@ static void cdrPlayInterrupt_Autopause() cdr.Result[4] = subq->AbsoluteAddress[1]; cdr.Result[5] = subq->AbsoluteAddress[2]; } else { -#ifdef CDR_LOG___0 CDR_LOG( "REPPLAY FAKE - %d:%d:%d\n", fake_subq_real[0], fake_subq_real[1], fake_subq_real[2] ); -#endif if (fake_subq_real[2] & 0xf) return; @@ -651,7 +650,7 @@ void cdrPlayInterrupt() { if (cdr.Seeked == SEEK_DOING_CMD) { if (cdr.Stat) { - SysPrintf("cdrom: seek stat hack\n"); + CDR_LOG_I("cdrom: seek stat hack\n"); CDRMISC_INT(0x1000); return; } @@ -680,10 +679,9 @@ void cdrPlayInterrupt() if (!cdr.Play) return; -#ifdef CDR_LOG CDR_LOG( "CDDA - %d:%d:%d\n", cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); -#endif + CDRMISC_INT( cdReadTime ); if (!cdr.Irq && !cdr.Stat && (cdr.Mode & MODE_CDDA) && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT))) @@ -709,7 +707,7 @@ void cdrInterrupt() { // Reschedule IRQ if (cdr.Stat) { - SysPrintf("cdrom: stat hack: %02x %x\n", cdr.Irq, cdr.Stat); + CDR_LOG_I("cdrom: stat hack: %02x %x\n", cdr.Irq, cdr.Stat); CDR_INT(0x1000); return; } @@ -787,10 +785,8 @@ void cdrInterrupt() { // GameShark CD Player: Resume play if( cdr.ParamC == 0 ) { -#ifdef CDR_LOG___0 CDR_LOG( "PLAY Resume @ %d:%d:%d\n", cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); -#endif //CDR_play( cdr.SetSectorPlay ); } @@ -798,18 +794,14 @@ void cdrInterrupt() { { // BIOS CD Player: Resume play if( cdr.Param[0] == 0 ) { -#ifdef CDR_LOG___0 CDR_LOG( "PLAY Resume T0 @ %d:%d:%d\n", cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); -#endif //CDR_play( cdr.SetSectorPlay ); } else { -#ifdef CDR_LOG___0 CDR_LOG( "PLAY Resume Td @ %d:%d:%d\n", cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); -#endif // BIOS CD Player: Allow track replaying StopCdda(); @@ -1285,11 +1277,12 @@ void cdrInterrupt() { psxHu32ref(0x1070) |= SWAP32((u32)0x4); } -#ifdef CDR_LOG - printf("cdrInterrupt() Log: CDR Interrupt IRQ %x: ", Irq); +#ifdef CDR_LOG_CMD_IRQ + SysPrintf("cdrInterrupt() Log: CDR Interrupt IRQ %d %02x: ", + cdr.Stat != NoIntr && cdr.Reg2 != 0x18, Irq); for (i = 0; i < cdr.ResultC; i++) - printf("%02x ", cdr.Result[i]); - printf("\n"); + SysPrintf("%02x ", cdr.Result[i]); + SysPrintf("\n"); #endif } @@ -1300,15 +1293,11 @@ void cdrReadInterrupt() { return; if (cdr.Irq || cdr.Stat) { - SysPrintf("cdrom: read stat hack %02x %x\n", cdr.Irq, cdr.Stat); + CDR_LOG_I("cdrom: read stat hack %02x %x\n", cdr.Irq, cdr.Stat); CDREAD_INT(0x1000); return; } -#ifdef CDR_LOG - CDR_LOG("cdrReadInterrupt() Log: KEY END"); -#endif - cdr.OCUP = 1; SetResultSize(1); cdr.StatP |= STATUS_READ|STATUS_ROTATING; @@ -1323,9 +1312,7 @@ void cdrReadInterrupt() { cdr.RErr = -1; if (cdr.RErr == -1) { -#ifdef CDR_LOG - fprintf(emuLog, "cdrReadInterrupt() Log: err\n"); -#endif + CDR_LOG_I("cdrReadInterrupt() Log: err\n"); memset(cdr.Transfer, 0, DATA_SIZE); cdr.Stat = DiskError; cdr.Result[0] |= STATUS_ERROR; @@ -1337,9 +1324,7 @@ void cdrReadInterrupt() { CheckPPFCache(cdr.Transfer, cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]); -#ifdef CDR_LOG - fprintf(emuLog, "cdrReadInterrupt() Log: cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]); -#endif + CDR_LOG("cdrReadInterrupt() Log: cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]); if ((!cdr.Muted) && (cdr.Mode & MODE_STRSND) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA // Firemen 2: Multi-XA files - briefings, cutscenes @@ -1402,9 +1387,9 @@ void cdrReadInterrupt() { // G-Police: Don't autopause ADPCM even if mode set (music) if ((cdr.Transfer[4 + 2] & 0x80) && (cdr.Mode & MODE_AUTOPAUSE) && (cdr.Transfer[4 + 2] & 0x4) != 0x4 ) { // EOF -#ifdef CDR_LOG + CDR_LOG("cdrReadInterrupt() Log: Autopausing read\n"); -#endif + // AddIrqQueue(AUTOPAUSE, 0x2000); AddIrqQueue(CdlPause, 0x2000); } @@ -1456,9 +1441,7 @@ unsigned char cdrRead0(void) { // What means the 0x10 and the 0x08 bits? I only saw it used by the bios cdr.Ctrl |= 0x18; -#ifdef CDR_LOG - CDR_LOG("cdrRead0() Log: CD0 Read: %x\n", cdr.Ctrl); -#endif + CDR_LOG_IO("cdr r0: %02x\n", cdr.Ctrl); return psxHu8(0x1800) = cdr.Ctrl; } @@ -1469,9 +1452,8 @@ cdrWrite0: */ void cdrWrite0(unsigned char rt) { -#ifdef CDR_LOG - CDR_LOG("cdrWrite0() Log: CD0 write: %x\n", rt); -#endif + CDR_LOG_IO("cdr w0: %02x\n", rt); + cdr.Ctrl = (rt & 3) | (cdr.Ctrl & ~3); } @@ -1485,9 +1467,8 @@ unsigned char cdrRead1(void) { } else { psxHu8(0x1801) = 0; } -#ifdef CDR_LOG - CDR_LOG("cdrRead1() Log: CD1 Read: %x\n", psxHu8(0x1801)); -#endif + CDR_LOG_IO("cdr r1: %02x\n", psxHu8(0x1801)); + return psxHu8(0x1801); } @@ -1495,10 +1476,7 @@ void cdrWrite1(unsigned char rt) { u8 set_loc[3]; int i; -#ifdef CDR_LOG - CDR_LOG("cdrWrite1() Log: CD1 write: %x (%s)\n", rt, CmdName[rt]); -#endif - + CDR_LOG_IO("cdr w1: %02x\n", rt); // Tekken: CDXA fade-out if( (cdr.Ctrl & 3) == 3 ) { @@ -1510,7 +1488,7 @@ void cdrWrite1(unsigned char rt) { cdr.Cmd = rt; cdr.OCUP = 0; -#ifdef CDRCMD_DEBUG +#ifdef CDR_LOG_CMD_IRQ SysPrintf("cdrWrite1() Log: CD1 write: %x (%s)", rt, CmdName[rt]); if (cdr.ParamC) { SysPrintf(" Param[%d] = {", cdr.ParamC); @@ -1709,9 +1687,8 @@ void cdrWrite1(unsigned char rt) { break; case CdlSetmode: -#ifdef CDR_LOG CDR_LOG("cdrWrite1() Log: Setmode %x\n", cdr.Param[0]); -#endif + cdr.Mode = cdr.Param[0]; cdr.Ctrl |= 0x80; cdr.Stat = NoIntr; @@ -1827,9 +1804,7 @@ void cdrWrite1(unsigned char rt) { default: cdr.ParamP = 0; cdr.ParamC = 0; -#ifdef CDR_LOG - CDR_LOG("cdrWrite1() Log: Unknown command: %x\n", cdr.Cmd); -#endif + CDR_LOG_I("cdrWrite1() Log: Unknown command: %x\n", cdr.Cmd); return; } if (cdr.Stat != NoIntr) { @@ -1846,16 +1821,12 @@ unsigned char cdrRead2(void) { ret = *pTransfer++; } -#ifdef CDR_LOG - CDR_LOG("cdrRead2() Log: CD2 Read: %x\n", ret); -#endif + CDR_LOG_IO("cdr r2: %02x\n", ret); return ret; } void cdrWrite2(unsigned char rt) { -#ifdef CDR_LOG - CDR_LOG("cdrWrite2() Log: CD2 write: %x\n", rt); -#endif + CDR_LOG_IO("cdr w2: %02x\n", rt); // Tekken: CDXA fade-out if( (cdr.Ctrl & 3) == 2 ) { @@ -1894,27 +1865,22 @@ unsigned char cdrRead3(void) { } else { psxHu8(0x1803) = 0; } -#ifdef CDR_LOG - CDR_LOG("cdrRead3() Log: CD3 Read: %x\n", psxHu8(0x1803)); -#endif + + CDR_LOG_IO("cdr r3: %02x\n", psxHu8(0x1803)); return psxHu8(0x1803); } void cdrWrite3(unsigned char rt) { -#ifdef CDR_LOG - CDR_LOG("cdrWrite3() Log: CD3 write: %x\n", rt); -#endif + CDR_LOG_IO("cdr w3: %02x\n", rt); // Tekken: CDXA fade-out if( (cdr.Ctrl & 3) == 2 ) { cdr.AttenuatorLeft[1] = rt; } else if( (cdr.Ctrl & 3) == 3 && rt == 0x20 ) { -#ifdef CDR_LOG CDR_LOG( "CD-XA Volume: %X %X | %X %X\n", cdr.AttenuatorLeft[0], cdr.AttenuatorLeft[1], cdr.AttenuatorRight[0], cdr.AttenuatorRight[1] ); -#endif } @@ -1949,7 +1915,7 @@ void cdrWrite3(unsigned char rt) { int time = (cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime; if (Config.CdrReschedule != 2) if (left < time / 2 || Config.CdrReschedule) { // rearmed guesswork hack - //printf("-- resched %d -> %d\n", left, time); + CDR_LOG_I("-- resched %d -> %d\n", left, time); CDREAD_INT(time); } } @@ -1982,17 +1948,13 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) { int size; u8 *ptr; -#ifdef CDR_LOG CDR_LOG("psxDma3() Log: *** DMA 3 *** %x addr = %x size = %x\n", chcr, madr, bcr); -#endif switch (chcr) { case 0x11000000: case 0x11400100: if (cdr.Readed == 0) { -#ifdef CDR_LOG CDR_LOG("psxDma3() Log: *** DMA 3 *** NOT READY\n"); -#endif break; } @@ -2012,9 +1974,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) { ptr = (u8 *)PSXM(madr); if (ptr == NULL) { -#ifdef CPU_LOG CDR_LOG("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n"); -#endif break; } @@ -2046,9 +2006,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) { return; default: -#ifdef CDR_LOG CDR_LOG("psxDma3() Log: Unknown cddma %x\n", chcr); -#endif break; } -- cgit v1.2.3 From 94c118c3c7a031500d0d1b2ede9d85124239b323 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 27 Dec 2012 04:03:14 +0200 Subject: cdrom: cleanup various hacks Most decisions were made based on Mednafen source on Nocash doc, so all credits for hardware info go to Ryphecha/Nocash. A few things confirmed on real hardware by me. --- libpcsxcore/cdrom.c | 414 +++++++++++++++------------------------------------- 1 file changed, 114 insertions(+), 300 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 614f0d9..eebd8ed 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -78,12 +78,6 @@ static unsigned char *pTransfer; #define CdlReset 28 #define CdlReadToc 30 -#define AUTOPAUSE 249 -#define READ_ACK 250 -#define READ 251 -#define REPPLAY_ACK 252 -#define REPPLAY 253 -#define ASYNC 254 /* don't set 255, it's reserved */ char *CmdName[0x100]= { @@ -191,13 +185,6 @@ static void sec2msf(unsigned int s, u8 *msf) { new_dyna_set_event(PSXINT_CDRPLAY, eCycle); \ } -#define StartReading(type, eCycle) { \ - cdr.Reading = type; \ - cdr.FirstSector = 1; \ - cdr.Readed = 0xff; \ - AddIrqQueue(READ_ACK, eCycle); \ -} - #define StopReading() { \ if (cdr.Reading) { \ cdr.Reading = 0; \ @@ -218,11 +205,16 @@ static void sec2msf(unsigned int s, u8 *msf) { } #define SetResultSize(size) { \ - cdr.ResultP = 0; \ + cdr.ResultP = 0; \ cdr.ResultC = size; \ cdr.ResultReady = 1; \ } +static void setIrq(void) +{ + if (cdr.Stat & cdr.Reg2) + psxHu32ref(0x1070) |= SWAP32((u32)0x4); +} void cdrLidSeekInterrupt() { @@ -341,8 +333,7 @@ static void Check_Shell( int Irq ) if( cdr.Stat == NoIntr ) cdr.Stat = Acknowledge; - psxHu32ref(0x1070) |= SWAP32((u32)0x4); - + setIrq(); // begin close-seek-ready cycle CDRLID_INT( cdReadTime * 3 ); @@ -382,12 +373,11 @@ static void Check_Shell( int Irq ) if( cdr.Stat == NoIntr ) cdr.Stat = Acknowledge; - psxHu32ref(0x1070) |= SWAP32((u32)0x4); + setIrq(); } } } - void Find_CurTrack() { cdr.CurTrack = 0; @@ -596,7 +586,7 @@ static void cdrPlayInterrupt_Autopause() //cdr.ResultReady = 1; //cdr.Stat = DataReady; cdr.Stat = DataEnd; - psxHu32ref(0x1070) |= SWAP32((u32)0x4); + setIrq(); StopCdda(); } @@ -641,7 +631,7 @@ static void cdrPlayInterrupt_Autopause() cdr.Stat = DataReady; SetResultSize(8); - psxHu32ref(0x1070) |= SWAP32((u32)0x4); + setIrq(); } } @@ -660,8 +650,7 @@ void cdrPlayInterrupt() cdr.Result[0] = cdr.StatP; if (cdr.Irq == 0 || cdr.Irq == 0xff) { cdr.Stat = Complete; - if (cdr.Reg2 != 0x18) - psxHu32ref(0x1070) |= SWAP32(0x4); + setIrq(); } cdr.Seeked = SEEK_PENDING; @@ -1202,20 +1191,8 @@ void cdrInterrupt() { cdr.Stat = Complete; break; - case AUTOPAUSE: - cdr.OCUP = 0; -/* SetResultSize(1); - StopCdda(); - StopReading(); - cdr.OCUP = 0; - cdr.StatP&=~0x20; - cdr.StatP|= 0x2; - cdr.Result[0] = cdr.StatP; - cdr.Stat = DataEnd; -*/ AddIrqQueue(CdlPause, 0x800); - break; - - case READ_ACK: + case CdlReadN: + case CdlReadS: if (!cdr.Reading) return; @@ -1270,12 +1247,9 @@ void cdrInterrupt() { Check_Shell( Irq ); - cdr.ParamP = 0; cdr.ParamC = 0; - if (cdr.Stat != NoIntr && cdr.Reg2 != 0x18) { - psxHu32ref(0x1070) |= SWAP32((u32)0x4); - } + setIrq(); #ifdef CDR_LOG_CMD_IRQ SysPrintf("cdrInterrupt() Log: CDR Interrupt IRQ %d %02x: ", @@ -1365,7 +1339,7 @@ void cdrReadInterrupt() { // - don't do here // signal ADPCM data ready - psxHu32ref(0x1070) |= SWAP32((u32)0x200); + setIrq(); #endif } else cdr.FirstSector = -1; @@ -1390,7 +1364,6 @@ void cdrReadInterrupt() { CDR_LOG("cdrReadInterrupt() Log: Autopausing read\n"); -// AddIrqQueue(AUTOPAUSE, 0x2000); AddIrqQueue(CdlPause, 0x2000); } else { @@ -1410,15 +1383,14 @@ void cdrReadInterrupt() { // Rockman X5 - no music restart problem cdr.Stat = NoIntr; } - psxHu32ref(0x1070) |= SWAP32((u32)0x4); + setIrq(); Check_Shell(0); } /* cdrRead0: - bit 0 - 0 REG1 command send / 1 REG1 data read - bit 1 - 0 data transfer finish / 1 data transfer ready/in progress + bit 0,1 - mode bit 2 - unknown bit 3 - unknown bit 4 - unknown @@ -1446,11 +1418,6 @@ unsigned char cdrRead0(void) { return psxHu8(0x1800) = cdr.Ctrl; } -/* -cdrWrite0: - 0 - to send a command / 1 - to get the result -*/ - void cdrWrite0(unsigned char rt) { CDR_LOG_IO("cdr w0: %02x\n", rt); @@ -1458,15 +1425,14 @@ void cdrWrite0(unsigned char rt) { } unsigned char cdrRead1(void) { - if (cdr.ResultReady) { // && cdr.Ctrl & 0x1) { - // GameShark CDX CD Player: uses 17 bytes output (wraps around) + if ((cdr.ResultP & 0xf) < cdr.ResultC) psxHu8(0x1801) = cdr.Result[cdr.ResultP & 0xf]; - cdr.ResultP++; - if (cdr.ResultP == cdr.ResultC) - cdr.ResultReady = 0; - } else { + else psxHu8(0x1801) = 0; - } + cdr.ResultP++; + if (cdr.ResultP == cdr.ResultC) + cdr.ResultReady = 0; + CDR_LOG_IO("cdr r1: %02x\n", psxHu8(0x1801)); return psxHu8(0x1801); @@ -1478,13 +1444,16 @@ void cdrWrite1(unsigned char rt) { CDR_LOG_IO("cdr w1: %02x\n", rt); - // Tekken: CDXA fade-out - if( (cdr.Ctrl & 3) == 3 ) { - cdr.AttenuatorRight[0] = rt; + switch (cdr.Ctrl & 3) { + case 0: + break; + case 3: + cdr.AttenuatorRight[1] = rt; + return; + default: + return; } - -// psxHu8(0x1801) = rt; cdr.Cmd = rt; cdr.OCUP = 0; @@ -1500,43 +1469,40 @@ void cdrWrite1(unsigned char rt) { } #endif - if (cdr.Ctrl & 0x3) return; - cdr.ResultReady = 0; + cdr.Ctrl |= 0x80; + // cdr.Stat = NoIntr; + AddIrqQueue(cdr.Cmd, 0x800); switch (cdr.Cmd) { - case CdlSync: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlNop: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - - // Twisted Metal 3 - fix music - AddIrqQueue(cdr.Cmd, 0x800); - break; + case CdlSync: + case CdlNop: + case CdlForward: + case CdlBackward: + case CdlReadT: + case CdlTest: + case CdlID: + case CdlReadToc: + case CdlGetmode: + case CdlGetlocL: + case CdlGetlocP: + case CdlGetTD: + break; - case CdlSetloc: + case CdlSetloc: StopReading(); for (i = 0; i < 3; i++) set_loc[i] = btoi(cdr.Param[i]); i = abs(msf2sec(cdr.SetSector) - msf2sec(set_loc)); if (i > 16) - cdr.Seeked = SEEK_PENDING; + cdr.Seeked = SEEK_PENDING; memcpy(cdr.SetSector, set_loc, 3); - cdr.SetSector[3] = 0; - - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; + cdr.SetSector[3] = 0; + break; - case CdlPlay: + case CdlPlay: // Vib Ribbon: try same track again StopCdda(); @@ -1560,50 +1526,25 @@ void cdrWrite1(unsigned char rt) { //TODO? //CDRDBUF_INT( PSXCLK / 44100 * 0x100 ); - cdr.Play = TRUE; cdr.StatP |= STATUS_SEEK; cdr.StatP &= ~STATUS_ROTATING; + break; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlForward: - //if (cdr.CurTrack < 0xaa) - // cdr.CurTrack++; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlBackward: - //if (cdr.CurTrack > 1) - //cdr.CurTrack--; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlReadN: - cdr.Irq = 0; + case CdlReadN: StopReading(); - cdr.Ctrl|= 0x80; - cdr.Stat = NoIntr; - StartReading(1, 0x800); + cdr.Reading = 1; + cdr.FirstSector = 1; + cdr.Readed = 0xff; break; - case CdlStandby: + case CdlStandby: StopCdda(); StopReading(); - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; + break; - case CdlStop: + case CdlStop: // GameShark CD Player: Reset CDDA to track start if( cdr.Play && CDR_getStatus(&stat) != -1 ) { cdr.SetSectorPlay[0] = stat.Time[0]; @@ -1612,7 +1553,6 @@ void cdrWrite1(unsigned char rt) { Find_CurTrack(); - // grab time for current track CDR_getTD((u8)(cdr.CurTrack), cdr.ResultTD); @@ -1623,13 +1563,9 @@ void cdrWrite1(unsigned char rt) { StopCdda(); StopReading(); + break; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlPause: + case CdlPause: /* GameShark CD Player: save time for resume @@ -1638,61 +1574,41 @@ void cdrWrite1(unsigned char rt) { StopCdda(); StopReading(); - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - - AddIrqQueue(cdr.Cmd, 0x800); break; case CdlReset: - case CdlInit: + case CdlInit: cdr.Seeked = SEEK_DONE; StopCdda(); StopReading(); - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlMute: - cdr.Muted = TRUE; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); + break; + case CdlMute: + cdr.Muted = TRUE; // Duke Nukem - Time to Kill // - do not directly set cd-xa volume //SPU_writeRegister( H_CDLeft, 0x0000 ); //SPU_writeRegister( H_CDRight, 0x0000 ); - break; + break; - case CdlDemute: - cdr.Muted = FALSE; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); + case CdlDemute: + cdr.Muted = FALSE; // Duke Nukem - Time to Kill // - do not directly set cd-xa volume //SPU_writeRegister( H_CDLeft, 0x7f00 ); //SPU_writeRegister( H_CDRight, 0x7f00 ); - break; + break; case CdlSetfilter: cdr.File = cdr.Param[0]; cdr.Channel = cdr.Param[1]; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); break; case CdlSetmode: CDR_LOG("cdrWrite1() Log: Setmode %x\n", cdr.Param[0]); cdr.Mode = cdr.Param[0]; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); // Squaresoft on PlayStation 1998 Collector's CD Vol. 1 // - fixes choppy movie sound @@ -1700,116 +1616,32 @@ void cdrWrite1(unsigned char rt) { StopCdda(); break; - case CdlGetmode: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlGetlocL: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - - // Crusaders of Might and Magic - cutscene speech - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlGetlocP: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - - // GameShark CDX / Lite Player: pretty narrow time window - // - doesn't always work due to time inprecision - //AddIrqQueue(cdr.Cmd, 0x28); - - // Tomb Raider 2 - cdda - //AddIrqQueue(cdr.Cmd, 0x40); - - // rearmed: the above works in pcsxr-svn, but breaks here - // (TOCA world touring cars), perhaps some other code is not merged yet - AddIrqQueue(cdr.Cmd, 0x1000); - break; - case CdlGetTN: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; //AddIrqQueue(cdr.Cmd, 0x800); // GameShark CDX CD Player: very long time AddIrqQueue(cdr.Cmd, 0x100000); break; - case CdlGetTD: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - case CdlSeekL: -// ((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0]; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - - StopCdda(); - StopReading(); - - break; - case CdlSeekP: -// ((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0]; - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - // Tomb Raider 2 - reset cdda StopCdda(); StopReading(); - - AddIrqQueue(cdr.Cmd, 0x800); - break; - - // Destruction Derby: read TOC? GetTD after this - case CdlReadT: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); break; - case CdlTest: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - case CdlID: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - case CdlReadS: - cdr.Irq = 0; StopReading(); - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - StartReading(2, 0x800); + cdr.Reading = 2; + cdr.FirstSector = 1; + cdr.Readed = 0xff; break; - case CdlReadToc: - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(cdr.Cmd, 0x800); - break; - - default: - cdr.ParamP = 0; + default: cdr.ParamC = 0; CDR_LOG_I("cdrWrite1() Log: Unknown command: %x\n", cdr.Cmd); return; } - if (cdr.Stat != NoIntr) { - psxHu32ref(0x1070) |= SWAP32((u32)0x4); - } } unsigned char cdrRead2(void) { @@ -1828,43 +1660,29 @@ unsigned char cdrRead2(void) { void cdrWrite2(unsigned char rt) { CDR_LOG_IO("cdr w2: %02x\n", rt); - // Tekken: CDXA fade-out - if( (cdr.Ctrl & 3) == 2 ) { + switch (cdr.Ctrl & 3) { + case 0: + if (cdr.ParamC < 8) // FIXME: size and wrapping + cdr.Param[cdr.ParamC++] = rt; + return; + case 1: + cdr.Reg2 = rt; + setIrq(); + return; + case 2: cdr.AttenuatorLeft[0] = rt; - } - else if( (cdr.Ctrl & 3) == 3 ) { - cdr.AttenuatorRight[1] = rt; - } - - - if (cdr.Ctrl & 0x1) { - switch (rt) { - case 0x07: - cdr.ParamP = 0; - cdr.ParamC = 0; - cdr.ResultReady = 1; //0; - cdr.Ctrl &= ~3; //cdr.Ctrl = 0; - break; - - default: - cdr.Reg2 = rt; - break; - } - } else if (!(cdr.Ctrl & 0x3) && cdr.ParamP < 8) { - cdr.Param[cdr.ParamP++] = rt; - cdr.ParamC++; + return; + case 3: + cdr.AttenuatorRight[0] = rt; + return; } } unsigned char cdrRead3(void) { - if (cdr.Stat) { - if (cdr.Ctrl & 0x1) - psxHu8(0x1803) = cdr.Stat | 0xE0; - else - psxHu8(0x1803) = 0xff; - } else { - psxHu8(0x1803) = 0; - } + if (cdr.Ctrl & 0x1) + psxHu8(0x1803) = cdr.Stat | 0xE0; + else + psxHu8(0x1803) = cdr.Reg2 | 0xE0; CDR_LOG_IO("cdr r3: %02x\n", psxHu8(0x1803)); return psxHu8(0x1803); @@ -1873,34 +1691,28 @@ unsigned char cdrRead3(void) { void cdrWrite3(unsigned char rt) { CDR_LOG_IO("cdr w3: %02x\n", rt); - // Tekken: CDXA fade-out - if( (cdr.Ctrl & 3) == 2 ) { + switch (cdr.Ctrl & 3) { + case 0: + goto transfer; + case 1: + break; // irq + case 2: cdr.AttenuatorLeft[1] = rt; - } - else if( (cdr.Ctrl & 3) == 3 && rt == 0x20 ) { + return; + case 3: + if (rt == 0x20) CDR_LOG( "CD-XA Volume: %X %X | %X %X\n", cdr.AttenuatorLeft[0], cdr.AttenuatorLeft[1], cdr.AttenuatorRight[0], cdr.AttenuatorRight[1] ); + return; } + cdr.Stat &= ~rt; - // GameShark CDX CD Player: Irq timing mania - if( rt == 0 && - cdr.Irq != 0 && cdr.Irq != 0xff && - cdr.ResultReady == 0 ) { - - // GS CDX: ~0x28 cycle timing - way too precise - if( cdr.Irq == CdlGetlocP ) { - cdrInterrupt(); - - psxRegs.interrupt &= ~(1 << PSXINT_CDR); - } - } - - - if (rt == 0x07 && (cdr.Ctrl & 3) == 1) { - cdr.Stat = 0; + if (rt & 0x40) + cdr.ParamC = 0; + if (rt == 0x07) { if (cdr.Irq == 0xff) { cdr.Irq = 0; return; @@ -1919,11 +1731,11 @@ void cdrWrite3(unsigned char rt) { CDREAD_INT(time); } } - - return; } + return; - if (rt == 0x80 && !(cdr.Ctrl & 0x3) && cdr.Readed == 0) { +transfer: + if ((rt & 0x80) && cdr.Readed == 0) { cdr.Readed = 1; pTransfer = cdr.Transfer; @@ -2033,8 +1845,8 @@ void cdrReset() { // BIOS player - default values cdr.AttenuatorLeft[0] = 0x80; cdr.AttenuatorLeft[1] = 0x00; - cdr.AttenuatorRight[0] = 0x80; - cdr.AttenuatorRight[1] = 0x00; + cdr.AttenuatorRight[0] = 0x00; + cdr.AttenuatorRight[1] = 0x80; } int cdrFreeze(void *f, int Mode) { @@ -2046,8 +1858,10 @@ int cdrFreeze(void *f, int Mode) { gzfreeze(&cdr, sizeof(cdr)); - if (Mode == 1) + if (Mode == 1) { + cdr.ParamP = cdr.ParamC; tmp = pTransfer - cdr.Transfer; + } gzfreeze(&tmp, sizeof(tmp)); -- cgit v1.2.3 From a34a244536185a4b7caa53f3ea7267feb969db85 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 27 Dec 2012 04:33:25 +0200 Subject: cdrom: cleanup irq reschedule and pause hacks --- libpcsxcore/cdrom.c | 66 +++++++++++------------------------------------------ 1 file changed, 13 insertions(+), 53 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index eebd8ed..15c05aa 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -78,8 +78,6 @@ static unsigned char *pTransfer; #define CdlReset 28 #define CdlReadToc 30 -/* don't set 255, it's reserved */ - char *CmdName[0x100]= { "CdlSync", "CdlNop", "CdlSetloc", "CdlPlay", "CdlForward", "CdlBackward", "CdlReadN", "CdlStandby", @@ -423,7 +421,7 @@ static void ReadTrack( u8 *time ) { static void AddIrqQueue(unsigned char irq, unsigned long ecycle) { - if (cdr.Irq != 0 && cdr.Irq != 0xff) + if (cdr.Irq != 0) CDR_LOG_I("cdr: override cmd %02x -> %02x\n", cdr.Irq, irq); cdr.Irq = irq; @@ -648,7 +646,7 @@ void cdrPlayInterrupt() cdr.StatP |= STATUS_ROTATING; cdr.StatP &= ~STATUS_SEEK; cdr.Result[0] = cdr.StatP; - if (cdr.Irq == 0 || cdr.Irq == 0xff) { + if (cdr.Irq == 0) { cdr.Stat = Complete; setIrq(); } @@ -701,7 +699,7 @@ void cdrInterrupt() { return; } - cdr.Irq = 0xff; + cdr.Irq = 0; cdr.Ctrl &= ~0x80; switch (Irq) { @@ -1358,17 +1356,7 @@ void cdrReadInterrupt() { cdr.Readed = 0; - // G-Police: Don't autopause ADPCM even if mode set (music) - if ((cdr.Transfer[4 + 2] & 0x80) && (cdr.Mode & MODE_AUTOPAUSE) && - (cdr.Transfer[4 + 2] & 0x4) != 0x4 ) { // EOF - - CDR_LOG("cdrReadInterrupt() Log: Autopausing read\n"); - - AddIrqQueue(CdlPause, 0x2000); - } - else { - CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime); - } + CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime); /* Croc 2: $40 - only FORM1 (*) @@ -1376,14 +1364,10 @@ void cdrReadInterrupt() { Sim Theme Park - no adpcm at all (zero) */ - if( (cdr.Mode & MODE_STRSND) == 0 || (cdr.Transfer[4+2] & 0x4) != 0x4 ) { + if (!(cdr.Mode & MODE_STRSND) || !(cdr.Transfer[4+2] & 0x4)) { cdr.Stat = DataReady; - } else { - // Breath of Fire 3 - fix inn sleeping - // Rockman X5 - no music restart problem - cdr.Stat = NoIntr; + setIrq(); } - setIrq(); Check_Shell(0); } @@ -1693,9 +1677,13 @@ void cdrWrite3(unsigned char rt) { switch (cdr.Ctrl & 3) { case 0: - goto transfer; + break; // transfer case 1: - break; // irq + cdr.Stat &= ~rt; + + if (rt & 0x40) + cdr.ParamC = 0; + return; case 2: cdr.AttenuatorLeft[1] = rt; return; @@ -1707,34 +1695,6 @@ void cdrWrite3(unsigned char rt) { return; } - cdr.Stat &= ~rt; - - if (rt & 0x40) - cdr.ParamC = 0; - - if (rt == 0x07) { - if (cdr.Irq == 0xff) { - cdr.Irq = 0; - return; - } - - // XA streaming - incorrect timing because of this reschedule - // - Final Fantasy Tactics - // - various other games - - if (cdr.Reading && !cdr.ResultReady) { - int left = psxRegs.intCycle[PSXINT_CDREAD].sCycle + psxRegs.intCycle[PSXINT_CDREAD].cycle - psxRegs.cycle; - int time = (cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime; - if (Config.CdrReschedule != 2) - if (left < time / 2 || Config.CdrReschedule) { // rearmed guesswork hack - CDR_LOG_I("-- resched %d -> %d\n", left, time); - CDREAD_INT(time); - } - } - } - return; - -transfer: if ((rt & 0x80) && cdr.Readed == 0) { cdr.Readed = 1; pTransfer = cdr.Transfer; @@ -1879,7 +1839,7 @@ void LidInterrupt() { cdr.LidCheck = 0x20; // start checker CDRLID_INT( cdReadTime * 3 ); - + // generate interrupt if none active - open or close if (cdr.Irq == 0 || cdr.Irq == 0xff) { cdr.Ctrl |= 0x80; -- cgit v1.2.3 From 535ea62fdb1f9fd5bb22af1d3683adf03d6f1fc3 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 27 Dec 2012 04:34:56 +0200 Subject: frontend: remove unneeded hack options --- frontend/main.c | 1 - frontend/menu.c | 8 ++------ libpcsxcore/psxcommon.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/frontend/main.c b/frontend/main.c index d46e536..c8841b9 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -146,7 +146,6 @@ void emu_set_default_config(void) // try to set sane config on which most games work Config.Xa = Config.Cdda = Config.Sio = Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; - Config.CdrReschedule = 0; Config.PsxAuto = 1; pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto diff --git a/frontend/menu.c b/frontend/menu.c index 9cfa171..7bec49a 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -278,7 +278,7 @@ static const struct { CE_CONFIG_STR(Spu), // CE_CONFIG_STR(Cdr), CE_CONFIG_VAL(Xa), - CE_CONFIG_VAL(Sio), +// CE_CONFIG_VAL(Sio), CE_CONFIG_VAL(Mdec), CE_CONFIG_VAL(Cdda), CE_CONFIG_VAL(Debug), @@ -287,7 +287,6 @@ static const struct { CE_CONFIG_VAL(RCntFix), CE_CONFIG_VAL(VSyncWA), CE_CONFIG_VAL(Cpu), - CE_CONFIG_VAL(CdrReschedule), CE_INTVAL(region), CE_INTVAL_V(g_scaler, 2), CE_INTVAL(g_layer_x), @@ -1369,7 +1368,6 @@ static int menu_loop_speed_hacks(int id, int keys) return 0; } -static const char *men_cfg_cdrr[] = { "Auto", "ON", "OFF", NULL }; static const char h_cfg_cpul[] = "Shows CPU usage in %"; static const char h_cfg_spu[] = "Shows active SPU channels\n" "(green: normal, red: fmod, blue: noise)"; @@ -1383,7 +1381,6 @@ static const char h_cfg_rcnt1[] = "Parasite Eve 2, Vandal Hearts 1/2 Fix\n" "(timing hack, breaks other games)"; static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix\n" "(timing hack, breaks other games)"; -static const char h_cfg_cdrr[] = "Compatibility tweak (CD timing hack, breaks FMVs)"; static const char h_cfg_nodrc[] = "Disable dynamic recompiler and use interpreter\n" "Might be useful to overcome some dynarec bugs"; static const char h_cfg_shacks[] = "Breaks games but may give better performance\n" @@ -1396,11 +1393,10 @@ static menu_entry e_menu_adv_options[] = mee_onoff_h ("Disable Frame Limiter", 0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl), mee_onoff_h ("Disable XA Decoding", 0, Config.Xa, 1, h_cfg_xa), mee_onoff_h ("Disable CD Audio", 0, Config.Cdda, 1, h_cfg_cdda), - mee_onoff_h ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio), + //mee_onoff_h ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio), mee_onoff_h ("SPU IRQ Always Enabled", 0, Config.SpuIrq, 1, h_cfg_spuirq), //mee_onoff_h ("Rootcounter hack", 0, Config.RCntFix, 1, h_cfg_rcnt1), mee_onoff_h ("Rootcounter hack 2", 0, Config.VSyncWA, 1, h_cfg_rcnt2), - mee_enum_h ("CD read reschedule hack",0, Config.CdrReschedule, men_cfg_cdrr, h_cfg_cdrr), mee_onoff_h ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc), mee_handler_h ("[Speed hacks]", menu_loop_speed_hacks, h_cfg_shacks), mee_end, diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h index 59212f3..9f5444e 100644 --- a/libpcsxcore/psxcommon.h +++ b/libpcsxcore/psxcommon.h @@ -125,7 +125,6 @@ typedef struct { boolean RCntFix; boolean UseNet; boolean VSyncWA; - boolean CdrReschedule; u8 Cpu; // CPU_DYNAREC or CPU_INTERPRETER u8 PsxType; // PSX_TYPE_NTSC or PSX_TYPE_PAL #ifdef _WIN32 -- cgit v1.2.3 From 892bd7d42b966b6f5df71e98457431822634eff1 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 28 Dec 2012 02:15:29 +0200 Subject: cdrom: rework seek hack --- libpcsxcore/cdrom.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 15c05aa..ff03b7d 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -134,7 +134,6 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 }; enum seeked_state { SEEK_PENDING = 0, SEEK_DONE = 1, - SEEK_DOING_CMD = 2, }; static struct CdrStat stat; @@ -548,12 +547,6 @@ static void cdrPlayInterrupt_Autopause() struct SubQ *subq = (struct SubQ *)CDR_getBufferSub(); int track_changed = 0; if (subq != NULL ) { - // update subq - ReadTrack( cdr.SetSectorPlay ); - - CDR_LOG( "CDDA SUB - %X:%X:%X\n", - subq->AbsoluteAddress[0], subq->AbsoluteAddress[1], subq->AbsoluteAddress[2] ); - /* CDDA Autopause @@ -566,10 +559,6 @@ static void cdrPlayInterrupt_Autopause() if( cdr.CurTrack + 1 == btoi( subq->TrackNumber ) ) track_changed = 1; } else { - Create_Fake_Subq(); - CDR_LOG( "CDDA FAKE SUB - %d:%d:%d\n", - fake_subq_real[0], fake_subq_real[1], fake_subq_real[2] ); - track_changed = fake_subq_change; fake_subq_change = 0; } @@ -636,7 +625,7 @@ static void cdrPlayInterrupt_Autopause() // also handles seek void cdrPlayInterrupt() { - if (cdr.Seeked == SEEK_DOING_CMD) { + if (cdr.Seeked == SEEK_PENDING) { if (cdr.Stat) { CDR_LOG_I("cdrom: seek stat hack\n"); CDRMISC_INT(0x1000); @@ -646,24 +635,25 @@ void cdrPlayInterrupt() cdr.StatP |= STATUS_ROTATING; cdr.StatP &= ~STATUS_SEEK; cdr.Result[0] = cdr.StatP; + cdr.Seeked = SEEK_DONE; if (cdr.Irq == 0) { cdr.Stat = Complete; setIrq(); } - cdr.Seeked = SEEK_PENDING; - CDRMISC_INT(cdReadTime * 20); // ??? - return; - } - else if (cdr.Seeked == SEEK_PENDING) { - cdr.Seeked = SEEK_DONE; - if (!cdr.Play && !cdr.Reading) { - memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); - Find_CurTrack(); - ReadTrack(cdr.SetSector); - } + memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); + Find_CurTrack(); + ReadTrack(cdr.SetSectorPlay); } + // update for CdlGetlocP/autopause + struct SubQ *subq = (struct SubQ *)CDR_getBufferSub(); + if (subq != NULL) + // update subq + ReadTrack(cdr.SetSectorPlay); + else + Create_Fake_Subq(); + if (!cdr.Play) return; CDR_LOG( "CDDA - %d:%d:%d\n", @@ -671,7 +661,7 @@ void cdrPlayInterrupt() CDRMISC_INT( cdReadTime ); - if (!cdr.Irq && !cdr.Stat && (cdr.Mode & MODE_CDDA) && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT))) + if (!cdr.Irq && !cdr.Stat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT))) cdrPlayInterrupt_Autopause(); cdr.SetSectorPlay[2]++; @@ -986,9 +976,8 @@ void cdrInterrupt() { subq = (struct SubQ *)CDR_getBufferSub(); if (subq != NULL) { - if( cdr.Play && (cdr.Mode & MODE_CDDA) && !(cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT)) ) - // update subq - ReadTrack( cdr.SetSectorPlay ); + // update subq + ReadTrack( cdr.SetSector ); cdr.Result[0] = subq->TrackNumber; cdr.Result[1] = subq->IndexNumber; @@ -1003,10 +992,9 @@ void cdrInterrupt() { } } } else { - if( cdr.Play == FALSE || !(cdr.Mode & MODE_CDDA) || !(cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT)) ) + if (cdr.Play == FALSE) Create_Fake_Subq(); - // track # / index # cdr.Result[0] = itob(cdr.CurTrack); cdr.Result[1] = itob(fake_subq_index); @@ -1022,6 +1010,9 @@ void cdrInterrupt() { cdr.Result[7] = itob( fake_subq_real[2] ); } + if (!cdr.Play && !cdr.Reading) + cdr.Result[1] = 0; // HACK? + // redump.org - wipe time if( !cdr.Play && CheckSBI(cdr.Result+5) ) { memset( cdr.Result+2, 0, 6 ); @@ -1089,7 +1080,7 @@ void cdrInterrupt() { - fix capcom logo */ CDRMISC_INT(cdr.Seeked == SEEK_DONE ? 0x800 : cdReadTime * 4); - cdr.Seeked = SEEK_DOING_CMD; + cdr.Seeked = SEEK_PENDING; break; case CdlTest: -- cgit v1.2.3 From 2d5ca6c0ed5b30a57a7eebc263ea0a624c33df57 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 28 Dec 2012 03:30:19 +0200 Subject: cdrom: clean up play command handling Once again, based on mednafen/nocash. --- libpcsxcore/cdrom.c | 148 +++++++++++++--------------------------------------- 1 file changed, 36 insertions(+), 112 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index ff03b7d..5ea0e3d 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -429,37 +429,6 @@ static void AddIrqQueue(unsigned char irq, unsigned long ecycle) { CDR_INT(ecycle); } - -void Set_Track() -{ - if (CDR_getTN(cdr.ResultTN) != -1) { - int lcv; - - for( lcv = 1; lcv < cdr.ResultTN[1]; lcv++ ) { - if (CDR_getTD((u8)(lcv), cdr.ResultTD) != -1) { - CDR_LOG( "settrack %d %d %d | %d %d %d | %d\n", - cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], - cdr.ResultTD[2], cdr.ResultTD[1], cdr.ResultTD[0], - cdr.CurTrack ); - - // check if time matches track start (only need min, sec accuracy) - // - m:s:f vs f:s:m - if( cdr.SetSectorPlay[0] == cdr.ResultTD[2] && - cdr.SetSectorPlay[1] == cdr.ResultTD[1] ) { - // skip pregap frames - if( cdr.SetSectorPlay[2] < cdr.ResultTD[0] ) - cdr.SetSectorPlay[2] = cdr.ResultTD[0]; - - break; - } - else if( cdr.SetSectorPlay[0] < cdr.ResultTD[2] ) - break; - } - } - } -} - - static u8 fake_subq_local[3], fake_subq_real[3], fake_subq_index, fake_subq_change; static void Create_Fake_Subq() { @@ -725,6 +694,29 @@ void cdrInterrupt() { cdr.Seeked = SEEK_DONE; } + // BIOS CD Player + // - Pause player, hit Track 01/02/../xx (Setloc issued!!) + + if (cdr.ParamC == 0 || cdr.Param[0] == 0) { + CDR_LOG("PLAY Resume @ %d:%d:%d\n", + cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2]); + } + else + { + int track = btoi( cdr.Param[0] ); + + if (track <= cdr.ResultTN[1]) + cdr.CurTrack = track; + + CDR_LOG("PLAY track %d\n", cdr.CurTrack); + + if (CDR_getTD((u8)cdr.CurTrack, cdr.ResultTD) != -1) { + cdr.SetSectorPlay[0] = cdr.ResultTD[2]; + cdr.SetSectorPlay[1] = cdr.ResultTD[1]; + cdr.SetSectorPlay[2] = cdr.ResultTD[0]; + } + } + /* Rayman: detect track changes - fixes logo freeze @@ -735,84 +727,15 @@ void cdrInterrupt() { Wild 9: skip PREGAP + starting accurate SubQ - plays tracks without retry play */ - /* unneeded with correct cdriso? - Set_Track(); - */ Find_CurTrack(); - ReadTrack( cdr.SetSectorPlay ); - - // GameShark CD Player: Calls 2x + Play 2x - if( cdr.FastBackward || cdr.FastForward ) { - if( cdr.FastForward ) cdr.FastForward--; - if( cdr.FastBackward ) cdr.FastBackward--; - - if( cdr.FastBackward == 0 && cdr.FastForward == 0 ) { - if( cdr.Play && CDR_getStatus(&stat) != -1 ) { - cdr.SetSectorPlay[0] = stat.Time[0]; - cdr.SetSectorPlay[1] = stat.Time[1]; - cdr.SetSectorPlay[2] = stat.Time[2]; - } - } - } - - - if (!Config.Cdda) { - // BIOS CD Player - // - Pause player, hit Track 01/02/../xx (Setloc issued!!) - - // GameShark CD Player: Resume play - if( cdr.ParamC == 0 ) { - CDR_LOG( "PLAY Resume @ %d:%d:%d\n", - cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); - - //CDR_play( cdr.SetSectorPlay ); - } - else - { - // BIOS CD Player: Resume play - if( cdr.Param[0] == 0 ) { - CDR_LOG( "PLAY Resume T0 @ %d:%d:%d\n", - cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); - - //CDR_play( cdr.SetSectorPlay ); - } - else { - CDR_LOG( "PLAY Resume Td @ %d:%d:%d\n", - cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); - - // BIOS CD Player: Allow track replaying - StopCdda(); - - - cdr.CurTrack = btoi( cdr.Param[0] ); - - if (CDR_getTN(cdr.ResultTN) != -1) { - // check last track - if (cdr.CurTrack > cdr.ResultTN[1]) - cdr.CurTrack = cdr.ResultTN[1]; - - if (CDR_getTD((u8)(cdr.CurTrack), cdr.ResultTD) != -1) { - cdr.SetSectorPlay[0] = cdr.ResultTD[2]; - cdr.SetSectorPlay[1] = cdr.ResultTD[1]; - cdr.SetSectorPlay[2] = cdr.ResultTD[0]; - - // reset data - //Set_Track(); - Find_CurTrack(); - ReadTrack( cdr.SetSectorPlay ); - - //CDR_play(cdr.SetSectorPlay); - } - } - } - } - } + ReadTrack(cdr.SetSectorPlay); + if (!Config.Cdda) + CDR_play(cdr.SetSectorPlay); // Vib Ribbon: gameplay checks flag cdr.StatP &= ~STATUS_SEEK; - cdr.CmdProcess = 0; SetResultSize(1); cdr.StatP |= STATUS_ROTATING; @@ -1469,7 +1392,13 @@ void cdrWrite1(unsigned char rt) { for (i = 0; i < 3; i++) set_loc[i] = btoi(cdr.Param[i]); - i = abs(msf2sec(cdr.SetSector) - msf2sec(set_loc)); + // FIXME: clean up this SetSector/SetSectorPlay mess, + // there should be single var tracking current sector pos + if (cdr.Play) + i = msf2sec(cdr.SetSectorPlay); + else + i = msf2sec(cdr.SetSector); + i = abs(i - msf2sec(set_loc)); if (i > 16) cdr.Seeked = SEEK_PENDING; @@ -1481,6 +1410,7 @@ void cdrWrite1(unsigned char rt) { // Vib Ribbon: try same track again StopCdda(); +#if 0 if (!cdr.SetSector[0] & !cdr.SetSector[1] & !cdr.SetSector[2]) { if (CDR_getTN(cdr.ResultTN) != -1) { if (cdr.CurTrack > cdr.ResultTN[1]) @@ -1492,10 +1422,8 @@ void cdrWrite1(unsigned char rt) { if (!Config.Cdda) CDR_play(cdr.ResultTD); } } - } else if (!Config.Cdda) { - CDR_play(cdr.SetSector); } - +#endif // Vib Ribbon - decoded buffer IRQ for CDDA reading // - fixes ribbon timing + music CD mode //TODO? @@ -1521,11 +1449,7 @@ void cdrWrite1(unsigned char rt) { case CdlStop: // GameShark CD Player: Reset CDDA to track start - if( cdr.Play && CDR_getStatus(&stat) != -1 ) { - cdr.SetSectorPlay[0] = stat.Time[0]; - cdr.SetSectorPlay[1] = stat.Time[1]; - cdr.SetSectorPlay[2] = stat.Time[2]; - + if (cdr.Play) { Find_CurTrack(); // grab time for current track -- cgit v1.2.3 From fffad32e54d18c0a527a1e9eda0a746e2485284b Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 30 Dec 2012 03:02:43 +0200 Subject: cdrom: clean up subq handling keep track of it at all times --- libpcsxcore/cdrom.c | 400 ++++++++++++++++++++++------------------------------ libpcsxcore/cdrom.h | 16 ++- libpcsxcore/ppf.h | 2 +- 3 files changed, 177 insertions(+), 241 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 5ea0e3d..6923c02 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -138,10 +138,15 @@ enum seeked_state { static struct CdrStat stat; -static unsigned int msf2sec(u8 *msf) { +static unsigned int msf2sec(const u8 *msf) { return ((msf[0] * 60 + msf[1]) * 75) + msf[2]; } +// for that weird psemu API.. +static unsigned int fsm2sec(const u8 *msf) { + return ((msf[2] * 60 + msf[1]) * 75) + msf[0]; +} + static void sec2msf(unsigned int s, u8 *msf) { msf[0] = s / 75 / 60; s = s - msf[0] * 75 * 60; @@ -375,164 +380,125 @@ static void Check_Shell( int Irq ) } } -void Find_CurTrack() { - cdr.CurTrack = 0; - - if (CDR_getTN(cdr.ResultTN) != -1) { - int lcv; - - for( lcv = 1; lcv <= cdr.ResultTN[1]; lcv++ ) { - if (CDR_getTD((u8)(lcv), cdr.ResultTD) != -1) { - u32 sect1, sect2; - - CDR_LOG( "curtrack %d %d %d | %d %d %d | %d\n", - cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], - cdr.ResultTD[2], cdr.ResultTD[1], cdr.ResultTD[0], - cdr.CurTrack ); - - // find next track boundary - only need m:s accuracy - sect1 = cdr.SetSectorPlay[0] * 60 * 75 + cdr.SetSectorPlay[1] * 75; - sect2 = cdr.ResultTD[2] * 60 * 75 + cdr.ResultTD[1] * 75; - - // Twisted Metal 4 - psx cdda pregap (2-sec) - // - fix in-game music - sect2 -= 75 * 2; +static void Find_CurTrack(const u8 *time) +{ + int current, sect; - if( sect1 >= sect2 ) { - cdr.CurTrack++; - continue; - } - } + current = msf2sec(time); + for (cdr.CurTrack = 1; cdr.CurTrack < cdr.ResultTN[1]; cdr.CurTrack++) { + CDR_getTD(cdr.CurTrack + 1, cdr.ResultTD); + sect = fsm2sec(cdr.ResultTD); + if (sect - current >= 150) break; - } } } -static void ReadTrack( u8 *time ) { - cdr.Prev[0] = itob( time[0] ); - cdr.Prev[1] = itob( time[1] ); - cdr.Prev[2] = itob( time[2] ); - - CDR_LOG("ReadTrack() Log: KEY *** %x:%x:%x\n", cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]); - cdr.RErr = CDR_readTrack(cdr.Prev); -} +static void ReadTrack(const u8 *time) { + unsigned char tmp[3]; + struct SubQ *subq; + u16 crc; + tmp[0] = itob(time[0]); + tmp[1] = itob(time[1]); + tmp[2] = itob(time[2]); -static void AddIrqQueue(unsigned char irq, unsigned long ecycle) { - if (cdr.Irq != 0) - CDR_LOG_I("cdr: override cmd %02x -> %02x\n", cdr.Irq, irq); + if (memcmp(cdr.Prev, tmp, 3) == 0) + return; - cdr.Irq = irq; - cdr.eCycle = ecycle; + CDR_LOG("ReadTrack *** %02x:%02x:%02x\n", tmp[0], tmp[1], tmp[2]); - CDR_INT(ecycle); -} + cdr.RErr = CDR_readTrack(tmp); + memcpy(cdr.Prev, tmp, 3); -static u8 fake_subq_local[3], fake_subq_real[3], fake_subq_index, fake_subq_change; -static void Create_Fake_Subq() -{ - u8 temp_cur[3], temp_next[3], temp_start[3], pregap; - int diff; + cdr.TrackChanged = FALSE; - if (CDR_getTN(cdr.ResultTN) == -1) return; - if( cdr.CurTrack+1 <= cdr.ResultTN[1] ) { - pregap = 150; - if( CDR_getTD(cdr.CurTrack+1, cdr.ResultTD) == -1 ) return; - } else { - // last track - cd size - pregap = 0; - if( CDR_getTD(0, cdr.ResultTD) == -1 ) return; - } + if (CheckSBI(time)) + return; - if( cdr.Play == TRUE ) { - temp_cur[0] = cdr.SetSectorPlay[0]; - temp_cur[1] = cdr.SetSectorPlay[1]; - temp_cur[2] = cdr.SetSectorPlay[2]; - } else { - temp_cur[0] = btoi( cdr.Prev[0] ); - temp_cur[1] = btoi( cdr.Prev[1] ); - temp_cur[2] = btoi( cdr.Prev[2] ); + subq = (struct SubQ *)CDR_getBufferSub(); + if (subq != NULL) { + crc = calcCrc((u8 *)subq + 12, 10); + if (crc == (((u16)subq->CRC[0] << 8) | subq->CRC[1])) { + cdr.subq.Track = subq->TrackNumber; + cdr.subq.Index = subq->IndexNumber; + memcpy(cdr.subq.Relative, subq->TrackRelativeAddress, 3); + memcpy(cdr.subq.Absolute, subq->AbsoluteAddress, 3); + + // .. + 1 is probably wrong, but deals with corrupted + // subq + good checksum + // (how does real thing handle that?) + if (cdr.CurTrack + 1 == btoi(subq->TrackNumber)) { + cdr.CurTrack++; + cdr.TrackChanged = TRUE; + } + } } + else { + unsigned char start[3], next[3]; + unsigned int this_s, start_s, next_s, pregap; + int relative_s; + + CDR_getTD(cdr.CurTrack, start); + if (cdr.CurTrack + 1 <= cdr.ResultTN[1]) { + pregap = 150; + CDR_getTD(cdr.CurTrack + 1, next); + } + else { + // last track - cd size + pregap = 0; + next[0] = cdr.SetSectorEnd[2]; + next[1] = cdr.SetSectorEnd[1]; + next[2] = cdr.SetSectorEnd[0]; + } - fake_subq_real[0] = temp_cur[0]; - fake_subq_real[1] = temp_cur[1]; - fake_subq_real[2] = temp_cur[2]; - - temp_next[0] = cdr.ResultTD[2]; - temp_next[1] = cdr.ResultTD[1]; - temp_next[2] = cdr.ResultTD[0]; - - - // flag- next track - if( msf2sec(temp_cur) >= msf2sec( temp_next )-pregap ) { - fake_subq_change = 1; - - cdr.CurTrack++; + this_s = msf2sec(time); + start_s = fsm2sec(start); + next_s = fsm2sec(next); - // end cd - if( pregap == 0 ) StopCdda(); - } + if (next_s - this_s < pregap) { + cdr.TrackChanged = TRUE; + cdr.CurTrack++; + start_s = next_s; + } - ////////////////////////////////////////////////// - ////////////////////////////////////////////////// + cdr.subq.Index = 1; - // repair - if( cdr.CurTrack <= cdr.ResultTN[1] ) { - if( CDR_getTD(cdr.CurTrack, cdr.ResultTD) == -1 ) return; - } else { - // last track - cd size - if( CDR_getTD(0, cdr.ResultTD) == -1 ) return; + relative_s = this_s - start_s; + if (relative_s < 0) { + cdr.subq.Index = 0; + relative_s = -relative_s; + } + sec2msf(relative_s, cdr.subq.Relative); + + cdr.subq.Track = itob(cdr.CurTrack); + cdr.subq.Relative[0] = itob(cdr.subq.Relative[0]); + cdr.subq.Relative[1] = itob(cdr.subq.Relative[1]); + cdr.subq.Relative[2] = itob(cdr.subq.Relative[2]); + cdr.subq.Absolute[0] = tmp[0]; + cdr.subq.Absolute[1] = tmp[1]; + cdr.subq.Absolute[2] = tmp[2]; } - - temp_start[0] = cdr.ResultTD[2]; - temp_start[1] = cdr.ResultTD[1]; - temp_start[2] = cdr.ResultTD[0]; - - - CDR_LOG( "CDDA FAKE SUB - %d:%d:%d / %d:%d:%d / %d:%d:%d\n", - temp_cur[0], temp_cur[1], temp_cur[2], - temp_start[0], temp_start[1], temp_start[2], - temp_next[0], temp_next[1], temp_next[2]); - + CDR_LOG(" -> %02x,%02x %02x:%02x:%02x %02x:%02x:%02x\n", + cdr.subq.Track, cdr.subq.Index, + cdr.subq.Relative[0], cdr.subq.Relative[1], cdr.subq.Relative[2], + cdr.subq.Absolute[0], cdr.subq.Absolute[1], cdr.subq.Absolute[2]); +} - // local time - pregap / real - diff = msf2sec(temp_cur) - msf2sec( temp_start ); - if( diff < 0 ) { - fake_subq_index = 0; +static void AddIrqQueue(unsigned char irq, unsigned long ecycle) { + if (cdr.Irq != 0) + CDR_LOG_I("cdr: override cmd %02x -> %02x\n", cdr.Irq, irq); - sec2msf( -diff, fake_subq_local ); - } else { - fake_subq_index = 1; + cdr.Irq = irq; + cdr.eCycle = ecycle; - sec2msf( diff, fake_subq_local ); - } + CDR_INT(ecycle); } - static void cdrPlayInterrupt_Autopause() { - struct SubQ *subq = (struct SubQ *)CDR_getBufferSub(); - int track_changed = 0; - if (subq != NULL ) { - /* - CDDA Autopause - - Silhouette Mirage ($3) - Tomb Raider 1 ($7) - */ - - // .. + 1 is probably wrong, but deals with corrupted subq + good checksum - // (how does real thing handle those?) - if( cdr.CurTrack + 1 == btoi( subq->TrackNumber ) ) - track_changed = 1; - } else { - track_changed = fake_subq_change; - fake_subq_change = 0; - } - - if ((cdr.Mode & MODE_AUTOPAUSE) && track_changed) { + if ((cdr.Mode & MODE_AUTOPAUSE) && cdr.TrackChanged) { CDR_LOG( "CDDA STOP\n" ); // Magic the Gathering @@ -547,40 +513,24 @@ static void cdrPlayInterrupt_Autopause() StopCdda(); } else if (cdr.Mode & MODE_REPORT) { - if (subq != NULL) { - CDR_LOG( "REPPLAY SUB - %X:%X:%X\n", - subq->AbsoluteAddress[0], subq->AbsoluteAddress[1], subq->AbsoluteAddress[2] ); - - // breaks when .sub doesn't have index 0 for some reason (bad rip?) - //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; - - cdr.Result[3] = subq->AbsoluteAddress[0]; - cdr.Result[4] = subq->AbsoluteAddress[1]; - cdr.Result[5] = subq->AbsoluteAddress[2]; - } else { - CDR_LOG( "REPPLAY FAKE - %d:%d:%d\n", - fake_subq_real[0], fake_subq_real[1], fake_subq_real[2] ); - if (fake_subq_real[2] & 0xf) - return; + cdr.Result[0] = cdr.StatP; + cdr.Result[1] = cdr.subq.Track; + cdr.Result[2] = cdr.subq.Index; - cdr.Result[0] = cdr.StatP; - // track # / index # - cdr.Result[1] = itob(cdr.CurTrack); - cdr.Result[2] = itob(fake_subq_index); - // absolute - cdr.Result[3] = itob( fake_subq_real[0] ); - cdr.Result[4] = itob( fake_subq_real[1] ); - cdr.Result[5] = itob( fake_subq_real[2] ); + if (cdr.subq.Absolute[2] & 0x10) { + cdr.Result[3] = cdr.subq.Relative[0]; + cdr.Result[4] = cdr.subq.Relative[1] | 0x80; + cdr.Result[5] = cdr.subq.Relative[2]; } + else { + cdr.Result[3] = cdr.subq.Absolute[0]; + cdr.Result[4] = cdr.subq.Absolute[1]; + cdr.Result[5] = cdr.subq.Absolute[2]; + } + + cdr.Result[6] = 0; + cdr.Result[7] = 0; // Rayman: Logo freeze (resultready + dataready) cdr.ResultReady = 1; @@ -611,28 +561,26 @@ void cdrPlayInterrupt() } memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); - Find_CurTrack(); + Find_CurTrack(cdr.SetSectorPlay); ReadTrack(cdr.SetSectorPlay); + cdr.TrackChanged = FALSE; } - // update for CdlGetlocP/autopause - struct SubQ *subq = (struct SubQ *)CDR_getBufferSub(); - if (subq != NULL) - // update subq - ReadTrack(cdr.SetSectorPlay); - else - Create_Fake_Subq(); - if (!cdr.Play) return; CDR_LOG( "CDDA - %d:%d:%d\n", cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] ); - CDRMISC_INT( cdReadTime ); + if (memcmp(cdr.SetSectorPlay, cdr.SetSectorEnd, 3) == 0) { + StopCdda(); + cdr.TrackChanged = TRUE; + } if (!cdr.Irq && !cdr.Stat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT))) cdrPlayInterrupt_Autopause(); + if (!cdr.Play) return; + cdr.SetSectorPlay[2]++; if (cdr.SetSectorPlay[2] == 75) { cdr.SetSectorPlay[2] = 0; @@ -643,13 +591,15 @@ void cdrPlayInterrupt() } } - //Check_Shell(0); + CDRMISC_INT(cdReadTime); + + // update for CdlGetlocP/autopause + ReadTrack(cdr.SetSectorPlay); } void cdrInterrupt() { int i; unsigned char Irq = cdr.Irq; - struct SubQ *subq; // Reschedule IRQ if (cdr.Stat) { @@ -686,8 +636,6 @@ void cdrInterrupt() { break; case CdlPlay: - fake_subq_change = 0; - if (cdr.Seeked == SEEK_PENDING) { // XXX: wrong, should seek instead.. memcpy( cdr.SetSectorPlay, cdr.SetSector, 4 ); @@ -727,8 +675,9 @@ void cdrInterrupt() { Wild 9: skip PREGAP + starting accurate SubQ - plays tracks without retry play */ - Find_CurTrack(); + Find_CurTrack(cdr.SetSectorPlay); ReadTrack(cdr.SetSectorPlay); + cdr.TrackChanged = FALSE; if (!Config.Cdda) CDR_play(cdr.SetSectorPlay); @@ -892,55 +841,12 @@ void cdrInterrupt() { break; case CdlGetlocP: - // GameShark CDX CD Player: uses 17 bytes output (wraps around) - SetResultSize(17); - memset( cdr.Result, 0, 16 ); - - subq = (struct SubQ *)CDR_getBufferSub(); - - if (subq != NULL) { - // update subq - ReadTrack( cdr.SetSector ); - - cdr.Result[0] = subq->TrackNumber; - cdr.Result[1] = subq->IndexNumber; - memcpy(cdr.Result + 2, subq->TrackRelativeAddress, 3); - memcpy(cdr.Result + 5, subq->AbsoluteAddress, 3); - - - // subQ integrity check - data only (skip audio) - if( subq->TrackNumber == 1 && stat.Type == 0x01 ) { - if (calcCrc((u8 *)subq + 12, 10) != (((u16)subq->CRC[0] << 8) | subq->CRC[1])) { - memset(cdr.Result + 2, 0, 3 + 3); // CRC wrong, wipe out time data - } - } - } else { - if (cdr.Play == FALSE) - Create_Fake_Subq(); - - // track # / index # - cdr.Result[0] = itob(cdr.CurTrack); - cdr.Result[1] = itob(fake_subq_index); - - // local - cdr.Result[2] = itob( fake_subq_local[0] ); - cdr.Result[3] = itob( fake_subq_local[1] ); - cdr.Result[4] = itob( fake_subq_local[2] ); - - // absolute - cdr.Result[5] = itob( fake_subq_real[0] ); - cdr.Result[6] = itob( fake_subq_real[1] ); - cdr.Result[7] = itob( fake_subq_real[2] ); - } + SetResultSize(8); + memcpy(&cdr.Result, &cdr.subq, 8); if (!cdr.Play && !cdr.Reading) cdr.Result[1] = 0; // HACK? - // redump.org - wipe time - if( !cdr.Play && CheckSBI(cdr.Result+5) ) { - memset( cdr.Result+2, 0, 6 ); - } - cdr.Stat = Acknowledge; break; @@ -1107,10 +1013,10 @@ void cdrInterrupt() { case CdlReadS: if (!cdr.Reading) return; - // Fighting Force 2 - update subq time immediately // - fixes new game - ReadTrack( cdr.SetSector ); + cdr.CurTrack = 1; + ReadTrack(cdr.SetSector); // Crusaders of Might and Magic - update getlocl now @@ -1149,9 +1055,6 @@ void cdrInterrupt() { cdr.Stat = Acknowledge; break; - case 0xff: - return; - default: cdr.Stat = Complete; break; @@ -1283,6 +1186,9 @@ void cdrReadInterrupt() { setIrq(); } + // update for CdlGetlocP + ReadTrack(cdr.SetSector); + Check_Shell(0); } @@ -1450,8 +1356,6 @@ void cdrWrite1(unsigned char rt) { case CdlStop: // GameShark CD Player: Reset CDDA to track start if (cdr.Play) { - Find_CurTrack(); - // grab time for current track CDR_getTD((u8)(cdr.CurTrack), cdr.ResultTD); @@ -1710,6 +1614,17 @@ void cdrDmaInterrupt() } } +static void getCdInfo(void) +{ + u8 tmp; + + CDR_getTN(cdr.ResultTN); + CDR_getTD(0, cdr.SetSectorEnd); + tmp = cdr.SetSectorEnd[0]; + cdr.SetSectorEnd[0] = cdr.SetSectorEnd[2]; + cdr.SetSectorEnd[2] = tmp; +} + void cdrReset() { memset(&cdr, 0, sizeof(cdr)); cdr.CurTrack = 1; @@ -1722,14 +1637,16 @@ void cdrReset() { cdr.AttenuatorLeft[1] = 0x00; cdr.AttenuatorRight[0] = 0x00; cdr.AttenuatorRight[1] = 0x80; + + getCdInfo(); } int cdrFreeze(void *f, int Mode) { u32 tmp; + u8 tmpp[3]; - if( Mode == 0 ) { - StopCdda(); - } + if (Mode == 0 && !Config.Cdda) + CDR_stop(); gzfreeze(&cdr, sizeof(cdr)); @@ -1741,10 +1658,20 @@ int cdrFreeze(void *f, int Mode) { gzfreeze(&tmp, sizeof(tmp)); if (Mode == 0) { + getCdInfo(); + pTransfer = cdr.Transfer + tmp; - if (cdr.Play && !Config.Cdda) - CDR_play(cdr.SetSectorPlay); + // read right sub data + memcpy(tmpp, cdr.Prev, 3); + cdr.Prev[0]++; + ReadTrack(tmpp); + + if (cdr.Play) { + Find_CurTrack(cdr.SetSectorPlay); + if (!Config.Cdda) + CDR_play(cdr.SetSectorPlay); + } } return 0; @@ -1753,6 +1680,9 @@ int cdrFreeze(void *f, int Mode) { void LidInterrupt() { cdr.LidCheck = 0x20; // start checker + getCdInfo(); + + StopCdda(); CDRLID_INT( cdReadTime * 3 ); // generate interrupt if none active - open or close diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h index 5dbf471..7bca811 100644 --- a/libpcsxcore/cdrom.h +++ b/libpcsxcore/cdrom.h @@ -51,8 +51,16 @@ typedef struct { unsigned char StatP; - unsigned char Transfer[CD_FRAMESIZE_RAW]; - unsigned int pad1; + unsigned char Transfer[DATA_SIZE]; + struct { + unsigned char Track; + unsigned char Index; + unsigned char Relative[3]; + unsigned char Absolute[3]; + } subq; + unsigned char TrackChanged; + unsigned char pad1[3]; + unsigned int pad3; unsigned char Prev[4]; unsigned char Param[8]; @@ -70,7 +78,7 @@ typedef struct { unsigned char ResultTN[6]; unsigned char ResultTD[4]; unsigned char SetSector[4]; - unsigned char SetSectorSeek[4]; + unsigned char SetSectorEnd[4]; unsigned char SetSectorPlay[4]; unsigned char Track; boolean Play, Muted; @@ -100,8 +108,6 @@ typedef struct { extern cdrStruct cdr; -void cdrDecodedBufferInterrupt(); - void cdrReset(); void cdrInterrupt(); void cdrReadInterrupt(); diff --git a/libpcsxcore/ppf.h b/libpcsxcore/ppf.h index aad85c9..fb0a377 100644 --- a/libpcsxcore/ppf.h +++ b/libpcsxcore/ppf.h @@ -40,7 +40,7 @@ static inline int CheckSBI(const u8 *t) if (sbi_sectors == NULL) return 0; - s = MSF2SECT(btoi(t[0]), btoi(t[1]), btoi(t[2])); + s = MSF2SECT(t[0], t[1], t[2]); return (sbi_sectors[s >> 3] >> (s & 7)) & 1; } -- cgit v1.2.3 From c69642c80a8f3333354a589b5dabdb17f0f23e9b Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 30 Dec 2012 03:40:17 +0200 Subject: cdrom: keep savestate compat --- libpcsxcore/cdrom.c | 9 +++++++++ libpcsxcore/cdrom.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 6923c02..78db291 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -1648,6 +1648,7 @@ int cdrFreeze(void *f, int Mode) { if (Mode == 0 && !Config.Cdda) CDR_stop(); + cdr.freeze_ver = 0x63647201; gzfreeze(&cdr, sizeof(cdr)); if (Mode == 1) { @@ -1672,6 +1673,14 @@ int cdrFreeze(void *f, int Mode) { if (!Config.Cdda) CDR_play(cdr.SetSectorPlay); } + + if ((cdr.freeze_ver & 0xffffff00) != 0x63647200) { + // old versions did not latch Reg2, have to fixup.. + if (cdr.Reg2 == 0) { + SysPrintf("cdrom: fixing up old savestate\n"); + cdr.Reg2 = 7; + } + } } return 0; diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h index 7bca811..541a12b 100644 --- a/libpcsxcore/cdrom.h +++ b/libpcsxcore/cdrom.h @@ -60,7 +60,7 @@ typedef struct { } subq; unsigned char TrackChanged; unsigned char pad1[3]; - unsigned int pad3; + unsigned int freeze_ver; unsigned char Prev[4]; unsigned char Param[8]; -- cgit v1.2.3 From 385c023b384751230a23604ab024ea5fb8cd1e90 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 31 Dec 2012 01:44:06 +0200 Subject: cdriso: fix .cue file parsing --- libpcsxcore/cdriso.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index f2886b0..1e30a63 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -499,7 +499,9 @@ static int parsecue(const char *isofile) { pregapOffset = -1; // mark to fill track start_offset } else if (!strcmp(token, "FILE")) { - sscanf(linebuf, " FILE \"%[^\"]\"", tmpb); + t = sscanf(linebuf, " FILE \"%256[^\"]\"", tmpb); + if (t != 1) + sscanf(linebuf, " FILE %256s", tmpb); // absolute path? ti[numtracks + 1].handle = fopen(tmpb, "rb"); -- cgit v1.2.3 From 92ca1ba64e939942ab05aaa3d578f0d165634275 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 31 Dec 2012 03:51:32 +0200 Subject: cdrom: attempt to deal with broken subq :( --- libpcsxcore/cdrom.c | 61 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 78db291..fdb38ba 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -45,6 +45,7 @@ cdrStruct cdr; static unsigned char *pTransfer; +static int subq_broken; /* CD-ROM magic numbers */ #define CdlSync 0 @@ -394,9 +395,10 @@ static void Find_CurTrack(const u8 *time) } } -static void ReadTrack(const u8 *time) { +static void ReadTrack(const u8 *time, int after_seek) { unsigned char tmp[3]; struct SubQ *subq; + int track, old_track; u16 crc; tmp[0] = itob(time[0]); @@ -417,22 +419,30 @@ static void ReadTrack(const u8 *time) { return; subq = (struct SubQ *)CDR_getBufferSub(); - if (subq != NULL) { + if (subq != NULL && !subq_broken) { crc = calcCrc((u8 *)subq + 12, 10); - if (crc == (((u16)subq->CRC[0] << 8) | subq->CRC[1])) { + old_track = btoi(cdr.subq.Track); + track = btoi(subq->TrackNumber); + + // track checks are probably wrong, but deals with corrupted + // subq + good checksum + // (how does the real thing handle that?) + if (crc == (((u16)subq->CRC[0] << 8) | subq->CRC[1]) + && (after_seek || track == old_track || track == old_track + 1)) { cdr.subq.Track = subq->TrackNumber; cdr.subq.Index = subq->IndexNumber; memcpy(cdr.subq.Relative, subq->TrackRelativeAddress, 3); memcpy(cdr.subq.Absolute, subq->AbsoluteAddress, 3); - // .. + 1 is probably wrong, but deals with corrupted - // subq + good checksum - // (how does real thing handle that?) - if (cdr.CurTrack + 1 == btoi(subq->TrackNumber)) { + if (track == cdr.CurTrack + 1) { cdr.CurTrack++; cdr.TrackChanged = TRUE; } } + else { + CDR_LOG_I("ignore subq @%02x:%02x:%02x\n", + tmp[0], tmp[1], tmp[2]); + } } else { unsigned char start[3], next[3]; @@ -562,7 +572,7 @@ void cdrPlayInterrupt() memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); Find_CurTrack(cdr.SetSectorPlay); - ReadTrack(cdr.SetSectorPlay); + ReadTrack(cdr.SetSectorPlay, 1); cdr.TrackChanged = FALSE; } @@ -594,7 +604,7 @@ void cdrPlayInterrupt() CDRMISC_INT(cdReadTime); // update for CdlGetlocP/autopause - ReadTrack(cdr.SetSectorPlay); + ReadTrack(cdr.SetSectorPlay, 0); } void cdrInterrupt() { @@ -676,7 +686,7 @@ void cdrInterrupt() { - plays tracks without retry play */ Find_CurTrack(cdr.SetSectorPlay); - ReadTrack(cdr.SetSectorPlay); + ReadTrack(cdr.SetSectorPlay, 1); cdr.TrackChanged = FALSE; if (!Config.Cdda) @@ -1016,7 +1026,7 @@ void cdrInterrupt() { // Fighting Force 2 - update subq time immediately // - fixes new game cdr.CurTrack = 1; - ReadTrack(cdr.SetSector); + ReadTrack(cdr.SetSector, 1); // Crusaders of Might and Magic - update getlocl now @@ -1094,7 +1104,7 @@ void cdrReadInterrupt() { cdr.Result[0] = cdr.StatP; cdr.Seeked = SEEK_DONE; - ReadTrack( cdr.SetSector ); + ReadTrack(cdr.SetSector, 0); buf = CDR_getBuffer(); if (buf == NULL) @@ -1187,7 +1197,7 @@ void cdrReadInterrupt() { } // update for CdlGetlocP - ReadTrack(cdr.SetSector); + ReadTrack(cdr.SetSector, 0); Check_Shell(0); } @@ -1616,6 +1626,9 @@ void cdrDmaInterrupt() static void getCdInfo(void) { + unsigned int i, j, sector; + struct SubQ *subq; + u8 tmpp[3]; u8 tmp; CDR_getTN(cdr.ResultTN); @@ -1623,6 +1636,26 @@ static void getCdInfo(void) tmp = cdr.SetSectorEnd[0]; cdr.SetSectorEnd[0] = cdr.SetSectorEnd[2]; cdr.SetSectorEnd[2] = tmp; + + subq_broken = 0; + subq = (struct SubQ *)CDR_getBufferSub(); + if (subq != NULL && cdr.ResultTN[1] >= 2) { + CDR_getTD(cdr.ResultTN[1], tmpp); + sector = fsm2sec(tmpp) - 33; + for (i = 0; i < 5; i++, sector += 2) { + sec2msf(sector, tmpp); + for (j = 0; j < 3; j++) + tmpp[j] = itob(tmpp[j]); + CDR_readTrack(tmpp); + subq = (struct SubQ *)CDR_getBufferSub(); + if (subq->IndexNumber == 0) + break; + } + if (i == 5) { + SysPrintf("cdrom: subchannel data looks broken, not using it\n"); + subq_broken = 1; + } + } } void cdrReset() { @@ -1666,7 +1699,7 @@ int cdrFreeze(void *f, int Mode) { // read right sub data memcpy(tmpp, cdr.Prev, 3); cdr.Prev[0]++; - ReadTrack(tmpp); + ReadTrack(tmpp, 1); if (cdr.Play) { Find_CurTrack(cdr.SetSectorPlay); -- cgit v1.2.3 From 73b29eebea762ea3af6e27060e2b20cd8a58da91 Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 1 Jan 2013 01:38:52 +0200 Subject: cdrom: give up on cdda subq support this just won't currently work because atleast of: - reads racing with cdda thread - hw cdrom plugins - broken/unknown format .sub files --- libpcsxcore/cdrom.c | 156 +++++++++++++++++++++------------------------------- 1 file changed, 62 insertions(+), 94 deletions(-) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index fdb38ba..f227b1b 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -45,7 +45,6 @@ cdrStruct cdr; static unsigned char *pTransfer; -static int subq_broken; /* CD-ROM magic numbers */ #define CdlSync 0 @@ -395,10 +394,58 @@ static void Find_CurTrack(const u8 *time) } } -static void ReadTrack(const u8 *time, int after_seek) { +static void generate_subq(const u8 *time) +{ + unsigned char start[3], next[3]; + unsigned int this_s, start_s, next_s, pregap; + int relative_s; + + CDR_getTD(cdr.CurTrack, start); + if (cdr.CurTrack + 1 <= cdr.ResultTN[1]) { + pregap = 150; + CDR_getTD(cdr.CurTrack + 1, next); + } + else { + // last track - cd size + pregap = 0; + next[0] = cdr.SetSectorEnd[2]; + next[1] = cdr.SetSectorEnd[1]; + next[2] = cdr.SetSectorEnd[0]; + } + + this_s = msf2sec(time); + start_s = fsm2sec(start); + next_s = fsm2sec(next); + + cdr.TrackChanged = FALSE; + + if (next_s - this_s < pregap) { + cdr.TrackChanged = TRUE; + cdr.CurTrack++; + start_s = next_s; + } + + cdr.subq.Index = 1; + + relative_s = this_s - start_s; + if (relative_s < 0) { + cdr.subq.Index = 0; + relative_s = -relative_s; + } + sec2msf(relative_s, cdr.subq.Relative); + + cdr.subq.Track = itob(cdr.CurTrack); + cdr.subq.Relative[0] = itob(cdr.subq.Relative[0]); + cdr.subq.Relative[1] = itob(cdr.subq.Relative[1]); + cdr.subq.Relative[2] = itob(cdr.subq.Relative[2]); + cdr.subq.Absolute[0] = itob(time[0]); + cdr.subq.Absolute[1] = itob(time[1]); + cdr.subq.Absolute[2] = itob(time[2]); +} + +static void ReadTrack(const u8 *time) { unsigned char tmp[3]; struct SubQ *subq; - int track, old_track; u16 crc; tmp[0] = itob(time[0]); @@ -413,81 +460,25 @@ static void ReadTrack(const u8 *time, int after_seek) { cdr.RErr = CDR_readTrack(tmp); memcpy(cdr.Prev, tmp, 3); - cdr.TrackChanged = FALSE; - if (CheckSBI(time)) return; subq = (struct SubQ *)CDR_getBufferSub(); - if (subq != NULL && !subq_broken) { + if (subq != NULL && cdr.CurTrack == 1) { crc = calcCrc((u8 *)subq + 12, 10); - old_track = btoi(cdr.subq.Track); - track = btoi(subq->TrackNumber); - - // track checks are probably wrong, but deals with corrupted - // subq + good checksum - // (how does the real thing handle that?) - if (crc == (((u16)subq->CRC[0] << 8) | subq->CRC[1]) - && (after_seek || track == old_track || track == old_track + 1)) { + if (crc == (((u16)subq->CRC[0] << 8) | subq->CRC[1])) { cdr.subq.Track = subq->TrackNumber; cdr.subq.Index = subq->IndexNumber; memcpy(cdr.subq.Relative, subq->TrackRelativeAddress, 3); memcpy(cdr.subq.Absolute, subq->AbsoluteAddress, 3); - - if (track == cdr.CurTrack + 1) { - cdr.CurTrack++; - cdr.TrackChanged = TRUE; - } } else { - CDR_LOG_I("ignore subq @%02x:%02x:%02x\n", + CDR_LOG_I("subq bad crc @%02x:%02x:%02x\n", tmp[0], tmp[1], tmp[2]); } } else { - unsigned char start[3], next[3]; - unsigned int this_s, start_s, next_s, pregap; - int relative_s; - - CDR_getTD(cdr.CurTrack, start); - if (cdr.CurTrack + 1 <= cdr.ResultTN[1]) { - pregap = 150; - CDR_getTD(cdr.CurTrack + 1, next); - } - else { - // last track - cd size - pregap = 0; - next[0] = cdr.SetSectorEnd[2]; - next[1] = cdr.SetSectorEnd[1]; - next[2] = cdr.SetSectorEnd[0]; - } - - this_s = msf2sec(time); - start_s = fsm2sec(start); - next_s = fsm2sec(next); - - if (next_s - this_s < pregap) { - cdr.TrackChanged = TRUE; - cdr.CurTrack++; - start_s = next_s; - } - - cdr.subq.Index = 1; - - relative_s = this_s - start_s; - if (relative_s < 0) { - cdr.subq.Index = 0; - relative_s = -relative_s; - } - sec2msf(relative_s, cdr.subq.Relative); - - cdr.subq.Track = itob(cdr.CurTrack); - cdr.subq.Relative[0] = itob(cdr.subq.Relative[0]); - cdr.subq.Relative[1] = itob(cdr.subq.Relative[1]); - cdr.subq.Relative[2] = itob(cdr.subq.Relative[2]); - cdr.subq.Absolute[0] = tmp[0]; - cdr.subq.Absolute[1] = tmp[1]; - cdr.subq.Absolute[2] = tmp[2]; + generate_subq(time); } CDR_LOG(" -> %02x,%02x %02x:%02x:%02x %02x:%02x:%02x\n", @@ -572,7 +563,7 @@ void cdrPlayInterrupt() memcpy(cdr.SetSectorPlay, cdr.SetSector, 4); Find_CurTrack(cdr.SetSectorPlay); - ReadTrack(cdr.SetSectorPlay, 1); + ReadTrack(cdr.SetSectorPlay); cdr.TrackChanged = FALSE; } @@ -604,7 +595,7 @@ void cdrPlayInterrupt() CDRMISC_INT(cdReadTime); // update for CdlGetlocP/autopause - ReadTrack(cdr.SetSectorPlay, 0); + generate_subq(cdr.SetSectorPlay); } void cdrInterrupt() { @@ -686,7 +677,7 @@ void cdrInterrupt() { - plays tracks without retry play */ Find_CurTrack(cdr.SetSectorPlay); - ReadTrack(cdr.SetSectorPlay, 1); + ReadTrack(cdr.SetSectorPlay); cdr.TrackChanged = FALSE; if (!Config.Cdda) @@ -1025,8 +1016,8 @@ void cdrInterrupt() { // Fighting Force 2 - update subq time immediately // - fixes new game - cdr.CurTrack = 1; - ReadTrack(cdr.SetSector, 1); + Find_CurTrack(cdr.SetSector); + ReadTrack(cdr.SetSector); // Crusaders of Might and Magic - update getlocl now @@ -1104,7 +1095,7 @@ void cdrReadInterrupt() { cdr.Result[0] = cdr.StatP; cdr.Seeked = SEEK_DONE; - ReadTrack(cdr.SetSector, 0); + ReadTrack(cdr.SetSector); buf = CDR_getBuffer(); if (buf == NULL) @@ -1197,7 +1188,7 @@ void cdrReadInterrupt() { } // update for CdlGetlocP - ReadTrack(cdr.SetSector, 0); + ReadTrack(cdr.SetSector); Check_Shell(0); } @@ -1626,9 +1617,6 @@ void cdrDmaInterrupt() static void getCdInfo(void) { - unsigned int i, j, sector; - struct SubQ *subq; - u8 tmpp[3]; u8 tmp; CDR_getTN(cdr.ResultTN); @@ -1636,26 +1624,6 @@ static void getCdInfo(void) tmp = cdr.SetSectorEnd[0]; cdr.SetSectorEnd[0] = cdr.SetSectorEnd[2]; cdr.SetSectorEnd[2] = tmp; - - subq_broken = 0; - subq = (struct SubQ *)CDR_getBufferSub(); - if (subq != NULL && cdr.ResultTN[1] >= 2) { - CDR_getTD(cdr.ResultTN[1], tmpp); - sector = fsm2sec(tmpp) - 33; - for (i = 0; i < 5; i++, sector += 2) { - sec2msf(sector, tmpp); - for (j = 0; j < 3; j++) - tmpp[j] = itob(tmpp[j]); - CDR_readTrack(tmpp); - subq = (struct SubQ *)CDR_getBufferSub(); - if (subq->IndexNumber == 0) - break; - } - if (i == 5) { - SysPrintf("cdrom: subchannel data looks broken, not using it\n"); - subq_broken = 1; - } - } } void cdrReset() { @@ -1699,7 +1667,7 @@ int cdrFreeze(void *f, int Mode) { // read right sub data memcpy(tmpp, cdr.Prev, 3); cdr.Prev[0]++; - ReadTrack(tmpp, 1); + ReadTrack(tmpp); if (cdr.Play) { Find_CurTrack(cdr.SetSectorPlay); -- cgit v1.2.3 From eaa895dc8ff02d63cf52b5d0faf0d8272a96a822 Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 1 Jan 2013 01:48:16 +0200 Subject: sbi: update according to Nocash doc no idea if it's correct though --- libpcsxcore/ppf.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c index 6fcd5bc..0d80107 100644 --- a/libpcsxcore/ppf.c +++ b/libpcsxcore/ppf.c @@ -339,7 +339,7 @@ unsigned char *sbi_sectors; int LoadSBI(const char *fname, int sector_count) { char buffer[16]; FILE *sbihandle; - u8 sbitime[3]; + u8 sbitime[3], t; int s; sbihandle = fopen(fname, "rb"); @@ -352,9 +352,22 @@ int LoadSBI(const char *fname, int sector_count) { // 4-byte SBI header fread(buffer, 1, 4, sbihandle); - while (!feof(sbihandle)) { - fread(sbitime, 1, 3, sbihandle); - fread(buffer, 1, 11, sbihandle); + while (1) { + s = fread(sbitime, 1, 3, sbihandle); + if (s != 3) + break; + fread(&t, 1, 1, sbihandle); + switch (t) { + default: + case 1: + s = 10; + break; + case 2: + case 3: + s = 3; + break; + } + fseek(sbihandle, s, SEEK_CUR); s = MSF2SECT(btoi(sbitime[0]), btoi(sbitime[1]), btoi(sbitime[2])); if (s < sector_count) -- cgit v1.2.3 From 81abe4d570022077d4d015c47cd96b619d46c3cd Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 1 Jan 2013 01:53:52 +0200 Subject: cdriso: simplify read code --- libpcsxcore/cdriso.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 1e30a63..289e3cf 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -45,7 +45,7 @@ static boolean subChanMixed = FALSE; static boolean subChanRaw = FALSE; static boolean subChanMissing = FALSE; -static unsigned char cdbuffer[DATA_SIZE]; +static unsigned char cdbuffer[CD_FRAMESIZE_RAW]; static unsigned char subbuffer[SUB_FRAMESIZE]; static unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10]; @@ -82,7 +82,7 @@ static struct { unsigned int sector_in_blk; } *compr_img; -int (*cdimg_read_func)(FILE *f, void *dest, int sector, int offset); +int (*cdimg_read_func)(FILE *f, void *dest, int sector); char* CALLBACK CDR__getDriveLetter(void); long CALLBACK CDR__configure(void); @@ -181,7 +181,7 @@ static void *playthread(void *param) while (playing) { s = 0; for (i = 0; i < sizeof(sndbuffer) / CD_FRAMESIZE_RAW; i++) { - d = cdimg_read_func(cddaHandle, sndbuffer + s, cdda_cur_sector, 0); + d = cdimg_read_func(cddaHandle, sndbuffer + s, cdda_cur_sector); if (d < CD_FRAMESIZE_RAW) break; @@ -1001,18 +1001,18 @@ static int opensbifile(const char *isoname) { return LoadSBI(sbiname, s); } -static int cdread_normal(FILE *f, void *dest, int sector, int offset) +static int cdread_normal(FILE *f, void *dest, int sector) { - fseek(f, sector * CD_FRAMESIZE_RAW + offset, SEEK_SET); - return fread(dest, 1, CD_FRAMESIZE_RAW - offset, f); + fseek(f, sector * CD_FRAMESIZE_RAW, SEEK_SET); + return fread(dest, 1, CD_FRAMESIZE_RAW, f); } -static int cdread_sub_mixed(FILE *f, void *dest, int sector, int offset) +static int cdread_sub_mixed(FILE *f, void *dest, int sector) { int ret; - fseek(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE) + offset, SEEK_SET); - ret = fread(dest, 1, CD_FRAMESIZE_RAW - offset, f); + fseek(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET); + ret = fread(dest, 1, CD_FRAMESIZE_RAW, f); fread(subbuffer, 1, SUB_FRAMESIZE, f); if (subChanRaw) DecodeRawSubData(); @@ -1051,7 +1051,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo return ret == 1 ? 0 : ret; } -static int cdread_compressed(FILE *f, void *dest, int sector, int offset) +static int cdread_compressed(FILE *f, void *dest, int sector) { unsigned long cdbuffer_size, cdbuffer_size_expect; unsigned int start_byte, size; @@ -1112,22 +1112,22 @@ static int cdread_compressed(FILE *f, void *dest, int sector, int offset) finish: if (dest != cdbuffer) // copy avoid HACK - memcpy(dest, compr_img->buff_raw[compr_img->sector_in_blk] + offset, - CD_FRAMESIZE_RAW - offset); - return CD_FRAMESIZE_RAW - offset; + memcpy(dest, compr_img->buff_raw[compr_img->sector_in_blk], + CD_FRAMESIZE_RAW); + return CD_FRAMESIZE_RAW; } -static int cdread_2048(FILE *f, void *dest, int sector, int offset) +static int cdread_2048(FILE *f, void *dest, int sector) { int ret; fseek(f, sector * 2048, SEEK_SET); - ret = fread((char *)dest + 12, 1, 2048, f); + ret = fread((char *)dest + 12 * 2, 1, 2048, f); // not really necessary, fake mode 2 header - memset(cdbuffer, 0, 12); - sec2msf(sector + 2 * 75, (char *)cdbuffer); - cdbuffer[3] = 1; + memset(cdbuffer, 0, 12 * 2); + sec2msf(sector + 2 * 75, (char *)&cdbuffer[12]); + cdbuffer[12 + 3] = 1; return ret; } @@ -1137,7 +1137,7 @@ static unsigned char * CALLBACK ISOgetBuffer_compr(void) { } static unsigned char * CALLBACK ISOgetBuffer(void) { - return cdbuffer; + return cdbuffer + 12; } static void PrintTracks(void) { @@ -1363,7 +1363,7 @@ static long CALLBACK ISOreadTrack(unsigned char *time) { } } - cdimg_read_func(cdHandle, cdbuffer, sector, 12); + cdimg_read_func(cdHandle, cdbuffer, sector); if (subHandle != NULL) { fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET); -- cgit v1.2.3 From 77160d47414eb2c6cb59be1ee1c2d95e2f39866e Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 1 Jan 2013 04:50:06 +0200 Subject: cdriso: handle file offsets better --- libpcsxcore/cdriso.c | 119 +++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 55 deletions(-) diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 289e3cf..8f18f4f 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2007 PCSX-df Team * * Copyright (C) 2009 Wei Mingzhi * + * Copyright (C) 2012 notaz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -60,11 +61,10 @@ static pthread_t threadid; static unsigned int initial_offset = 0; static boolean playing = FALSE; static boolean cddaBigEndian = FALSE; -// offsets of cddaHandle file +// cdda sectors in toc, byte offset in file static unsigned int cdda_cur_sector; static unsigned int cdda_first_sector; -// toc_sector - file_sector -static unsigned int cdda_toc_delta; +static unsigned int cdda_file_offset; /* Frame offset into CD image where pregap data would be found if it was there. * If a game seeks there we must *not* return subchannel data since it's * not in the CD image, so that cdrom code can fake subchannel data instead. @@ -82,7 +82,7 @@ static struct { unsigned int sector_in_blk; } *compr_img; -int (*cdimg_read_func)(FILE *f, void *dest, int sector); +int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector); char* CALLBACK CDR__getDriveLetter(void); long CALLBACK CDR__configure(void); @@ -100,7 +100,7 @@ struct trackinfo { char start[3]; // MSF-format char length[3]; // MSF-format FILE *handle; // for multi-track images CDDA - int start_offset; // sector offset from start of above file + unsigned int start_offset; // byte offset from start of above file }; #define MAXTRACKS 100 /* How many tracks can a CD hold? */ @@ -174,19 +174,24 @@ static void *playthread(void *param) { long osleep, d, t, i, s; unsigned char tmp; - int ret = 0; + int ret = 0, sector_offs; t = GetTickCount(); while (playing) { s = 0; for (i = 0; i < sizeof(sndbuffer) / CD_FRAMESIZE_RAW; i++) { - d = cdimg_read_func(cddaHandle, sndbuffer + s, cdda_cur_sector); - if (d < CD_FRAMESIZE_RAW) - break; - - if (cdda_cur_sector < cdda_first_sector) - memset(sndbuffer + s, 0, CD_FRAMESIZE_RAW); + sector_offs = cdda_cur_sector - cdda_first_sector; + if (sector_offs < 0) { + d = CD_FRAMESIZE_RAW; + memset(sndbuffer + s, 0, d); + } + else { + d = cdimg_read_func(cddaHandle, cdda_file_offset, + sndbuffer + s, sector_offs); + if (d < CD_FRAMESIZE_RAW) + break; + } s += d; cdda_cur_sector++; @@ -263,12 +268,11 @@ static void stopCDDA() { } // start the CDDA playback -static void startCDDA(unsigned int sector) { +static void startCDDA(void) { if (playing) { stopCDDA(); } - cdda_cur_sector = sector; playing = TRUE; #ifdef _WIN32 @@ -355,8 +359,8 @@ static int parsetoc(const char *isofile) { else if (!strcmp(token, "DATAFILE")) { if (ti[numtracks].type == CDDA) { sscanf(linebuf, "DATAFILE \"%[^\"]\" #%d %8s", name, &t, time2); - t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); ti[numtracks].start_offset = t; + t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); t += sector_offs; sec2msf(t, (char *)&ti[numtracks].start); tok2msf((char *)&time2, (char *)&ti[numtracks].length); @@ -369,8 +373,8 @@ static int parsetoc(const char *isofile) { else if (!strcmp(token, "FILE")) { sscanf(linebuf, "FILE \"%[^\"]\" #%d %8s %8s", name, &t, time, time2); tok2msf((char *)&time, (char *)&ti[numtracks].start); - t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); ti[numtracks].start_offset = t; + t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); t += msf2sec(ti[numtracks].start) + sector_offs; sec2msf(t, (char *)&ti[numtracks].start); tok2msf((char *)&time2, (char *)&ti[numtracks].length); @@ -381,6 +385,7 @@ static int parsetoc(const char *isofile) { sector_offs += msf2sec(dummy); if (numtracks > 1) { t = ti[numtracks - 1].start_offset; + t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); pregapOffset = t + msf2sec(ti[numtracks - 1].length); } } @@ -403,7 +408,8 @@ static int parsecue(const char *isofile) { char *tmp; char linebuf[256], tmpb[256], dummy[256]; unsigned int incue_max_len; - unsigned int t, file_len, sector_offs; + unsigned int t, file_len, mode, sector_offs; + unsigned int sector_size = 2352; numtracks = 0; @@ -462,24 +468,32 @@ static int parsecue(const char *isofile) { if (!strcmp(token, "TRACK")) { numtracks++; + sector_size = 0; if (strstr(linebuf, "AUDIO") != NULL) { ti[numtracks].type = CDDA; + sector_size = 2352; } - else if (strstr(linebuf, "MODE1/2352") != NULL || strstr(linebuf, "MODE2/2352") != NULL) { + else if (sscanf(linebuf, " TRACK %u MODE%u/%u", &t, &mode, §or_size) == 3) ti[numtracks].type = DATA; + else { + SysPrintf(".cue: failed to parse TRACK\n"); + ti[numtracks].type = numtracks == 1 ? DATA : CDDA; } + if (sector_size == 0) + sector_size = 2352; } else if (!strcmp(token, "INDEX")) { - sscanf(linebuf, " INDEX %02d %8s", &t, time); + if (sscanf(linebuf, " INDEX %02d %8s", &t, time) != 2) + SysPrintf(".cue: failed to parse INDEX\n"); tok2msf(time, (char *)&ti[numtracks].start); t = msf2sec(ti[numtracks].start); - ti[numtracks].start_offset = t; + ti[numtracks].start_offset = t * sector_size; t += sector_offs; sec2msf(t, ti[numtracks].start); // default track length to file length - t = file_len - ti[numtracks].start_offset; + t = file_len - ti[numtracks].start_offset / sector_size; sec2msf(t, ti[numtracks].length); if (numtracks > 1 && ti[numtracks].handle == NULL) { @@ -489,7 +503,7 @@ static int parsecue(const char *isofile) { sec2msf(t, ti[numtracks - 1].length); } if (numtracks > 1 && pregapOffset == -1) - pregapOffset = ti[numtracks].start_offset; + pregapOffset = ti[numtracks].start_offset / sector_size; } else if (!strcmp(token, "PREGAP")) { if (sscanf(linebuf, " PREGAP %8s", time) == 1) { @@ -582,7 +596,7 @@ static int parseccd(const char *isofile) { else if (!strncmp(linebuf, "INDEX 1=", 8)) { sscanf(linebuf, "INDEX 1=%d", &t); sec2msf(t + 2 * 75, ti[numtracks].start); - ti[numtracks].start_offset = t; + ti[numtracks].start_offset = t * 2352; // If we've already seen another track, this is its end if (numtracks > 1) { @@ -667,7 +681,7 @@ static int parsemds(const char *isofile) { // check if the image contains mixed subchannel data fseek(fi, offset + 1, SEEK_SET); - subChanMixed = (fgetc(fi) ? TRUE : FALSE); + subChanMixed = subChanRaw = (fgetc(fi) ? TRUE : FALSE); // read track data for (i = 1; i <= numtracks; i++) { @@ -689,14 +703,14 @@ static int parsemds(const char *isofile) { fseek(fi, offset + 0x28, SEEK_SET); fread(&l, 1, sizeof(unsigned int), fi); l = SWAP32(l); - ti[i].start_offset = l / CD_FRAMESIZE_RAW; + ti[i].start_offset = l; // get pregap fseek(fi, extra_offset, SEEK_SET); fread(&l, 1, sizeof(unsigned int), fi); l = SWAP32(l); if (l != 0 && i > 1) - pregapOffset = ti[i].start_offset; + pregapOffset = msf2sec(ti[i].start); // get the track length fread(&l, 1, sizeof(unsigned int), fi); @@ -823,6 +837,7 @@ static int handlepbp(const char *isofile) { ti[i].start_offset = btoi(toc_entry.index0[0]) * 60 * 75 + btoi(toc_entry.index0[1]) * 75 + btoi(toc_entry.index0[2]); + ti[i].start_offset *= 2352; ti[i].start[0] = btoi(toc_entry.index1[0]); ti[i].start[1] = btoi(toc_entry.index1[1]); ti[i].start[2] = btoi(toc_entry.index1[2]); @@ -832,7 +847,7 @@ static int handlepbp(const char *isofile) { sec2msf(t, ti[i - 1].length); } } - t = cd_length - ti[numtracks].start_offset; + t = cd_length - ti[numtracks].start_offset / 2352; sec2msf(t, ti[numtracks].length); // seek to ISO index @@ -1001,17 +1016,17 @@ static int opensbifile(const char *isoname) { return LoadSBI(sbiname, s); } -static int cdread_normal(FILE *f, void *dest, int sector) +static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector) { - fseek(f, sector * CD_FRAMESIZE_RAW, SEEK_SET); + fseek(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET); return fread(dest, 1, CD_FRAMESIZE_RAW, f); } -static int cdread_sub_mixed(FILE *f, void *dest, int sector) +static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET); + fseek(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET); ret = fread(dest, 1, CD_FRAMESIZE_RAW, f); fread(subbuffer, 1, SUB_FRAMESIZE, f); @@ -1051,13 +1066,16 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo return ret == 1 ? 0 : ret; } -static int cdread_compressed(FILE *f, void *dest, int sector) +static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) { unsigned long cdbuffer_size, cdbuffer_size_expect; unsigned int start_byte, size; int is_compressed; int ret, block; + if (base) + sector += base / 2352; + block = sector >> compr_img->block_shift; compr_img->sector_in_blk = sector & ((1 << compr_img->block_shift) - 1); @@ -1117,11 +1135,11 @@ finish: return CD_FRAMESIZE_RAW; } -static int cdread_2048(FILE *f, void *dest, int sector) +static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, sector * 2048, SEEK_SET); + fseek(f, base + sector * 2048, SEEK_SET); ret = fread((char *)dest + 12 * 2, 1, 2048, f); // not really necessary, fake mode 2 header @@ -1232,7 +1250,8 @@ static long CALLBACK ISOopen(void) { if (numtracks > 1 && ti[1].handle == NULL) { ti[1].handle = fopen(GetIsoFile(), "rb"); } - cdda_cur_sector = cdda_toc_delta = 0; + cdda_cur_sector = 0; + cdda_file_offset = 0; return 0; } @@ -1363,7 +1382,7 @@ static long CALLBACK ISOreadTrack(unsigned char *time) { } } - cdimg_read_func(cdHandle, cdbuffer, sector); + cdimg_read_func(cdHandle, 0, cdbuffer, sector); if (subHandle != NULL) { fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET); @@ -1379,40 +1398,30 @@ static long CALLBACK ISOreadTrack(unsigned char *time) { // sector: byte 0 - minute; byte 1 - second; byte 2 - frame // does NOT uses bcd format static long CALLBACK ISOplay(unsigned char *time) { - unsigned int i, abs_sect, start_sect = 0; - int track_offset, file_sect; + unsigned int i; if (numtracks <= 1) return 0; // find the track - abs_sect = msf2sec((char *)time); + cdda_cur_sector = msf2sec((char *)time); for (i = numtracks; i > 1; i--) { - start_sect = msf2sec(ti[i].start); - if (start_sect <= abs_sect + 2 * 75) + cdda_first_sector = msf2sec(ti[i].start); + if (cdda_first_sector <= cdda_cur_sector + 2 * 75) break; } - - track_offset = abs_sect - start_sect; - file_sect = ti[i].start_offset + track_offset; - if (file_sect < 0) - file_sect = 0; + cdda_file_offset = ti[i].start_offset; // find the file that contains this track for (; i > 1; i--) if (ti[i].handle != NULL) break; - cdda_first_sector = 0; - if (i == 1) - cdda_first_sector = file_sect - track_offset; - - cdda_toc_delta = abs_sect - file_sect; cddaHandle = ti[i].handle; - if (SPU_playCDDAchannel != NULL) { - startCDDA(file_sect); - } + if (SPU_playCDDAchannel != NULL) + startCDDA(); + return 0; } @@ -1444,7 +1453,7 @@ static long CALLBACK ISOgetStatus(struct CdrStat *stat) { stat->Type = 0x01; } - sec = cdda_cur_sector + cdda_toc_delta; + sec = cdda_cur_sector; sec2msf(sec, (char *)stat->Time); return 0; -- cgit v1.2.3 From 1d753163fcfe8f75fad07c413ebbdb8cfe448f8b Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 2 Jan 2013 00:33:53 +0200 Subject: spu: fix decode buffers sync is still broken :( --- plugins/dfsound/xa.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 1c5425e..e58bca2 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -78,8 +78,9 @@ INLINE void MixXA(void) r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15; SSumLR[ns++] += l; SSumLR[ns++] += r; - spuMem[cursor] = l; - spuMem[cursor + 0x400/2] = r; + + spuMem[cursor] = v; + spuMem[cursor + 0x400/2] = v >> 16; cursor = (cursor + 1) & 0x1ff; } XALastVal = v; @@ -94,8 +95,9 @@ INLINE void MixXA(void) r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15; SSumLR[ns++] += l; SSumLR[ns++] += r; - spuMem[cursor] = l; - spuMem[cursor + 0x400/2] = r; + + spuMem[cursor] = v; + spuMem[cursor + 0x400/2] = v >> 16; cursor = (cursor + 1) & 0x1ff; } } -- cgit v1.2.3 From 53598a714ded20ee4bb703dcadaaa7b027d59cf4 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 2 Jan 2013 01:41:58 +0200 Subject: cdrom: implement attenuator/volume properly --- libpcsxcore/cdriso.c | 2 ++ libpcsxcore/cdrom.c | 92 +++++++++++++++++++++++++++++++++++----------------- libpcsxcore/cdrom.h | 8 +++-- 3 files changed, 71 insertions(+), 31 deletions(-) diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 8f18f4f..94bd3eb 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -212,6 +212,8 @@ static void *playthread(void *param) } } + // can't do it yet due to readahead.. + //cdrAttenuate((short *)sndbuffer, s / 4, 1); do { ret = SPU_playCDDAchannel((short *)sndbuffer, s); if (ret == 0x7761) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index f227b1b..2a1ce61 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -1076,6 +1076,54 @@ void cdrInterrupt() { #endif } +#ifdef __ARM_ARCH_7A__ + #define ssat32_to_16(v) \ + asm("ssat %0,#16,%1" : "=r" (v) : "r" (v)) +#else + #define ssat32_to_16(v) do { \ + if (v < -32768) v = -32768; \ + else if (v > 32767) v = 32767; \ + } while (0) +#endif + +void cdrAttenuate(s16 *buf, int samples, int stereo) +{ + int i, l, r; + int ll = cdr.AttenuatorLeftToLeft; + int lr = cdr.AttenuatorLeftToRight; + int rl = cdr.AttenuatorRightToLeft; + int rr = cdr.AttenuatorRightToRight; + + if (lr == 0 && rl == 0 && 0x78 <= ll && ll <= 0x88 && 0x78 <= rr && rr <= 0x88) + return; + + if (!stereo && ll == 0x40 && lr == 0x40 && rl == 0x40 && rr == 0x40) + return; + + if (stereo) { + for (i = 0; i < samples; i++) { + l = buf[i * 2]; + r = buf[i * 2 + 1]; + l = (l * ll + r * rl) >> 7; + r = (r * rr + l * lr) >> 7; + ssat32_to_16(l); + ssat32_to_16(r); + buf[i * 2] = l; + buf[i * 2 + 1] = r; + } + } + else { + for (i = 0; i < samples; i++) { + l = buf[i]; + l = l * (ll + rl) >> 7; + //r = r * (rr + lr) >> 7; + ssat32_to_16(l); + //ssat32_to_16(r); + buf[i] = l; + } + } +} + void cdrReadInterrupt() { u8 *buf; @@ -1127,25 +1175,9 @@ void cdrReadInterrupt() { (cdr.Transfer[4 + 1] == cdr.Channel) && (cdr.Transfer[4 + 0] == cdr.File)) { int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector); - if (!ret) { - // only handle attenuator basic channel switch for now - if (cdr.Xa.stereo) { - int i; - if ((cdr.AttenuatorLeft[0] | cdr.AttenuatorLeft[1]) - && !(cdr.AttenuatorRight[0] | cdr.AttenuatorRight[1])) - { - for (i = 0; i < cdr.Xa.nsamples; i++) - cdr.Xa.pcm[i*2 + 1] = cdr.Xa.pcm[i*2]; - } - else if (!(cdr.AttenuatorLeft[0] | cdr.AttenuatorLeft[1]) - && (cdr.AttenuatorRight[0] | cdr.AttenuatorRight[1])) - { - for (i = 0; i < cdr.Xa.nsamples; i++) - cdr.Xa.pcm[i*2] = cdr.Xa.pcm[i*2 + 1]; - } - } + cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo); SPU_playADPCMchannel(&cdr.Xa); cdr.FirstSector = 0; @@ -1253,7 +1285,7 @@ void cdrWrite1(unsigned char rt) { case 0: break; case 3: - cdr.AttenuatorRight[1] = rt; + cdr.AttenuatorRightToRightT = rt; return; default: return; @@ -1474,10 +1506,10 @@ void cdrWrite2(unsigned char rt) { setIrq(); return; case 2: - cdr.AttenuatorLeft[0] = rt; + cdr.AttenuatorLeftToLeftT = rt; return; case 3: - cdr.AttenuatorRight[0] = rt; + cdr.AttenuatorRightToLeftT = rt; return; } } @@ -1505,13 +1537,15 @@ void cdrWrite3(unsigned char rt) { cdr.ParamC = 0; return; case 2: - cdr.AttenuatorLeft[1] = rt; + cdr.AttenuatorLeftToRightT = rt; return; case 3: - if (rt == 0x20) - CDR_LOG( "CD-XA Volume: %X %X | %X %X\n", - cdr.AttenuatorLeft[0], cdr.AttenuatorLeft[1], - cdr.AttenuatorRight[0], cdr.AttenuatorRight[1] ); + if (rt & 0x20) { + memcpy(&cdr.AttenuatorLeftToLeft, &cdr.AttenuatorLeftToLeftT, 4); + CDR_LOG_I("CD-XA Volume: %02x %02x | %02x %02x\n", + cdr.AttenuatorLeftToLeft, cdr.AttenuatorLeftToRight, + cdr.AttenuatorRightToLeft, cdr.AttenuatorRightToRight); + } return; } @@ -1634,10 +1668,10 @@ void cdrReset() { pTransfer = cdr.Transfer; // BIOS player - default values - cdr.AttenuatorLeft[0] = 0x80; - cdr.AttenuatorLeft[1] = 0x00; - cdr.AttenuatorRight[0] = 0x00; - cdr.AttenuatorRight[1] = 0x80; + cdr.AttenuatorLeftToLeft = 0x80; + cdr.AttenuatorLeftToRight = 0x00; + cdr.AttenuatorRightToLeft = 0x00; + cdr.AttenuatorRightToRight = 0x80; getCdInfo(); } diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h index 541a12b..fc1df46 100644 --- a/libpcsxcore/cdrom.h +++ b/libpcsxcore/cdrom.h @@ -102,13 +102,17 @@ typedef struct { u8 FastBackward; u8 pad; - u8 AttenuatorLeft[2], AttenuatorRight[2]; - u32 pad2; + u8 AttenuatorLeftToLeft, AttenuatorLeftToRight; + u8 AttenuatorRightToRight, AttenuatorRightToLeft; + u8 AttenuatorLeftToLeftT, AttenuatorLeftToRightT; + u8 AttenuatorRightToRightT, AttenuatorRightToLeftT; } cdrStruct; extern cdrStruct cdr; void cdrReset(); +void cdrAttenuate(s16 *buf, int samples, int stereo); + void cdrInterrupt(); void cdrReadInterrupt(); void cdrRepplayInterrupt(); -- cgit v1.2.3 From 7ba3e79c025dfd41ba88bcbe7b330a1a7fd68551 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 3 Jan 2013 02:00:44 +0200 Subject: spu: also return on decoder irqs --- plugins/dfsound/spu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 2466569..9f91b8b 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -689,7 +689,7 @@ static int do_samples(int forced_updates) int ch,d,silentch; int bIRQReturn=0; - while(1) + while(!bIRQReturn) { // ok, at the beginning we are looking if there is // enuff free place in the dsound/oss buffer to @@ -863,6 +863,7 @@ static int do_samples(int forced_updates) { //printf("decoder irq %x\n", decode_pos); do_irq(); + bIRQReturn = 1; } } decode_pos = (decode_pos + NSSIZE) & 0x1ff; -- cgit v1.2.3