diff options
Diffstat (limited to 'plugins/dfsound/dma.c')
| -rw-r--r-- | plugins/dfsound/dma.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c index 7c164ac..d3706b9 100644 --- a/plugins/dfsound/dma.c +++ b/plugins/dfsound/dma.c @@ -27,9 +27,9 @@ unsigned short CALLBACK SPUreadDMA(void)
{
- unsigned short s=spuMem[spuAddr>>1];
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
+ unsigned short s=spu.spuMem[spu.spuAddr>>1];
+ spu.spuAddr+=2;
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
return s;
}
@@ -38,15 +38,18 @@ unsigned short CALLBACK SPUreadDMA(void) // READ DMA (many values)
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
+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++=spuMem[spuAddr>>1]; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0; // wrap
+ *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
}
}
@@ -64,34 +67,35 @@ void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize) void CALLBACK SPUwriteDMA(unsigned short val)
{
- spuMem[spuAddr>>1] = val; // spu addr got by writeregister
+ spu.spuMem[spu.spuAddr>>1] = val; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0; // wrap
+ spu.spuAddr+=2; // inc spu addr
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0; // wrap
}
////////////////////////////////////////////////////////////////////////
// WRITE DMA (many values)
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)
+void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
+ unsigned int cycles)
{
int i;
- had_dma = 1;
+ do_samples_if_needed(cycles);
- if(spuAddr + iSize*2 < 0x80000)
+ if(spu.spuAddr + iSize*2 < 0x80000)
{
- memcpy(&spuMem[spuAddr>>1], pusPSXMem, iSize*2);
- spuAddr += iSize*2;
+ memcpy(&spu.spuMem[spu.spuAddr>>1], pusPSXMem, iSize*2);
+ spu.spuAddr += iSize*2;
return;
}
for(i=0;i<iSize;i++)
{
- spuMem[spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- spuAddr&=0x7ffff; // wrap
+ spu.spuMem[spu.spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister
+ spu.spuAddr+=2; // inc spu addr
+ spu.spuAddr&=0x7ffff; // wrap
}
}
|