X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fdma.c;h=1aebfce5fabb111a82b0e97892ea1dc44f77e3f2;hb=d358733b8461f6fa182b33d29f0676c2df505854;hp=533d95e90a572d3d026b95c1a3cb7a51f9b1b3f8;hpb=20a3a441bc4176d91cd4d41f8dedf12a9f448abb;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index 533d95e9..1aebfce5 100644
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -22,6 +22,15 @@
 #include "externals.h"
 #include "registers.h"
 
+static void set_dma_end(int iSize, unsigned int cycles)
+{
+ // this must be > psxdma.c dma irq
+ // Road Rash also wants a considerable delay, maybe because of fifo?
+ cycles += iSize * 20;  // maybe
+ cycles |= 1;           // indicates dma is active
+ spu.cycles_dma_end = cycles;
+}
+
 ////////////////////////////////////////////////////////////////////////
 // READ DMA (many values)
 ////////////////////////////////////////////////////////////////////////
@@ -32,7 +41,7 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;
  int i, irq;
 
- do_samples_if_needed(cycles, 1);
+ do_samples_if_needed(cycles, 1, 2);
  irq = addr <= irq_addr && irq_addr < addr + iSize*2;
 
  for(i = 0; i < iSize; i++)
@@ -44,6 +53,7 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
  if (irq && (spu.spuCtrl & CTRL_IRQ))
   log_unhandled("rdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);
  spu.spuAddr = addr;
+ set_dma_end(iSize, cycles);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -56,7 +66,7 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;
  int i, irq;
  
- do_samples_if_needed(cycles, 1);
+ do_samples_if_needed(cycles, 1, 2);
  spu.bMemDirty = 1;
  irq = addr <= irq_addr && irq_addr < addr + iSize*2;
 
@@ -78,6 +88,7 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  if (irq && (spu.spuCtrl & CTRL_IRQ)) // unhandled because need to implement delay
   log_unhandled("wdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);
  spu.spuAddr = addr;
+ set_dma_end(iSize, cycles);
 }
 
 ////////////////////////////////////////////////////////////////////////