X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=3e31c0aeb63fe491bbb5613b13da395d01f6a2c9;hp=047172ce6842c940c18c60002b84e839f05f6670;hb=HEAD;hpb=9a0a61d27586bfb93aa443cc59d9588d2b9cf992

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 047172ce..50255c80 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -21,8 +21,10 @@
 * Handles all CD-ROM registers and functions.
 */
 
+#include <stdalign.h>
 #include <assert.h>
 #include "cdrom.h"
+#include "cdrom-async.h"
 #include "misc.h"
 #include "ppf.h"
 #include "psxdma.h"
@@ -52,10 +54,10 @@ static struct {
 	// unused members maintain savesate compatibility
 	unsigned char unused0;
 	unsigned char unused1;
-	unsigned char Reg2;
+	unsigned char IrqMask;
 	unsigned char unused2;
 	unsigned char Ctrl;
-	unsigned char Stat;
+	unsigned char IrqStat;
 
 	unsigned char StatP;
 
@@ -68,7 +70,7 @@ static struct {
 	} subq;
 	unsigned char TrackChanged;
 	unsigned char ReportDelay;
-	unsigned char unused3;
+	unsigned char PhysCdPropagations;
 	unsigned short sectorsRead;
 	unsigned int  freeze_ver;
 
@@ -94,9 +96,12 @@ static struct {
 	unsigned char Track;
 	boolean Play, Muted;
 	int CurTrack;
-	int Mode, File, Channel;
+	unsigned char Mode;
+	unsigned char FileChannelSelected;
+	unsigned char CurFile, CurChannel;
+	int FilterFile, FilterChannel;
 	unsigned char LocL[8];
-	int FirstSector;
+	int unused4;
 
 	xa_decode_t Xa;
 
@@ -105,12 +110,12 @@ static struct {
 
 	u16 CmdInProgress;
 	u8 Irq1Pending;
-	u8 unused5;
-	u32 LastReadCycles;
+	u8 AdpcmActive;
+	u32 LastReadSeekCycles;
 
-	u8 unused7;
+	u8 RetryDetected;
 
-	u8 DriveState;
+	u8 DriveState; // enum drive_state
 	u8 FastForward;
 	u8 FastBackward;
 	u8 errorRetryhack;
@@ -120,7 +125,19 @@ static struct {
 	u8 AttenuatorLeftToLeftT, AttenuatorLeftToRightT;
 	u8 AttenuatorRightToRightT, AttenuatorRightToLeftT;
 } cdr;
-static s16 read_buf[CD_FRAMESIZE_RAW/2];
+alignas(64) static s16 read_buf[CD_FRAMESIZE_RAW_ALIGNED / 2];
+
+struct SubQ {
+	char res0[12];
+	unsigned char ControlAndADR;
+	unsigned char TrackNumber;
+	unsigned char IndexNumber;
+	unsigned char TrackRelativeAddress[3];
+	unsigned char Filler;
+	unsigned char AbsoluteAddress[3];
+	unsigned char CRC[2];
+	char res1[72];
+};
 
 /* CD-ROM magic numbers */
 #define CdlSync        0  /* nocash documentation : "Uh, actually, returns error code 40h = Invalid Command...?" */
@@ -174,7 +191,7 @@ unsigned char Test20[] = { 0x98, 0x06, 0x10, 0xC3 };
 unsigned char Test22[] = { 0x66, 0x6F, 0x72, 0x20, 0x45, 0x75, 0x72, 0x6F };
 unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
 
-// cdr.Stat:
+// cdr.IrqStat:
 #define NoIntr		0
 #define DataReady	1
 #define Complete	2
@@ -199,14 +216,16 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
 #define STATUS_READ      (1<<5) // 0x20
 #define STATUS_SHELLOPEN (1<<4) // 0x10
 #define STATUS_UNKNOWN3  (1<<3) // 0x08
-#define STATUS_UNKNOWN2  (1<<2) // 0x04
+#define STATUS_SEEKERROR (1<<2) // 0x04
 #define STATUS_ROTATING  (1<<1) // 0x02
 #define STATUS_ERROR     (1<<0) // 0x01
 
 /* Errors */
 #define ERROR_NOTREADY   (1<<7) // 0x80
 #define ERROR_INVALIDCMD (1<<6) // 0x40
-#define ERROR_INVALIDARG (1<<5) // 0x20
+#define ERROR_BAD_ARGNUM (1<<5) // 0x20
+#define ERROR_BAD_ARGVAL (1<<4) // 0x10
+#define ERROR_SHELLOPEN  (1<<3) // 0x08
 
 // 1x = 75 sectors per second
 // PSXCLK = 1 sec in the ps
@@ -217,32 +236,22 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
 #define SUBQ_FORWARD_SECTORS 2u
 
 enum drive_state {
-	DRIVESTATE_STANDBY = 0, // pause, play, read
+	DRIVESTATE_STANDBY = 0, // different from paused
 	DRIVESTATE_LID_OPEN,
 	DRIVESTATE_RESCAN_CD,
 	DRIVESTATE_PREPARE_CD,
 	DRIVESTATE_STOPPED,
+	DRIVESTATE_PAUSED,
+	DRIVESTATE_PLAY_READ,
+	DRIVESTATE_SEEK,
 };
 
-static struct CdrStat stat;
+static struct CdrStat cdr_stat;
 
 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;
-	msf[1] = s / 75;
-	s = s - msf[1] * 75;
-	msf[2] = s;
-}
-
 // cdrPlayReadInterrupt
 #define CDRPLAYREAD_INT(eCycle, isFirst) { \
 	u32 e_ = eCycle; \
@@ -261,7 +270,6 @@ static void sec2msf(unsigned int s, u8 *msf) {
 }
 
 #define StopCdda() { \
-	if (cdr.Play && !Config.Cdda) CDR_stop(); \
 	cdr.Play = FALSE; \
 	cdr.FastForward = 0; \
 	cdr.FastBackward = 0; \
@@ -272,23 +280,33 @@ static void sec2msf(unsigned int s, u8 *msf) {
 	x |= f; \
 }
 
-#define SetResultSize(size) { \
+#define SetResultSize_(size) { \
 	cdr.ResultP = 0; \
 	cdr.ResultC = size; \
 	cdr.ResultReady = 1; \
 }
 
-static void setIrq(int log_cmd)
+#define SetResultSize(size) { \
+	if (cdr.ResultP < cdr.ResultC) \
+		CDR_LOG_I("overwriting result, len=%u\n", cdr.ResultC); \
+	SetResultSize_(size); \
+}
+
+static void setIrq(u8 irq, int log_cmd)
 {
-	if (cdr.Stat & cdr.Reg2)
+	u8 old = cdr.IrqStat & cdr.IrqMask ? 1 : 0;
+	u8 new_ = irq & cdr.IrqMask ? 1 : 0;
+
+	cdr.IrqStat = irq;
+	if ((old ^ new_) & new_)
 		psxHu32ref(0x1070) |= SWAP32((u32)0x4);
 
 #ifdef CDR_LOG_CMD_IRQ
-	if (cdr.Stat)
+	if (cdr.IrqStat)
 	{
 		int i;
-		CDR_LOG_I("CDR IRQ=%d cmd %02x stat %02x: ",
-			!!(cdr.Stat & cdr.Reg2), log_cmd, cdr.Stat);
+		CDR_LOG_I("CDR IRQ=%d cmd %02x irqstat %02x: ",
+			!!(cdr.IrqStat & cdr.IrqMask), log_cmd, cdr.IrqStat);
 		for (i = 0; i < cdr.ResultC; i++)
 			SysPrintf("%02x ", cdr.Result[i]);
 		SysPrintf("\n");
@@ -306,13 +324,13 @@ void cdrLidSeekInterrupt(void)
 	default:
 	case DRIVESTATE_STANDBY:
 		StopCdda();
-		StopReading();
+		//StopReading();
 		SetPlaySeekRead(cdr.StatP, 0);
 
-		if (CDR_getStatus(&stat) == -1)
+		if (cdra_getStatus(&cdr_stat) == -1)
 			return;
 
-		if (stat.Status & STATUS_SHELLOPEN)
+		if (cdr_stat.Status & STATUS_SHELLOPEN)
 		{
 			memset(cdr.Prev, 0xff, sizeof(cdr.Prev));
 			cdr.DriveState = DRIVESTATE_LID_OPEN;
@@ -321,16 +339,29 @@ void cdrLidSeekInterrupt(void)
 		break;
 
 	case DRIVESTATE_LID_OPEN:
-		if (CDR_getStatus(&stat) == -1)
-			stat.Status &= ~STATUS_SHELLOPEN;
+		if (cdra_getStatus(&cdr_stat) != 0)
+			cdr_stat.Status &= ~STATUS_SHELLOPEN;
 
 		// 02, 12, 10
 		if (!(cdr.StatP & STATUS_SHELLOPEN)) {
+			int was_reading = cdr.Reading;
+			StopReading();
+			SetPlaySeekRead(cdr.StatP, 0);
 			cdr.StatP |= STATUS_SHELLOPEN;
+			memset(cdr.Prev, 0xff, sizeof(cdr.Prev));
 
-			// could generate error irq here, but real hardware
-			// only sometimes does that
-			// (not done when lots of commands are sent?)
+			// IIRC this sometimes doesn't happen on real hw
+			// (when lots of commands are sent?)
+			SetResultSize(2);
+			cdr.Result[0] = cdr.StatP | STATUS_SEEKERROR;
+			cdr.Result[1] = ERROR_SHELLOPEN;
+			if (cdr.CmdInProgress || was_reading) {
+				psxRegs.interrupt &= ~(1 << PSXINT_CDR);
+				cdr.CmdInProgress = 0;
+				cdr.Result[0] = cdr.StatP | STATUS_ERROR;
+				cdr.Result[1] = ERROR_NOTREADY;
+			}
+			setIrq(DiskError, 0x1006);
 
 			set_event(PSXINT_CDRLID, cdReadTime * 30);
 			break;
@@ -338,7 +369,7 @@ void cdrLidSeekInterrupt(void)
 		else if (cdr.StatP & STATUS_ROTATING) {
 			cdr.StatP &= ~STATUS_ROTATING;
 		}
-		else if (!(stat.Status & STATUS_SHELLOPEN)) {
+		else if (!(cdr_stat.Status & STATUS_SHELLOPEN)) {
 			// closed now
 			CheckCdrom();
 
@@ -383,8 +414,8 @@ static void Find_CurTrack(const u8 *time)
 	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);
+		cdra_getTD(cdr.CurTrack + 1, cdr.ResultTD);
+		sect = msf2sec(cdr.ResultTD);
 		if (sect - current >= 150)
 			break;
 	}
@@ -396,22 +427,20 @@ static void generate_subq(const u8 *time)
 	unsigned int this_s, start_s, next_s, pregap;
 	int relative_s;
 
-	CDR_getTD(cdr.CurTrack, start);
+	cdra_getTD(cdr.CurTrack, start);
 	if (cdr.CurTrack + 1 <= cdr.ResultTN[1]) {
 		pregap = 150;
-		CDR_getTD(cdr.CurTrack + 1, next);
+		cdra_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];
+		memcpy(next, cdr.SetSectorEnd, 3);
 	}
 
 	this_s = msf2sec(time);
-	start_s = fsm2sec(start);
-	next_s = fsm2sec(next);
+	start_s = msf2sec(start);
+	next_s = msf2sec(next);
 
 	cdr.TrackChanged = FALSE;
 
@@ -428,7 +457,8 @@ static void generate_subq(const u8 *time)
 		cdr.subq.Index = 0;
 		relative_s = -relative_s;
 	}
-	sec2msf(relative_s, cdr.subq.Relative);
+	lba2msf(relative_s, &cdr.subq.Relative[0],
+		&cdr.subq.Relative[1], &cdr.subq.Relative[2]);
 
 	cdr.subq.Track = itob(cdr.CurTrack);
 	cdr.subq.Relative[0] = itob(cdr.subq.Relative[0]);
@@ -441,40 +471,37 @@ static void generate_subq(const u8 *time)
 
 static int ReadTrack(const u8 *time)
 {
-	unsigned char tmp[3];
-	int read_ok;
+	int ret;
 
-	tmp[0] = itob(time[0]);
-	tmp[1] = itob(time[1]);
-	tmp[2] = itob(time[2]);
+	CDR_LOG("ReadTrack *** %02d:%02d:%02d\n", tmp[0], tmp[1], tmp[2]);
 
-	if (memcmp(cdr.Prev, tmp, 3) == 0)
+	if (memcmp(cdr.Prev, time, 3) == 0)
 		return 1;
 
-	CDR_LOG("ReadTrack *** %02x:%02x:%02x\n", tmp[0], tmp[1], tmp[2]);
-
-	read_ok = CDR_readTrack(tmp);
-	if (read_ok)
-		memcpy(cdr.Prev, tmp, 3);
-	return read_ok;
+	ret = cdra_readTrack(time);
+	if (ret == 0)
+		memcpy(cdr.Prev, time, 3);
+	return ret == 0;
 }
 
 static void UpdateSubq(const u8 *time)
 {
-	const struct SubQ *subq;
+	int ret = -1, s = MSF2SECT(time[0], time[1], time[2]);
+	struct SubQ subq;
 	u16 crc;
 
-	if (CheckSBI(time))
+	if (CheckSBI(s))
 		return;
 
-	subq = (struct SubQ *)CDR_getBufferSub(MSF2SECT(time[0], time[1], time[2]));
-	if (subq != NULL && cdr.CurTrack == 1) {
-		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);
+	if (cdr.CurTrack == 1)
+		ret = cdra_readSub(time, &subq);
+	if (ret == 0) {
+		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);
 		}
 		else {
 			CDR_LOG_I("subq bad crc @%02d:%02d:%02d\n",
@@ -498,23 +525,20 @@ static void cdrPlayInterrupt_Autopause()
 	u32 i;
 
 	if ((cdr.Mode & MODE_AUTOPAUSE) && cdr.TrackChanged) {
-		CDR_LOG( "CDDA STOP\n" );
+		CDR_LOG_I("autopause\n");
 
-		// Magic the Gathering
-		// - looping territory cdda
-
-		// ...?
-		//cdr.ResultReady = 1;
-		//cdr.Stat = DataReady;
-		cdr.Stat = DataEnd;
-		setIrq(0x1000); // 0x1000 just for logging purposes
+		SetResultSize(1);
+		cdr.Result[0] = cdr.StatP;
+		setIrq(DataEnd, 0x1000); // 0x1000 just for logging purposes
 
 		StopCdda();
 		SetPlaySeekRead(cdr.StatP, 0);
+		cdr.DriveState = DRIVESTATE_PAUSED;
 	}
 	else if ((cdr.Mode & MODE_REPORT) && !cdr.ReportDelay &&
 		 ((cdr.subq.Absolute[2] & 0x0f) == 0 || cdr.FastForward || cdr.FastBackward))
 	{
+		SetResultSize(8);
 		cdr.Result[0] = cdr.StatP;
 		cdr.Result[1] = cdr.subq.Track;
 		cdr.Result[2] = cdr.subq.Index;
@@ -539,35 +563,48 @@ static void cdrPlayInterrupt_Autopause()
 			cdr.Result[4] = cdr.subq.Absolute[1];
 			cdr.Result[5] = cdr.subq.Absolute[2];
 		}
-
 		cdr.Result[6] = abs_lev_max >> 0;
 		cdr.Result[7] = abs_lev_max >> 8;
 
-		// Rayman: Logo freeze (resultready + dataready)
-		cdr.ResultReady = 1;
-		cdr.Stat = DataReady;
-
-		SetResultSize(8);
-		setIrq(0x1001);
+		setIrq(DataReady, 0x1001);
 	}
 
 	if (cdr.ReportDelay)
 		cdr.ReportDelay--;
 }
 
-// LastReadCycles
+static boolean canDoTurbo(void)
+{
+	u32 c = psxRegs.cycle;
+	return Config.TurboCD && !cdr.RetryDetected && !cdr.AdpcmActive
+		//&& c - psxRegs.intCycle[PSXINT_SPUDMA].sCycle > (u32)cdReadTime * 2
+		&& c - psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle > (u32)cdReadTime * 16;
+}
+
 static int cdrSeekTime(unsigned char *target)
 {
-	int diff = msf2sec(cdr.SetSectorPlay) - msf2sec(target);
-	int pausePenalty, seekTime = abs(diff) * (cdReadTime / 2000);
+	int diff = abs((int)msf2sec(cdr.SetSectorPlay) - (int)msf2sec(target));
+	int seekTime = diff * (cdReadTime / 2000);
+	int cyclesSinceRS = psxRegs.cycle - cdr.LastReadSeekCycles;
 	seekTime = MAX_VALUE(seekTime, 20000);
 
-	// need this stupidly long penalty or else Spyro2 intro desyncs
-	pausePenalty = (s32)(psxRegs.cycle - cdr.LastReadCycles) > cdReadTime * 8 ? cdReadTime * 25 : 0;
-	seekTime += pausePenalty;
-
-	seekTime = MIN_VALUE(seekTime, PSXCLK * 2 / 3);
-	CDR_LOG("seek: %.2f %.2f\n", (float)seekTime / PSXCLK, (float)seekTime / cdReadTime);
+	// sled seek?
+	if (diff >= 7200)
+		seekTime = PSXCLK / 7 + diff * 64;
+	// add *something* as rotation time until the target sector
+	if (cyclesSinceRS >= cdReadTime)
+		seekTime += (8 - ((cyclesSinceRS >> 18) & 7)) * (cdReadTime / 2);
+
+	// Transformers Beast Wars Transmetals does Setloc(x),SeekL,Setloc(x),ReadN
+	// and then wants some slack time
+	if (cdr.DriveState == DRIVESTATE_PAUSED || cyclesSinceRS < cdReadTime *3/2)
+		seekTime += cdReadTime;
+
+	//seekTime = MIN_VALUE(seekTime, PSXCLK * 2 / 3);
+	CDR_LOG("seek: %02d:%02d:%02d %.2f %.2f (%.2f) st %d di %d\n",
+		target[0], target[1], target[2], (float)seekTime / PSXCLK,
+		(float)seekTime / cdReadTime, (float)cyclesSinceRS / cdReadTime,
+		cdr.DriveState, diff);
 	return seekTime;
 }
 
@@ -588,11 +625,7 @@ static u32 cdrAlignTimingHack(u32 cycles)
 	 * Note: always enforcing this breaks other games like Crash PAL version
 	 * (inputs get dropped because bios handler doesn't see interrupts).
 	 */
-	u32 vint_rel;
-	if (psxRegs.cycle - rcnts[3].cycleStart > 250000)
-		return cycles;
-	vint_rel = rcnts[3].cycleStart + 63000 - psxRegs.cycle;
-	vint_rel += PSXCLK / 60;
+	u32 vint_rel = rcnts[3].cycleStart + 63000 - psxRegs.cycle;
 	while ((s32)(vint_rel - cycles) < 0)
 		vint_rel += PSXCLK / 60;
 	return vint_rel;
@@ -601,7 +634,6 @@ static u32 cdrAlignTimingHack(u32 cycles)
 static void cdrUpdateTransferBuf(const u8 *buf);
 static void cdrReadInterrupt(void);
 static void cdrPrepCdda(s16 *buf, int samples);
-static void cdrAttenuate(s16 *buf, int samples, int stereo);
 
 static void msfiAdd(u8 *msfi, u32 count)
 {
@@ -631,9 +663,24 @@ static void msfiSub(u8 *msfi, u32 count)
 	}
 }
 
+static int msfiEq(const u8 *a, const u8 *b)
+{
+	return a[0] == b[0] && a[1] == b[1] && a[2] == b[2];
+}
+
 void cdrPlayReadInterrupt(void)
 {
-	cdr.LastReadCycles = psxRegs.cycle;
+	// this works but causes instability for timing sensitive games
+#if 0
+	int hit = cdra_prefetch(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2]);
+	if (!hit && cdr.PhysCdPropagations < 75/2) {
+		// this propagates the real cdrom delays to the emulated game
+		CDRPLAYREAD_INT(cdReadTime / 2, 0);
+		cdr.PhysCdPropagations++;
+		return;
+	}
+#endif
+	cdr.LastReadSeekCycles = psxRegs.cycle;
 
 	if (cdr.Reading) {
 		cdrReadInterrupt();
@@ -642,35 +689,64 @@ void cdrPlayReadInterrupt(void)
 
 	if (!cdr.Play) return;
 
-	CDR_LOG( "CDDA - %d:%d:%d\n",
-		cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] );
+	CDR_LOG("CDDA - %02d:%02d:%02d m %02x\n",
+		cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], cdr.Mode);
 
+	cdr.DriveState = DRIVESTATE_PLAY_READ;
 	SetPlaySeekRead(cdr.StatP, STATUS_PLAY);
 	if (memcmp(cdr.SetSectorPlay, cdr.SetSectorEnd, 3) == 0) {
+		CDR_LOG_I("end stop\n");
 		StopCdda();
 		SetPlaySeekRead(cdr.StatP, 0);
 		cdr.TrackChanged = TRUE;
+		cdr.DriveState = DRIVESTATE_PAUSED;
 	}
 	else {
-		CDR_readCDDA(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2], (u8 *)read_buf);
+		cdra_readCDDA(cdr.SetSectorPlay, read_buf);
 	}
 
-	if (!cdr.Stat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT)))
+	if (!cdr.IrqStat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT)))
 		cdrPlayInterrupt_Autopause();
 
-	if (!cdr.Muted && !Config.Cdda) {
+	if (cdr.Play && !Config.Cdda) {
 		cdrPrepCdda(read_buf, CD_FRAMESIZE_RAW / 4);
-		cdrAttenuate(read_buf, CD_FRAMESIZE_RAW / 4, 1);
-		SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, cdr.FirstSector);
-		cdr.FirstSector = 0;
+		SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, 0);
 	}
 
 	msfiAdd(cdr.SetSectorPlay, 1);
+	cdra_prefetch(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2]);
 
 	// update for CdlGetlocP/autopause
 	generate_subq(cdr.SetSectorPlay);
 
 	CDRPLAYREAD_INT(cdReadTime, 0);
+
+	// stop propagation since it breaks streaming
+	cdr.PhysCdPropagations = 0xff;
+}
+
+static void softReset(void)
+{
+	cdra_getStatus(&cdr_stat);
+	if (cdr_stat.Status & STATUS_SHELLOPEN) {
+		cdr.DriveState = DRIVESTATE_LID_OPEN;
+		cdr.StatP = STATUS_SHELLOPEN;
+	}
+	else if (CdromId[0] == '\0') {
+		cdr.DriveState = DRIVESTATE_STOPPED;
+		cdr.StatP = 0;
+	}
+	else {
+		cdr.DriveState = DRIVESTATE_STANDBY;
+		cdr.StatP = STATUS_ROTATING;
+	}
+
+	cdr.FifoOffset = DATA_SIZE; // fifo empty
+	cdr.LocL[0] = LOCL_INVALID;
+	cdr.Mode = MODE_SIZE_2340;
+	cdr.Muted = FALSE;
+	SPU_setCDvol(cdr.AttenuatorLeftToLeft, cdr.AttenuatorLeftToRight,
+		cdr.AttenuatorRightToLeft, cdr.AttenuatorRightToRight, psxRegs.cycle);
 }
 
 #define CMD_PART2           0x100
@@ -683,35 +759,34 @@ void cdrInterrupt(void) {
 	u32 second_resp_time = 0;
 	const void *buf;
 	u8 ParamC;
-	u8 set_loc[3];
 	int read_ok;
 	u16 not_ready = 0;
+	u8 IrqStat = Acknowledge;
+	u8 DriveStateOld;
 	u16 Cmd;
 	int i;
 
-	if (cdr.Stat) {
+	if (cdr.IrqStat) {
 		CDR_LOG_I("cmd %02x with irqstat %x\n",
-			cdr.CmdInProgress, cdr.Stat);
+			cdr.CmdInProgress, cdr.IrqStat);
 		return;
 	}
 	if (cdr.Irq1Pending) {
 		// hand out the "newest" sector, according to nocash
-		cdrUpdateTransferBuf(CDR_getBuffer());
+		cdrUpdateTransferBuf(cdra_getBuffer());
 		CDR_LOG_I("%x:%02x:%02x loaded on ack, cmd=%02x res=%02x\n",
 			cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2],
 			cdr.CmdInProgress, cdr.Irq1Pending);
 		SetResultSize(1);
 		cdr.Result[0] = cdr.Irq1Pending;
-		cdr.Stat = (cdr.Irq1Pending & STATUS_ERROR) ? DiskError : DataReady;
 		cdr.Irq1Pending = 0;
-		setIrq(0x1003);
+		setIrq((cdr.Irq1Pending & STATUS_ERROR) ? DiskError : DataReady, 0x1003);
 		return;
 	}
 
 	// default response
 	SetResultSize(1);
 	cdr.Result[0] = cdr.StatP;
-	cdr.Stat = Acknowledge;
 
 	Cmd = cdr.CmdInProgress;
 	cdr.CmdInProgress = 0;
@@ -749,8 +824,10 @@ void cdrInterrupt(void) {
 			break;
 
 		case CdlSetloc:
-		case CdlSetloc + CMD_WHILE_NOT_READY:
-			CDR_LOG("CDROM setloc command (%02X, %02X, %02X)\n", cdr.Param[0], cdr.Param[1], cdr.Param[2]);
+		case CdlSetloc + CMD_WHILE_NOT_READY: // apparently?
+			if (cdr.StatP & STATUS_SHELLOPEN)
+				// wrong? Driver2 vs Amerzone
+				goto set_error;
 
 			// MM must be BCD, SS must be BCD and <0x60, FF must be BCD and <0x75
 			if (((cdr.Param[0] & 0x0F) > 0x09) || (cdr.Param[0] > 0x99) || ((cdr.Param[1] & 0x0F) > 0x09) || (cdr.Param[1] >= 0x60) || ((cdr.Param[2] & 0x0F) > 0x09) || (cdr.Param[2] >= 0x75))
@@ -758,13 +835,19 @@ void cdrInterrupt(void) {
 				CDR_LOG_I("Invalid/out of range seek to %02X:%02X:%02X\n", cdr.Param[0], cdr.Param[1], cdr.Param[2]);
 				if (++cdr.errorRetryhack > 100)
 					break;
-				error = ERROR_INVALIDARG;
+				error = ERROR_BAD_ARGNUM;
 				goto set_error;
 			}
 			else
 			{
+				u8 set_loc[3];
 				for (i = 0; i < 3; i++)
 					set_loc[i] = btoi(cdr.Param[i]);
+				if ((msfiEq(cdr.SetSector, set_loc)) //|| msfiEq(cdr.Param, cdr.Transfer))
+						&& !cdr.SetlocPending)
+					cdr.RetryDetected++;
+				else
+					cdr.RetryDetected = 0;
 				memcpy(cdr.SetSector, set_loc, 3);
 				cdr.SetSector[3] = 0;
 				cdr.SetlocPending = 1;
@@ -791,11 +874,9 @@ void cdrInterrupt(void) {
 
 				CDR_LOG("PLAY track %d\n", cdr.CurTrack);
 
-				if (CDR_getTD((u8)cdr.CurTrack, cdr.ResultTD) != -1) {
-					for (i = 0; i < 3; i++)
-						set_loc[i] = cdr.ResultTD[2 - i];
-					seekTime = cdrSeekTime(set_loc);
-					memcpy(cdr.SetSectorPlay, set_loc, 3);
+				if (cdra_getTD(cdr.CurTrack, cdr.ResultTD) != -1) {
+					seekTime = cdrSeekTime(cdr.ResultTD);
+					memcpy(cdr.SetSectorPlay, cdr.ResultTD, 3);
 				}
 			}
 			else if (cdr.SetlocPending) {
@@ -823,17 +904,17 @@ void cdrInterrupt(void) {
 			cdr.LocL[0] = LOCL_INVALID;
 			cdr.SubqForwardSectors = 1;
 			cdr.TrackChanged = FALSE;
-			cdr.FirstSector = 1;
+			cdr.FileChannelSelected = 0;
+			cdr.AdpcmActive = 0;
 			cdr.ReportDelay = 60;
 			cdr.sectorsRead = 0;
 
-			if (!Config.Cdda)
-				CDR_play(cdr.SetSectorPlay);
-
 			SetPlaySeekRead(cdr.StatP, STATUS_SEEK | STATUS_ROTATING);
 			
 			// BIOS player - set flag again
 			cdr.Play = TRUE;
+			cdr.DriveState = DRIVESTATE_PLAY_READ;
+			cdr.PhysCdPropagations = 0;
 
 			CDRPLAYREAD_INT(cdReadTime + seekTime, 1);
 			start_rotating = 1;
@@ -841,7 +922,7 @@ void cdrInterrupt(void) {
 
 		case CdlForward:
 			// TODO: error 80 if stopped
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 
 			// GameShark CD Player: Calls 2x + Play 2x
 			cdr.FastForward = 1;
@@ -849,7 +930,7 @@ void cdrInterrupt(void) {
 			break;
 
 		case CdlBackward:
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 
 			// GameShark CD Player: Calls 2x + Play 2x
 			cdr.FastBackward = 1;
@@ -858,7 +939,7 @@ void cdrInterrupt(void) {
 
 		case CdlStandby:
 			if (cdr.DriveState != DRIVESTATE_STOPPED) {
-				error = ERROR_INVALIDARG;
+				error = ERROR_BAD_ARGNUM;
 				goto set_error;
 			}
 			second_resp_time = cdReadTime * 125 / 2;
@@ -866,17 +947,14 @@ void cdrInterrupt(void) {
 			break;
 
 		case CdlStandby + CMD_PART2:
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 			break;
 
 		case CdlStop:
 			if (cdr.Play) {
 				// grab time for current track
-				CDR_getTD((u8)(cdr.CurTrack), cdr.ResultTD);
-
-				cdr.SetSectorPlay[0] = cdr.ResultTD[2];
-				cdr.SetSectorPlay[1] = cdr.ResultTD[1];
-				cdr.SetSectorPlay[2] = cdr.ResultTD[0];
+				cdra_getTD(cdr.CurTrack, cdr.ResultTD);
+				memcpy(cdr.SetSectorPlay, cdr.ResultTD, 3);
 			}
 
 			StopCdda();
@@ -886,17 +964,22 @@ void cdrInterrupt(void) {
 			cdr.LocL[0] = LOCL_INVALID;
 
 			second_resp_time = 0x800;
-			if (cdr.DriveState == DRIVESTATE_STANDBY)
+			if (cdr.DriveState != DRIVESTATE_STOPPED)
 				second_resp_time = cdReadTime * 30 / 2;
 
 			cdr.DriveState = DRIVESTATE_STOPPED;
 			break;
 
 		case CdlStop + CMD_PART2:
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 			break;
 
 		case CdlPause:
+			if (cdr.AdpcmActive) {
+				cdr.AdpcmActive = 0;
+				cdr.Xa.nsamples = 0;
+				SPU_playADPCMchannel(&cdr.Xa, psxRegs.cycle, 1); // flush adpcm
+			}
 			StopCdda();
 			StopReading();
 
@@ -906,63 +989,71 @@ void cdrInterrupt(void) {
 			cdr.sectorsRead = 0;
 
 			/*
-			Gundam Battle Assault 2: much slower (*)
-			- Fixes boot, gameplay
-
-			Hokuto no Ken 2: slower
-			- Fixes intro + subtitles
-
-			InuYasha - Feudal Fairy Tale: slower
-			- Fixes battles
+			Gundam Battle Assault 2
+			Hokuto no Ken 2
+			InuYasha - Feudal Fairy Tale
+			Dance Dance Revolution Konamix
+			Digimon Rumble Arena
+			...
 			*/
-			/* Gameblabla - Tightening the timings (as taken from Duckstation). 
-			 * The timings from Duckstation are based upon hardware tests.
-			 * Mednafen's timing don't work for Gundam Battle Assault 2 in PAL/50hz mode,
-			 * seems to be timing sensitive as it can depend on the CPU's clock speed.
-			 * */
 			if (!(cdr.StatP & (STATUS_PLAY | STATUS_READ)))
 			{
 				second_resp_time = 7000;
 			}
 			else
 			{
-				second_resp_time = (((cdr.Mode & MODE_SPEED) ? 1 : 2) * 1097107);
+				second_resp_time = 2100011;
+				// a hack to try to avoid weird cmd vs irq1 races causing games to retry
+				second_resp_time += (cdr.RetryDetected & 15) * 100001;
 			}
 			SetPlaySeekRead(cdr.StatP, 0);
+			DriveStateOld = cdr.DriveState;
+			cdr.DriveState = DRIVESTATE_PAUSED;
+			if (DriveStateOld == DRIVESTATE_SEEK) {
+				// According to Duckstation this fails, but the
+				// exact conditions and effects are not clear.
+				// Moto Racer World Tour seems to rely on this.
+				// For now assume pause works anyway, just errors out.
+				error = ERROR_NOTREADY;
+				goto set_error;
+			}
 			break;
 
 		case CdlPause + CMD_PART2:
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 			break;
 
 		case CdlReset:
 		case CdlReset + CMD_WHILE_NOT_READY:
+			// note: nocash and Duckstation calls this 'Init', but
+			// the official SDK calls it 'Reset', and so do we
 			StopCdda();
 			StopReading();
-			SetPlaySeekRead(cdr.StatP, 0);
-			cdr.LocL[0] = LOCL_INVALID;
-			cdr.Muted = FALSE;
-			cdr.Mode = MODE_SIZE_2340; /* This fixes This is Football 2, Pooh's Party lockups */
+			softReset();
 			second_resp_time = not_ready ? 70000 : 4100000;
 			start_rotating = 1;
 			break;
 
 		case CdlReset + CMD_PART2:
 		case CdlReset + CMD_PART2 + CMD_WHILE_NOT_READY:
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 			break;
 
 		case CdlMute:
 			cdr.Muted = TRUE;
+			SPU_setCDvol(0, 0, 0, 0, psxRegs.cycle);
 			break;
 
 		case CdlDemute:
 			cdr.Muted = FALSE;
+			SPU_setCDvol(cdr.AttenuatorLeftToLeft, cdr.AttenuatorLeftToRight,
+				cdr.AttenuatorRightToLeft, cdr.AttenuatorRightToRight, psxRegs.cycle);
 			break;
 
 		case CdlSetfilter:
-			cdr.File = cdr.Param[0];
-			cdr.Channel = cdr.Param[1];
+			cdr.FilterFile = cdr.Param[0];
+			cdr.FilterChannel = cdr.Param[1];
+			cdr.FileChannelSelected = 0;
 			break;
 
 		case CdlSetmode:
@@ -974,11 +1065,11 @@ void cdrInterrupt(void) {
 		case CdlGetparam:
 		case CdlGetparam + CMD_WHILE_NOT_READY:
 			/* Gameblabla : According to mednafen, Result size should be 5 and done this way. */
-			SetResultSize(5);
+			SetResultSize_(5);
 			cdr.Result[1] = cdr.Mode;
 			cdr.Result[2] = 0;
-			cdr.Result[3] = cdr.File;
-			cdr.Result[4] = cdr.Channel;
+			cdr.Result[3] = cdr.FilterFile;
+			cdr.Result[4] = cdr.FilterChannel;
 			break;
 
 		case CdlGetlocL:
@@ -986,12 +1077,12 @@ void cdrInterrupt(void) {
 				error = 0x80;
 				goto set_error;
 			}
-			SetResultSize(8);
+			SetResultSize_(8);
 			memcpy(cdr.Result, cdr.LocL, 8);
 			break;
 
 		case CdlGetlocP:
-			SetResultSize(8);
+			SetResultSize_(8);
 			memcpy(&cdr.Result, &cdr.subq, 8);
 			break;
 
@@ -1002,36 +1093,29 @@ void cdrInterrupt(void) {
 			break;
 
 		case CdlReadT + CMD_PART2:
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 			break;
 
 		case CdlGetTN:
-			SetResultSize(3);
-			if (CDR_getTN(cdr.ResultTN) == -1) {
-				cdr.Stat = DiskError;
-				cdr.Result[0] |= STATUS_ERROR;
-			} else {
-				cdr.Stat = Acknowledge;
-				cdr.Result[1] = itob(cdr.ResultTN[0]);
-				cdr.Result[2] = itob(cdr.ResultTN[1]);
+			if (cdra_getTN(cdr.ResultTN) != 0) {
+				assert(0);
 			}
+			SetResultSize_(3);
+			cdr.Result[1] = itob(cdr.ResultTN[0]);
+			cdr.Result[2] = itob(cdr.ResultTN[1]);
 			break;
 
 		case CdlGetTD:
 			cdr.Track = btoi(cdr.Param[0]);
-			SetResultSize(4);
-			if (CDR_getTD(cdr.Track, cdr.ResultTD) == -1) {
-				cdr.Stat = DiskError;
-				cdr.Result[0] |= STATUS_ERROR;
-			} else {
-				cdr.Stat = Acknowledge;
-				cdr.Result[0] = cdr.StatP;
-				cdr.Result[1] = itob(cdr.ResultTD[2]);
-				cdr.Result[2] = itob(cdr.ResultTD[1]);
-				/* According to Nocash's documentation, the function doesn't care about ff.
-				 * This can be seen also in Mednafen's implementation. */
-				//cdr.Result[3] = itob(cdr.ResultTD[0]);
+			if (cdra_getTD(cdr.Track, cdr.ResultTD) != 0) {
+				error = ERROR_BAD_ARGVAL;
+				goto set_error;
 			}
+			SetResultSize_(3);
+			cdr.Result[1] = itob(cdr.ResultTD[0]);
+			cdr.Result[2] = itob(cdr.ResultTD[1]);
+			// no sector number
+			//cdr.Result[3] = itob(cdr.ResultTD[2]);
 			break;
 
 		case CdlSeekL:
@@ -1040,8 +1124,12 @@ void cdrInterrupt(void) {
 			StopReading();
 			SetPlaySeekRead(cdr.StatP, STATUS_SEEK | STATUS_ROTATING);
 
-			seekTime = cdrSeekTime(cdr.SetSector);
+			if (!canDoTurbo())
+				seekTime = cdrSeekTime(cdr.SetSector);
 			memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+			cdr.DriveState = DRIVESTATE_SEEK;
+			cdra_prefetch(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1],
+					cdr.SetSectorPlay[2]);
 			/*
 			Crusaders of Might and Magic = 0.5x-4x
 			- fix cutscene speech start
@@ -1063,29 +1151,31 @@ void cdrInterrupt(void) {
 		case CdlSeekP + CMD_PART2:
 			SetPlaySeekRead(cdr.StatP, 0);
 			cdr.Result[0] = cdr.StatP;
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 
 			Find_CurTrack(cdr.SetSectorPlay);
 			read_ok = ReadTrack(cdr.SetSectorPlay);
-			if (read_ok && (buf = CDR_getBuffer()))
+			if (read_ok && (buf = cdra_getBuffer()))
 				memcpy(cdr.LocL, buf, 8);
 			UpdateSubq(cdr.SetSectorPlay);
+			cdr.DriveState = DRIVESTATE_STANDBY;
 			cdr.TrackChanged = FALSE;
+			cdr.LastReadSeekCycles = psxRegs.cycle;
 			break;
 
 		case CdlTest:
 		case CdlTest + CMD_WHILE_NOT_READY:
 			switch (cdr.Param[0]) {
 				case 0x20: // System Controller ROM Version
-					SetResultSize(4);
+					SetResultSize_(4);
 					memcpy(cdr.Result, Test20, 4);
 					break;
 				case 0x22:
-					SetResultSize(8);
+					SetResultSize_(8);
 					memcpy(cdr.Result, Test22, 4);
 					break;
 				case 0x23: case 0x24:
-					SetResultSize(8);
+					SetResultSize_(8);
 					memcpy(cdr.Result, Test23, 4);
 					break;
 			}
@@ -1096,27 +1186,29 @@ void cdrInterrupt(void) {
 			break;
 
 		case CdlID + CMD_PART2:
-			SetResultSize(8);
+			SetResultSize_(8);
 			cdr.Result[0] = cdr.StatP;
 			cdr.Result[1] = 0;
 			cdr.Result[2] = 0;
 			cdr.Result[3] = 0;
 
 			// 0x10 - audio | 0x40 - disk missing | 0x80 - unlicensed
-			if (CDR_getStatus(&stat) == -1 || stat.Type == 0 || stat.Type == 0xff) {
+			if (cdra_getStatus(&cdr_stat) != 0 || cdr_stat.Type == 0 || cdr_stat.Type == 0xff) {
 				cdr.Result[1] = 0xc0;
 			}
 			else {
-				if (stat.Type == 2)
+				if (cdr_stat.Type == 2)
 					cdr.Result[1] |= 0x10;
 				if (CdromId[0] == '\0')
 					cdr.Result[1] |= 0x80;
 			}
 			cdr.Result[0] |= (cdr.Result[1] >> 4) & 0x08;
+			CDR_LOG_I("CdlID: %02x %02x %02x %02x\n", cdr.Result[0],
+				cdr.Result[1], cdr.Result[2], cdr.Result[3]);
 
 			/* This adds the string "PCSX" in Playstation bios boot screen */
 			memcpy((char *)&cdr.Result[4], "PCSX", 4);
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 			break;
 
 		case CdlInit:
@@ -1144,7 +1236,7 @@ void cdrInterrupt(void) {
 
 		case CdlReadToc + CMD_PART2:
 		case CdlReadToc + CMD_PART2 + CMD_WHILE_NOT_READY:
-			cdr.Stat = Complete;
+			IrqStat = Complete;
 			break;
 
 		case CdlReadN:
@@ -1165,7 +1257,8 @@ void cdrInterrupt(void) {
 				cdr.SetlocPending = 0;
 			}
 			cdr.Reading = 1;
-			cdr.FirstSector = 1;
+			cdr.FileChannelSelected = 0;
+			cdr.AdpcmActive = 0;
 
 			// Fighting Force 2 - update subq time immediately
 			// - fixes new game
@@ -1173,11 +1266,17 @@ void cdrInterrupt(void) {
 			cdr.LocL[0] = LOCL_INVALID;
 			cdr.SubqForwardSectors = 1;
 			cdr.sectorsRead = 0;
+			cdr.DriveState = DRIVESTATE_SEEK;
+			cdr.PhysCdPropagations = 0;
+			cdra_prefetch(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1],
+					cdr.SetSectorPlay[2]);
 
 			cycles = (cdr.Mode & MODE_SPEED) ? cdReadTime : cdReadTime * 2;
 			cycles += seekTime;
 			if (Config.hacks.cdr_read_timing)
 				cycles = cdrAlignTimingHack(cycles);
+			else if (canDoTurbo())
+				cycles = cdReadTime / 2;
 			CDRPLAYREAD_INT(cycles, 1);
 
 			SetPlaySeekRead(cdr.StatP, STATUS_SEEK);
@@ -1190,11 +1289,11 @@ void cdrInterrupt(void) {
 			// FALLTHROUGH
 
 		set_error:
-			CDR_LOG_I("cmd %02x error %02x\n", Cmd, error);
-			SetResultSize(2);
+			SetResultSize_(2);
 			cdr.Result[0] = cdr.StatP | STATUS_ERROR;
 			cdr.Result[1] = not_ready ? ERROR_NOTREADY : error;
-			cdr.Stat = DiskError;
+			IrqStat = DiskError;
+			CDR_LOG_I("cmd %02x error %02x\n", Cmd, cdr.Result[1]);
 			break;
 	}
 
@@ -1212,19 +1311,9 @@ void cdrInterrupt(void) {
 		CDR_LOG_I("cmd %02x came before %02x finished\n", cdr.Cmd, Cmd);
 	}
 
-	setIrq(Cmd);
+	setIrq(IrqStat, Cmd);
 }
 
-#ifdef HAVE_ARMV7
- #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
-
 static void cdrPrepCdda(s16 *buf, int samples)
 {
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -1236,57 +1325,22 @@ static void cdrPrepCdda(s16 *buf, int samples)
 #endif
 }
 
-static 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;
-		}
-	}
-}
-
 static void cdrReadInterruptSetResult(unsigned char result)
 {
-	if (cdr.Stat) {
+	if (cdr.IrqStat) {
 		CDR_LOG_I("%d:%02d:%02d irq miss, cmd=%02x irqstat=%02x\n",
 			cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2],
-			cdr.CmdInProgress, cdr.Stat);
+			cdr.CmdInProgress, cdr.IrqStat);
 		cdr.Irq1Pending = result;
+		// F1 2000 timing hack :(
+		// compensate for some csum func @80014380 taking too long
+		if (!cdr.AdpcmActive)
+			psxRegs.intCycle[PSXINT_CDREAD].sCycle += cdReadTime / 10;
 		return;
 	}
 	SetResultSize(1);
 	cdr.Result[0] = result;
-	cdr.Stat = (result & STATUS_ERROR) ? DiskError : DataReady;
-	setIrq(0x1004);
+	setIrq((result & STATUS_ERROR) ? DiskError : DataReady, 0x1004);
 }
 
 static void cdrUpdateTransferBuf(const u8 *buf)
@@ -1303,9 +1357,12 @@ static void cdrUpdateTransferBuf(const u8 *buf)
 
 static void cdrReadInterrupt(void)
 {
-	u8 *buf = NULL, *hdr;
+	const struct { u8 file, chan, mode, coding; } *subhdr;
+	const u8 *buf = NULL;
+	int deliver_data = 1;
 	u8 subqPos[3];
 	int read_ok;
+	int is_start;
 
 	memcpy(subqPos, cdr.SetSectorPlay, sizeof(subqPos));
 	msfiAdd(subqPos, cdr.SubqForwardSectors);
@@ -1318,46 +1375,67 @@ static void cdrReadInterrupt(void)
 
 	// note: CdlGetlocL should work as soon as STATUS_READ is indicated
 	SetPlaySeekRead(cdr.StatP, STATUS_READ | STATUS_ROTATING);
+	cdr.DriveState = DRIVESTATE_PLAY_READ;
 	cdr.sectorsRead++;
 
 	read_ok = ReadTrack(cdr.SetSectorPlay);
 	if (read_ok)
-		buf = CDR_getBuffer();
+		buf = cdra_getBuffer();
 	if (buf == NULL)
 		read_ok = 0;
 
 	if (!read_ok) {
 		CDR_LOG_I("cdrReadInterrupt() Log: err\n");
 		cdrReadInterruptSetResult(cdr.StatP | STATUS_ERROR);
+		cdr.DriveState = DRIVESTATE_PAUSED; // ?
 		return;
 	}
 	memcpy(cdr.LocL, buf, 8);
 
-	if (!cdr.Stat && !cdr.Irq1Pending)
+	if (!cdr.IrqStat && !cdr.Irq1Pending)
 		cdrUpdateTransferBuf(buf);
 
-	if ((!cdr.Muted) && (cdr.Mode & MODE_STRSND) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
-		hdr = buf + 4;
-		// Firemen 2: Multi-XA files - briefings, cutscenes
-		if( cdr.FirstSector == 1 && (cdr.Mode & MODE_SF)==0 ) {
-			cdr.File = hdr[0];
-			cdr.Channel = hdr[1];
+	subhdr = (void *)(buf + 4);
+	do {
+		// try to process as adpcm
+		if (!(cdr.Mode & MODE_STRSND))
+			break;
+		if (buf[3] != 2 || (subhdr->mode & 0x44) != 0x44) // or 0x64?
+			break;
+		CDR_LOG("f=%d m=%d %d,%3d | %d,%2d | %d,%2d\n", !!(cdr.Mode & MODE_SF), cdr.Muted,
+			subhdr->file, subhdr->chan, cdr.CurFile, cdr.CurChannel, cdr.FilterFile, cdr.FilterChannel);
+		if ((cdr.Mode & MODE_SF) && (subhdr->file != cdr.FilterFile || subhdr->chan != cdr.FilterChannel))
+			break;
+		if (subhdr->chan & 0x80) { // ?
+			if (subhdr->chan != 0xff)
+				log_unhandled("adpcm %d:%d\n", subhdr->file, subhdr->chan);
+			break;
 		}
-
-		/* Gameblabla 
-		 * Skips playing on channel 255.
-		 * Fixes missing audio in Blue's Clues : Blue's Big Musical. (Should also fix Taxi 2)
-		 * TODO : Check if this is the proper behaviour.
-		 * */
-		if ((hdr[2] & 0x4) && hdr[0] == cdr.File && hdr[1] == cdr.Channel && cdr.Channel != 255) {
-			int ret = xa_decode_sector(&cdr.Xa, buf + 4, cdr.FirstSector);
-			if (!ret) {
-				cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo);
-				SPU_playADPCMchannel(&cdr.Xa, psxRegs.cycle, cdr.FirstSector);
-				cdr.FirstSector = 0;
-			}
-			else cdr.FirstSector = -1;
+		if (!cdr.FileChannelSelected) {
+			cdr.CurFile = subhdr->file;
+			cdr.CurChannel = subhdr->chan;
+			cdr.FileChannelSelected = 1;
 		}
+		else if (subhdr->file != cdr.CurFile || subhdr->chan != cdr.CurChannel)
+			break;
+
+		// accepted as adpcm
+		deliver_data = 0;
+
+		if (Config.Xa)
+			break;
+		is_start = !cdr.AdpcmActive;
+		cdr.AdpcmActive = !xa_decode_sector(&cdr.Xa, buf + 4, is_start);
+		if (cdr.AdpcmActive)
+			SPU_playADPCMchannel(&cdr.Xa, psxRegs.cycle, is_start);
+	} while (0);
+
+	if ((cdr.Mode & MODE_SF) && (subhdr->mode & 0x44) == 0x44) // according to nocash
+		deliver_data = 0;
+	if (buf[3] != 1 && buf[3] != 2) { // according to duckstation
+		deliver_data = 0;
+		CDR_LOG_I("%x:%02x:%02x mode %02x ignored\n",
+			buf[0], buf[1], buf[2], buf[3]);
 	}
 
 	/*
@@ -1366,34 +1444,32 @@ static void cdrReadInterrupt(void)
 	Sim Theme Park - no adpcm at all (zero)
 	*/
 
-	if (!(cdr.Mode & MODE_STRSND) || !(buf[4+2] & 0x4))
+	if (deliver_data)
 		cdrReadInterruptSetResult(cdr.StatP);
 
 	msfiAdd(cdr.SetSectorPlay, 1);
+	cdra_prefetch(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2]);
 
 	CDRPLAYREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime, 0);
 }
 
 /*
 cdrRead0:
-	bit 0,1 - mode
-	bit 2 - unknown
-	bit 3 - unknown
-	bit 4 - unknown
-	bit 5 - 1 result ready
-	bit 6 - 1 dma ready
+	bit 0,1 - reg index
+	bit 2 - adpcm active
+	bit 3 - 1 parameter fifo empty
+	bit 4 - 1 parameter fifo not full
+	bit 5 - 1 response fifo not empty
+	bit 6 - 1 data fifo not empty
 	bit 7 - 1 command being processed
 */
 
 unsigned char cdrRead0(void) {
-	if (cdr.ResultReady)
-		cdr.Ctrl |= 0x20;
-	else
-		cdr.Ctrl &= ~0x20;
-
-	cdr.Ctrl |= 0x40; // data fifo not empty
+	cdr.Ctrl &= ~0x64;
+	cdr.Ctrl |= cdr.AdpcmActive << 2;
+	cdr.Ctrl |= cdr.ResultReady << 5;
+	cdr.Ctrl |= ((signed int)(cdr.FifoOffset - cdr.FifoSize) >> 31) & 0x40;
 
-	// What means the 0x10 and the 0x08 bits? I only saw it used by the bios
 	cdr.Ctrl |= 0x18;
 
 	CDR_LOG_IO("cdr r0.sta: %02x\n", cdr.Ctrl);
@@ -1402,7 +1478,7 @@ unsigned char cdrRead0(void) {
 }
 
 void cdrWrite0(unsigned char rt) {
-	CDR_LOG_IO("cdr w0.idx: %02x\n", rt);
+	CDR_LOG_IO("cdr w0.x.idx: %02x\n", rt);
 
 	cdr.Ctrl = (rt & 3) | (cdr.Ctrl & ~3);
 }
@@ -1416,13 +1492,13 @@ unsigned char cdrRead1(void) {
 	if (cdr.ResultP == cdr.ResultC)
 		cdr.ResultReady = 0;
 
-	CDR_LOG_IO("cdr r1.rsp: %02x #%u\n", psxHu8(0x1801), cdr.ResultP - 1);
+	CDR_LOG_IO("cdr r1.x.rsp: %02x #%u\n", psxHu8(0x1801), cdr.ResultP - 1);
 
 	return psxHu8(0x1801);
 }
 
 void cdrWrite1(unsigned char rt) {
-	const char *rnames[] = { "cmd", "smd", "smc", "arr" }; (void)rnames;
+	const char *rnames[] = { "0.cmd", "1.smd", "2.smc", "3.arr" }; (void)rnames;
 	CDR_LOG_IO("cdr w1.%s: %02x\n", rnames[cdr.Ctrl & 3], rt);
 
 	switch (cdr.Ctrl & 3) {
@@ -1442,10 +1518,9 @@ void cdrWrite1(unsigned char rt) {
 		SysPrintf(" Param[%d] = {", cdr.ParamC);
 		for (i = 0; i < cdr.ParamC; i++)
 			SysPrintf(" %x,", cdr.Param[i]);
-		SysPrintf("}\n");
-	} else {
-		SysPrintf("\n");
+		SysPrintf("}");
 	}
+	SysPrintf(" @%08x\n", psxRegs.pc);
 #endif
 
 	cdr.ResultReady = 0;
@@ -1474,12 +1549,12 @@ unsigned char cdrRead2(void) {
 	else
 		CDR_LOG_I("read empty fifo (%d)\n", cdr.FifoSize);
 
-	CDR_LOG_IO("cdr r2.dat: %02x\n", ret);
+	CDR_LOG_IO("cdr r2.x.dat: %02x\n", ret);
 	return ret;
 }
 
 void cdrWrite2(unsigned char rt) {
-	const char *rnames[] = { "prm", "ien", "all", "arl" }; (void)rnames;
+	const char *rnames[] = { "0.prm", "1.ien", "2.all", "3.arl" }; (void)rnames;
 	CDR_LOG_IO("cdr w2.%s: %02x\n", rnames[cdr.Ctrl & 3], rt);
 
 	switch (cdr.Ctrl & 3) {
@@ -1488,8 +1563,8 @@ void cdrWrite2(unsigned char rt) {
 			cdr.Param[cdr.ParamC++] = rt;
 		return;
 	case 1:
-		cdr.Reg2 = rt;
-		setIrq(0x1005);
+		cdr.IrqMask = rt;
+		setIrq(cdr.IrqStat, 0x1005);
 		return;
 	case 2:
 		cdr.AttenuatorLeftToLeftT = rt;
@@ -1502,29 +1577,31 @@ void cdrWrite2(unsigned char rt) {
 
 unsigned char cdrRead3(void) {
 	if (cdr.Ctrl & 0x1)
-		psxHu8(0x1803) = cdr.Stat | 0xE0;
+		psxHu8(0x1803) = cdr.IrqStat | 0xE0;
 	else
-		psxHu8(0x1803) = cdr.Reg2 | 0xE0;
+		psxHu8(0x1803) = cdr.IrqMask | 0xE0;
 
-	CDR_LOG_IO("cdr r3.%s: %02x\n", (cdr.Ctrl & 1) ? "ifl" : "ien", psxHu8(0x1803));
+	CDR_LOG_IO("cdr r3.%d.%s: %02x\n", cdr.Ctrl & 3,
+		(cdr.Ctrl & 1) ? "ifl" : "ien", psxHu8(0x1803));
 	return psxHu8(0x1803);
 }
 
 void cdrWrite3(unsigned char rt) {
-	const char *rnames[] = { "req", "ifl", "alr", "ava" }; (void)rnames;
+	const char *rnames[] = { "0.req", "1.ifl", "2.alr", "3.ava" }; (void)rnames;
+	u8 ll, lr, rl, rr;
 	CDR_LOG_IO("cdr w3.%s: %02x\n", rnames[cdr.Ctrl & 3], rt);
 
 	switch (cdr.Ctrl & 3) {
 	case 0:
 		break; // transfer
 	case 1:
-		if (cdr.Stat & rt) {
+		if (cdr.IrqStat & rt) {
 			u32 nextCycle = psxRegs.intCycle[PSXINT_CDR].sCycle
 				+ psxRegs.intCycle[PSXINT_CDR].cycle;
 			int pending = psxRegs.interrupt & (1 << PSXINT_CDR);
 #ifdef CDR_LOG_CMD_IRQ
-			CDR_LOG_I("ack %02x (w=%02x p=%d,%x,%x,%d)\n", cdr.Stat & rt, rt,
-				!!pending, cdr.CmdInProgress,
+			CDR_LOG_I("ack %02x (w=%02x p=%d,%x,%x,%d)\n",
+				cdr.IrqStat & rt, rt, !!pending, cdr.CmdInProgress,
 				cdr.Irq1Pending, nextCycle - psxRegs.cycle);
 #endif
 			// note: Croc, Shadow Tower (more) vs Discworld Noir (<993)
@@ -1538,7 +1615,7 @@ void cdrWrite3(unsigned char rt) {
 				set_event(PSXINT_CDR, c);
 			}
 		}
-		cdr.Stat &= ~rt;
+		cdr.IrqStat &= ~rt;
 
 		if (rt & 0x40)
 			cdr.ParamC = 0;
@@ -1547,11 +1624,20 @@ void cdrWrite3(unsigned char rt) {
 		cdr.AttenuatorLeftToRightT = rt;
 		return;
 	case 3:
+		if (rt & 0x01)
+			log_unhandled("Mute ADPCM?\n");
 		if (rt & 0x20) {
-			memcpy(&cdr.AttenuatorLeftToLeft, &cdr.AttenuatorLeftToLeftT, 4);
-			CDR_LOG("CD-XA Volume: %02x %02x | %02x %02x\n",
-				cdr.AttenuatorLeftToLeft, cdr.AttenuatorLeftToRight,
-				cdr.AttenuatorRightToLeft, cdr.AttenuatorRightToRight);
+			ll = cdr.AttenuatorLeftToLeftT; lr = cdr.AttenuatorLeftToRightT;
+			rl = cdr.AttenuatorRightToLeftT; rr = cdr.AttenuatorRightToRightT;
+			if (ll == cdr.AttenuatorLeftToLeft &&
+			    lr == cdr.AttenuatorLeftToRight &&
+			    rl == cdr.AttenuatorRightToLeft &&
+			    rr == cdr.AttenuatorRightToRight)
+				return;
+			cdr.AttenuatorLeftToLeft = ll; cdr.AttenuatorLeftToRight = lr;
+			cdr.AttenuatorRightToLeft = rl; cdr.AttenuatorRightToRight = rr;
+			CDR_LOG_I("CD-XA Volume: %02x %02x | %02x %02x\n", ll, lr, rl, rr);
+			SPU_setCDvol(ll, lr, rl, rr, psxRegs.cycle);
 		}
 		return;
 	}
@@ -1580,7 +1666,7 @@ void cdrWrite3(unsigned char rt) {
 }
 
 void psxDma3(u32 madr, u32 bcr, u32 chcr) {
-	u32 cdsize, max_words;
+	u32 cdsize, max_words, cycles;
 	int size;
 	u8 *ptr;
 
@@ -1595,6 +1681,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
 	switch (chcr & 0x71000000) {
 		case 0x11000000:
+			madr &= ~3;
 			ptr = getDmaRam(madr, &max_words);
 			if (ptr == INVALID_PTR) {
 				CDR_LOG_I("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");
@@ -1625,7 +1712,8 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 			}
 			psxCpu->Clear(madr, cdsize / 4);
 
-			set_event(PSXINT_CDRDMA, (cdsize / 4) * 24);
+			cycles = (cdsize / 4) * 24;
+			set_event(PSXINT_CDRDMA, cycles);
 
 			HW_DMA3_CHCR &= SWAPu32(~0x10000000);
 			if (chcr & 0x100) {
@@ -1634,8 +1722,10 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 			}
 			else {
 				// halted
-				psxRegs.cycle += (cdsize/4) * 24 - 20;
+				psxRegs.cycle += cycles - 20;
 			}
+			if (canDoTurbo() && cdr.Reading && cdr.FifoOffset >= 2048)
+				CDRPLAYREAD_INT(cycles + 4096, 1);
 			return;
 
 		default:
@@ -1658,38 +1748,25 @@ void cdrDmaInterrupt(void)
 
 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;
+	cdra_getTN(cdr.ResultTN);
+	cdra_getTD(0, cdr.SetSectorEnd);
 }
 
 void cdrReset() {
 	memset(&cdr, 0, sizeof(cdr));
 	cdr.CurTrack = 1;
-	cdr.File = 1;
-	cdr.Channel = 1;
-	cdr.Reg2 = 0x1f;
-	cdr.Stat = NoIntr;
-	cdr.FifoOffset = DATA_SIZE; // fifo empty
-	if (CdromId[0] == '\0') {
-		cdr.DriveState = DRIVESTATE_STOPPED;
-		cdr.StatP = 0;
-	}
-	else {
-		cdr.DriveState = DRIVESTATE_STANDBY;
-		cdr.StatP = STATUS_ROTATING;
-	}
-	
+	cdr.FilterFile = 0;
+	cdr.FilterChannel = 0;
+	cdr.IrqMask = 0x1f;
+	cdr.IrqStat = NoIntr;
+
 	// BIOS player - default values
 	cdr.AttenuatorLeftToLeft = 0x80;
 	cdr.AttenuatorLeftToRight = 0x00;
 	cdr.AttenuatorRightToLeft = 0x00;
 	cdr.AttenuatorRightToRight = 0x80;
 
+	softReset();
 	getCdInfo();
 }
 
@@ -1697,10 +1774,7 @@ int cdrFreeze(void *f, int Mode) {
 	u32 tmp;
 	u8 tmpp[3];
 
-	if (Mode == 0 && !Config.Cdda)
-		CDR_stop();
-	
-	cdr.freeze_ver = 0x63647202;
+	cdr.freeze_ver = 0x63647203;
 	gzfreeze(&cdr, sizeof(cdr));
 	
 	if (Mode == 1) {
@@ -1711,6 +1785,7 @@ int cdrFreeze(void *f, int Mode) {
 	gzfreeze(&tmp, sizeof(tmp));
 
 	if (Mode == 0) {
+		u8 ll = 0, lr = 0, rl = 0, rr = 0;
 		getCdInfo();
 
 		cdr.FifoOffset = tmp < DATA_SIZE ? tmp : DATA_SIZE;
@@ -1719,34 +1794,26 @@ int cdrFreeze(void *f, int Mode) {
 			cdr.SubqForwardSectors = SUBQ_FORWARD_SECTORS;
 
 		// read right sub data
-		tmpp[0] = btoi(cdr.Prev[0]);
-		tmpp[1] = btoi(cdr.Prev[1]);
-		tmpp[2] = btoi(cdr.Prev[2]);
-		cdr.Prev[0]++;
-		ReadTrack(tmpp);
+		memcpy(tmpp, cdr.Prev, sizeof(tmpp));
+		if (cdr.freeze_ver < 0x63647203) {
+			tmpp[0] = btoi(tmpp[0]);
+			tmpp[1] = btoi(tmpp[1]);
+			tmpp[2] = btoi(tmpp[2]);
+		}
+		cdr.Prev[0] = 0xff;
+		if (tmpp[0] != 0xff)
+			ReadTrack(tmpp);
 
 		if (cdr.Play) {
 			if (cdr.freeze_ver < 0x63647202)
 				memcpy(cdr.SetSectorPlay, cdr.SetSector, 3);
 
 			Find_CurTrack(cdr.SetSectorPlay);
-			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;
-			}
-			// also did not save Attenuator..
-			if ((cdr.AttenuatorLeftToLeft | cdr.AttenuatorLeftToRight
-			     | cdr.AttenuatorRightToLeft | cdr.AttenuatorRightToRight) == 0)
-			{
-				cdr.AttenuatorLeftToLeft = cdr.AttenuatorRightToRight = 0x80;
-			}
 		}
+		if (!cdr.Muted)
+			ll = cdr.AttenuatorLeftToLeft, lr = cdr.AttenuatorLeftToRight,
+			rl = cdr.AttenuatorRightToLeft, rr = cdr.AttenuatorRightToRight;
+		SPU_setCDvol(ll, lr, rl, rr, psxRegs.cycle);
 	}
 
 	return 0;