diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-19 10:52:11 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-19 10:52:11 +0000 |
| commit | 0956549379a239182714ca5f06bb40748e3a54a5 (patch) | |
| tree | f3b4e0b2e5ef1125940ad6ae029ffdf066063484 /libpcsxcore/psxdma.c | |
| parent | b24d4d3cd394aa86691d69156f3fb108c3537582 (diff) | |
Use SDL for sound plugin, reverted the change to BIAS in r48024. (and I'm too lazy to hunt down the bug with x64 dynarec :( feel free to revert this revert if not preferred :P)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48308 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/psxdma.c')
| -rw-r--r-- | libpcsxcore/psxdma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c index 91dfea96..f6c3807e 100644 --- a/libpcsxcore/psxdma.c +++ b/libpcsxcore/psxdma.c @@ -27,8 +27,8 @@ // Dma3 in CdRom.c void spuInterrupt() { - HW_DMA4_CHCR &= SWAP32(~0x01000000); - DMA_INTERRUPT(4); + HW_DMA4_CHCR &= SWAP32(~0x01000000); + DMA_INTERRUPT(4); } void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU @@ -48,7 +48,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU break; } SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2); - SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2); + SPUDMA_INT(((bcr >> 16) * (bcr & 0xffff) / 2) / BIAS); return; case 0x01000200: //spu to cpu transfer @@ -63,7 +63,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU break; } size = (bcr >> 16) * (bcr & 0xffff) * 2; - SPU_readDMAMem(ptr, size); + SPU_readDMAMem(ptr, size); psxCpu->Clear(madr, size); break; @@ -112,7 +112,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU } size = (bcr >> 16) * (bcr & 0xffff); GPU_writeDataMem(ptr, size); - GPUDMA_INT((size / 4)); + GPUDMA_INT((size / 4) / BIAS); return; case 0x01000401: // dma chain |