#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
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);\r
- irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
+ do_samples_if_needed(cycles, 1, 2);\r
+ irq_after = (irq_addr - addr) & 0x7ffff;\r
\r
for(i = 0; i < iSize; i++)\r
{\r
addr += 2;\r
addr &= 0x7fffe;\r
}\r
- if (irq && (spu.spuCtrl & CTRL_IRQ))\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("rdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
+ spu.irqCallback(irq_after);\r
+ }\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
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);\r
+ do_samples_if_needed(cycles, 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
}\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
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("wdma spu irq: %x/%x+%x (%u)\n",\r
+ irq_addr, spu.spuAddr, iSize * 2, irq_after);\r
+ // this should be consistent with psxdma.c timing\r
+ // might also need more delay like in set_dma_end()\r
+ spu.irqCallback(irq_after);\r
+ }\r
spu.spuAddr = addr;\r
+ set_dma_end(iSize, cycles);\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
+// vim:shiftwidth=1:expandtab\r