X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fdma.c;h=13f9c269f6525e4b4cb58a1aff46d4737f192b7b;hb=c2eee46bfb8a3fde297735a8b115330498d442b4;hp=d3706b927b0bbcbbd596acca5f74765d76dffd76;hpb=3154bfab51566cbaa5bce3965d4c915bfb1b4f53;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index d3706b92..13f9c269 100644
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -20,18 +20,15 @@
 #define _IN_DMA
 
 #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=spu.spuMem[spu.spuAddr>>1];
- spu.spuAddr+=2;
- if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
-
- 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;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -41,36 +38,24 @@ unsigned short CALLBACK SPUreadDMA(void)
 void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int cycles)
 {
- int i;
-
- do_samples_if_needed(cycles);
-
- for(i=0;i<iSize;i++)
-  {
-   *pusPSXMem++=spu.spuMem[spu.spuAddr>>1];            // spu addr got by writeregister
-   spu.spuAddr+=2;                                     // inc spu addr
-   if(spu.spuAddr>0x7ffff) spu.spuAddr=0;              // wrap
-  }
-}
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-// to investigate: do sound data updates by writedma affect spu
-// irqs? Will an irq be triggered, if new data is written to
-// the memory irq address?
-
-////////////////////////////////////////////////////////////////////////
-// WRITE DMA (one value)
-////////////////////////////////////////////////////////////////////////
-  
-void CALLBACK SPUwriteDMA(unsigned short val)
-{
- spu.spuMem[spu.spuAddr>>1] = val;                     // spu addr got by writeregister
-
- spu.spuAddr+=2;                                       // inc spu addr
- if(spu.spuAddr>0x7ffff) spu.spuAddr=0;                // wrap
+ unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;
+ int i, irq_after;
+
+ do_samples_if_needed(cycles, 1, 2);
+ irq_after = (irq_addr - addr) & 0x7ffff;
+
+ for(i = 0; i < iSize; i++)
+ {
+  *pusPSXMem++ = *(unsigned short *)(spu.spuMemC + addr);
+  addr += 2;
+  addr &= 0x7fffe;
+ }
+ if ((spu.spuCtrl & CTRL_IRQ) && irq_after < iSize * 2) {
+  log_unhandled("rdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);
+  spu.irqCallback(irq_after);
+ }
+ spu.spuAddr = addr;
+ set_dma_end(iSize, cycles);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -80,23 +65,37 @@ void CALLBACK SPUwriteDMA(unsigned short val)
 void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  unsigned int cycles)
 {
- int i;
+ unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;
+ int i, irq_after;
  
- do_samples_if_needed(cycles);
-
- if(spu.spuAddr + iSize*2 < 0x80000)
-  {
-   memcpy(&spu.spuMem[spu.spuAddr>>1], pusPSXMem, iSize*2);
-   spu.spuAddr += iSize*2;
-   return;
-  }
-
- for(i=0;i<iSize;i++)
+ do_samples_if_needed(cycles, 1, 2);
+ irq_after = (irq_addr - addr) & 0x7ffff;
+ spu.bMemDirty = 1;
+
+ if (addr + iSize*2 < 0x80000)
+ {
+  memcpy(spu.spuMemC + addr, pusPSXMem, iSize*2);
+  addr += iSize*2;
+ }
+ else
+ {
+  for (i = 0; i < iSize; i++)
   {
-   spu.spuMem[spu.spuAddr>>1] = *pusPSXMem++;          // spu addr got by writeregister
-   spu.spuAddr+=2;                                     // inc spu addr
-   spu.spuAddr&=0x7ffff;                               // wrap
+   *(unsigned short *)(spu.spuMemC + addr) = *pusPSXMem++;
+   addr += 2;
+   addr &= 0x7fffe;
   }
+ }
+ if ((spu.spuCtrl & CTRL_IRQ) && irq_after < iSize * 2) {
+  log_unhandled("wdma spu irq: %x/%x+%x (%u)\n",
+    irq_addr, spu.spuAddr, iSize * 2, irq_after);
+  // this should be consistent with psxdma.c timing
+  // might also need more delay like in set_dma_end()
+  spu.irqCallback(irq_after);
+ }
+ spu.spuAddr = addr;
+ set_dma_end(iSize, cycles);
 }
 
 ////////////////////////////////////////////////////////////////////////
+// vim:shiftwidth=1:expandtab