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

diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index 2f2d69a1..1aebfce5 100644
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -22,18 +22,13 @@
 #include "externals.h"
 #include "registers.h"
 
-////////////////////////////////////////////////////////////////////////
-// READ DMA (one value)
-////////////////////////////////////////////////////////////////////////
-
-unsigned short CALLBACK SPUreadDMA(void)
+static void set_dma_end(int iSize, unsigned int cycles)
 {
- unsigned short s = *(unsigned short *)(spu.spuMemC + spu.spuAddr);
- check_irq_io(spu.spuAddr);
- spu.spuAddr += 2;
- spu.spuAddr &= 0x7fffe;
-
- return s;
+ // 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;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -46,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++)
@@ -56,26 +51,9 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
   addr &= 0x7fffe;
  }
  if (irq && (spu.spuCtrl & CTRL_IRQ))
-  log_unhandled("wdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);
+  log_unhandled("rdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);
  spu.spuAddr = addr;
-}
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-// WRITE DMA (one value)
-////////////////////////////////////////////////////////////////////////
-  
-void CALLBACK SPUwriteDMA(unsigned short val)
-{
- *(unsigned short *)(spu.spuMemC + spu.spuAddr) = val;
-
- check_irq_io(spu.spuAddr);
- spu.spuAddr += 2;
- spu.spuAddr &= 0x7fffe;
- spu.bMemDirty = 1;
+ set_dma_end(iSize, cycles);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -88,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;
 
@@ -110,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);
 }
 
 ////////////////////////////////////////////////////////////////////////