spu: try to improve timing

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

diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index eb85a73..1aebfce 100644 (file)
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -22,18 +22,13 @@
 #include "externals.h"\r
 #include "registers.h"\r
 \r
-////////////////////////////////////////////////////////////////////////\r
-// READ DMA (one value)\r
-////////////////////////////////////////////////////////////////////////\r
-\r
-unsigned short CALLBACK SPUreadDMA(void)\r
+static void set_dma_end(int iSize, unsigned int cycles)\r
 {\r
- unsigned short s = *(unsigned short *)(spu.spuMemC + spu.spuAddr);\r
- check_irq_io(spu.spuAddr);\r
- spu.spuAddr += 2;\r
- spu.spuAddr &= 0x7fffe;\r
-\r
- return s;\r
+ // this must be > psxdma.c dma irq\r
+ // Road Rash also wants a considerable delay, maybe because of fifo?\r
+ cycles += iSize * 20;  // maybe\r
+ cycles |= 1;           // indicates dma is active\r
+ spu.cycles_dma_end = cycles;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -46,7 +41,7 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
  int i, irq;\r
 \r
- do_samples_if_needed(cycles, 1);\r
+ do_samples_if_needed(cycles, 1, 2);\r
  irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
 \r
  for(i = 0; i < iSize; i++)\r
@@ -58,24 +53,7 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
  if (irq && (spu.spuCtrl & CTRL_IRQ))\r
   log_unhandled("rdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
  spu.spuAddr = addr;\r
-}\r
-\r
-////////////////////////////////////////////////////////////////////////\r
-////////////////////////////////////////////////////////////////////////\r
-////////////////////////////////////////////////////////////////////////\r
-\r
-////////////////////////////////////////////////////////////////////////\r
-// WRITE DMA (one value)\r
-////////////////////////////////////////////////////////////////////////\r
-  \r
-void CALLBACK SPUwriteDMA(unsigned short val)\r
-{\r
- *(unsigned short *)(spu.spuMemC + spu.spuAddr) = val;\r
-\r
- check_irq_io(spu.spuAddr);\r
- spu.spuAddr += 2;\r
- spu.spuAddr &= 0x7fffe;\r
- spu.bMemDirty = 1;\r
+ set_dma_end(iSize, cycles);\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -88,7 +66,7 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
  int i, irq;\r
  \r
- do_samples_if_needed(cycles, 1);\r
+ do_samples_if_needed(cycles, 1, 2);\r
  spu.bMemDirty = 1;\r
  irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
 \r
@@ -110,6 +88,7 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  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
  spu.spuAddr = addr;\r
+ set_dma_end(iSize, cycles);\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r