notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spu: don't block on audio
[pcsx_rearmed.git]
/
libpcsxcore
/
psxdma.c
diff --git
a/libpcsxcore/psxdma.c
b/libpcsxcore/psxdma.c
index
6d7981f
..
ff7d6a3
100644
(file)
--- a/
libpcsxcore/psxdma.c
+++ b/
libpcsxcore/psxdma.c
@@
-22,6
+22,7
@@
*/
#include "psxdma.h"
*/
#include "psxdma.h"
+#include "gpu.h"
// Dma0/1 in Mdec.c
// Dma3 in CdRom.c
// Dma0/1 in Mdec.c
// Dma3 in CdRom.c
@@
-50,7
+51,7
@@
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
#endif
break;
}
#endif
break;
}
- SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2);
+ SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2
, psxRegs.cycle
);
SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
return;
SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
return;
@@
-66,7
+67,7
@@
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
break;
}
size = (bcr >> 16) * (bcr & 0xffff) * 2;
break;
}
size = (bcr >> 16) * (bcr & 0xffff) * 2;
- SPU_readDMAMem(ptr, size);
+ SPU_readDMAMem(ptr, size
, psxRegs.cycle
);
psxCpu->Clear(madr, size);
break;
psxCpu->Clear(madr, size);
break;
@@
-173,6
+174,7
@@
void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
if ((int)size <= 0)
size = gpuDmaChainSize(madr);
size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
if ((int)size <= 0)
size = gpuDmaChainSize(madr);
+ HW_GPU_STATUS &= ~PSXGPU_nBUSY;
// Tekken 3 = use 1.0 only (not 1.5x)
// Tekken 3 = use 1.0 only (not 1.5x)
@@
-200,6
+202,7
@@
void gpuInterrupt() {
HW_DMA2_CHCR &= SWAP32(~0x01000000);
DMA_INTERRUPT(2);
}
HW_DMA2_CHCR &= SWAP32(~0x01000000);
DMA_INTERRUPT(2);
}
+ HW_GPU_STATUS |= PSXGPU_nBUSY; // GPU no longer busy
}
void psxDma6(u32 madr, u32 bcr, u32 chcr) {
}
void psxDma6(u32 madr, u32 bcr, u32 chcr) {