Fixes Diablo 1 SPU bug properly and remove Diablo hack. (#191)

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

diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index 7c164ac..43019f1 100644 (file)
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -27,9 +27,9 @@
 \r
 unsigned short CALLBACK SPUreadDMA(void)\r
 {\r
- unsigned short s=spuMem[spuAddr>>1];\r
- spuAddr+=2;\r
- if(spuAddr>0x7ffff) spuAddr=0;\r
+ unsigned short s = *(unsigned short *)(spu.spuMemC + spu.spuAddr);\r
+ spu.spuAddr += 2;\r
+ spu.spuAddr &= 0x7fffe;\r
 \r
  return s;\r
 }\r
@@ -38,15 +38,18 @@ unsigned short CALLBACK SPUreadDMA(void)
 // READ DMA (many values)\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)\r
+void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,\r
+ unsigned int cycles)\r
 {\r
  int i;\r
 \r
+ do_samples_if_needed(cycles, 1);\r
+\r
  for(i=0;i<iSize;i++)\r
   {\r
-   *pusPSXMem++=spuMem[spuAddr>>1];                    // spu addr got by writeregister\r
-   spuAddr+=2;                                         // inc spu addr\r
-   if(spuAddr>0x7ffff) spuAddr=0;                      // wrap\r
+   *pusPSXMem++ = *(unsigned short *)(spu.spuMemC + spu.spuAddr);\r
+   spu.spuAddr += 2;\r
+   spu.spuAddr &= 0x7fffe;\r
   }\r
 }\r
 \r
@@ -64,34 +67,37 @@ void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
   \r
 void CALLBACK SPUwriteDMA(unsigned short val)\r
 {\r
- spuMem[spuAddr>>1] = val;                             // spu addr got by writeregister\r
+ *(unsigned short *)(spu.spuMemC + spu.spuAddr) = val;\r
 \r
- spuAddr+=2;                                           // inc spu addr\r
- if(spuAddr>0x7ffff) spuAddr=0;                        // wrap\r
+ spu.spuAddr += 2;\r
+ spu.spuAddr &= 0x7fffe;\r
+ spu.bMemDirty = 1;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
 // WRITE DMA (many values)\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)\r
+void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,\r
+ unsigned int cycles)\r
 {\r
  int i;\r
  \r
- had_dma = 1;\r
+ do_samples_if_needed(cycles, 1);\r
+ spu.bMemDirty = 1;\r
 \r
- if(spuAddr + iSize*2 < 0x80000)\r
+ if(spu.spuAddr + iSize*2 < 0x80000)\r
   {\r
-   memcpy(&spuMem[spuAddr>>1], pusPSXMem, iSize*2);\r
-   spuAddr += iSize*2;\r
+   memcpy(spu.spuMemC + spu.spuAddr, pusPSXMem, iSize*2);\r
+   spu.spuAddr += iSize*2;\r
    return;\r
   }\r
 \r
  for(i=0;i<iSize;i++)\r
   {\r
-   spuMem[spuAddr>>1] = *pusPSXMem++;                  // spu addr got by writeregister\r
-   spuAddr+=2;                                         // inc spu addr\r
-   spuAddr&=0x7ffff;                                   // wrap\r
+   *(unsigned short *)(spu.spuMemC + spu.spuAddr) = *pusPSXMem++;\r
+   spu.spuAddr += 2;\r
+   spu.spuAddr &= 0x7fffe;\r
   }\r
 }\r
 \r