}
memcpy(cdr.LocL, buf, 8);
- if (!cdr.Irq1Pending)
+ if (!cdr.Stat && !cdr.Irq1Pending)
cdrUpdateTransferBuf(buf);
if ((!cdr.Muted) && (cdr.Mode & MODE_STRSND) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
// note: Croc, Shadow Tower (more) vs Discworld Noir (<993)
if (!pending && (cdr.CmdInProgress || cdr.Irq1Pending))
{
- s32 c = 2048 - (psxRegs.cycle - nextCycle);
- c = MAX_VALUE(c, 512);
+ s32 c = 2048;
+ if (cdr.CmdInProgress) {
+ c = 2048 - (psxRegs.cycle - nextCycle);
+ c = MAX_VALUE(c, 512);
+ }
CDR_INT(c);
}
}
}
void psxDma3(u32 madr, u32 bcr, u32 chcr) {
- u32 cdsize;
+ u32 cdsize, max_words;
int size;
u8 *ptr;
switch (chcr & 0x71000000) {
case 0x11000000:
- ptr = (u8 *)PSXM(madr);
+ ptr = getDmaRam(madr, &max_words);
if (ptr == INVALID_PTR) {
CDR_LOG_I("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");
break;
size = DATA_SIZE - cdr.FifoOffset;
if (size > cdsize)
size = cdsize;
+ if (size > max_words * 4)
+ size = max_words * 4;
if (size > 0)
{
memcpy(ptr, cdr.Transfer + cdr.FifoOffset, size);