cdrom: change pause timing again

[pcsx_rearmed.git] / plugins / dfsound / dma.c

diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index 1aebfce..fde1f83 100644 (file)
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -39,10 +39,10 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int cycles)\r
 {\r
  unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
- int i, irq;\r
+ int i, irq_after;\r
 \r
  do_samples_if_needed(cycles, 1, 2);\r
- irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
+ irq_after = (irq_addr - addr) & 0x7ffff;\r
 \r
  for(i = 0; i < iSize; i++)\r
  {\r
@@ -50,8 +50,10 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
   addr += 2;\r
   addr &= 0x7fffe;\r
  }\r
- if (irq && (spu.spuCtrl & CTRL_IRQ))\r
-  log_unhandled("rdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
+ if ((spu.spuCtrl & CTRL_IRQ) && irq_after < iSize * 2) {\r
+  log_unhandled("rdma spu irq: %x/%x-%x\n", irq_addr, spu.spuAddr, addr);\r
+  do_irq_io(irq_after);\r
+ }\r
  spu.spuAddr = addr;\r
  set_dma_end(iSize, cycles);\r
 }\r
@@ -64,11 +66,11 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int cycles)\r
 {\r
  unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
- int i, irq;\r
+ int i, irq_after;\r
  \r
- do_samples_if_needed(cycles, 1, 2);\r
+ do_samples_if_needed(cycles + iSize*2 * 4, 1, 2);\r
+ irq_after = (irq_addr - addr) & 0x7ffff;\r
  spu.bMemDirty = 1;\r
- irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
 \r
  if (addr + iSize*2 < 0x80000)\r
  {\r
@@ -77,7 +79,6 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  }\r
  else\r
  {\r
-  irq |= irq_addr < ((addr + iSize*2) & 0x7ffff);\r
   for (i = 0; i < iSize; i++)\r
   {\r
    *(unsigned short *)(spu.spuMemC + addr) = *pusPSXMem++;\r
@@ -85,10 +86,33 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
    addr &= 0x7fffe;\r
   }\r
  }\r
- if (irq && (spu.spuCtrl & CTRL_IRQ)) // unhandled because need to implement delay\r
-  log_unhandled("wdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
+ if ((spu.spuCtrl & CTRL_IRQ) && irq_after < iSize * 2) {\r
+  log_unhandled("%u wdma spu irq: %x/%x-%x (%u)\n",\r
+    cycles, irq_addr, spu.spuAddr, addr, irq_after);\r
+  // this should be consistent with psxdma.c timing\r
+  // might also need more delay like in set_dma_end()\r
+  do_irq_io(irq_after * 4);\r
+ }\r
+ for (i = 0; i < 24; i++) {\r
+  size_t ediff, p = spu.s_chan[i].pCurr - spu.spuMemC;\r
+  if (spu.s_chan[i].ADSRX.State == ADSR_RELEASE && !spu.s_chan[i].ADSRX.EnvelopeVol)\r
+   continue;\r
+  ediff = addr - p;\r
+  if (spu.spuAddr < p && p < spu.spuAddr + iSize * 2) {\r
+   log_unhandled("%u spu ch%02d play %zx dma %x-%x (%zd)\n",\r
+     cycles, i, p, spu.spuAddr, addr, ediff);\r
+   //exit(1);\r
+  }\r
+  // a hack for the super annoying timing issues in The Emperor's New Groove\r
+  // (which is a game bug, but tends to trigger more here)\r
+  if (ediff <= 0x20u) {\r
+   spu.s_chan[i].pCurr += ediff;\r
+   break;\r
+  }\r
+ }\r
  spu.spuAddr = addr;\r
  set_dma_end(iSize, cycles);\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
+// vim:shiftwidth=1:expandtab\r