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
libretro: make RGB565 support into compile-time option
[pcsx_rearmed.git]
/
libpcsxcore
/
psxdma.c
diff --git
a/libpcsxcore/psxdma.c
b/libpcsxcore/psxdma.c
index
df79b6d
..
63c2724
100644
(file)
--- a/
libpcsxcore/psxdma.c
+++ b/
libpcsxcore/psxdma.c
@@
-22,13
+22,17
@@
*/
#include "psxdma.h"
*/
#include "psxdma.h"
+#include "gpu.h"
// Dma0/1 in Mdec.c
// Dma3 in CdRom.c
void spuInterrupt() {
// Dma0/1 in Mdec.c
// Dma3 in CdRom.c
void spuInterrupt() {
- HW_DMA4_CHCR &= SWAP32(~0x01000000);
- DMA_INTERRUPT(4);
+ if (HW_DMA4_CHCR & SWAP32(0x01000000))
+ {
+ HW_DMA4_CHCR &= SWAP32(~0x01000000);
+ DMA_INTERRUPT(4);
+ }
}
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
}
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
@@
-170,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)
@@
-192,8
+197,12
@@
void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
}
void gpuInterrupt() {
}
void gpuInterrupt() {
- HW_DMA2_CHCR &= SWAP32(~0x01000000);
- DMA_INTERRUPT(2);
+ if (HW_DMA2_CHCR & SWAP32(0x01000000))
+ {
+ 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) {
@@
-239,6
+248,9
@@
void psxDma6(u32 madr, u32 bcr, u32 chcr) {
void gpuotcInterrupt()
{
void gpuotcInterrupt()
{
- HW_DMA6_CHCR &= SWAP32(~0x01000000);
- DMA_INTERRUPT(6);
+ if (HW_DMA6_CHCR & SWAP32(0x01000000))
+ {
+ HW_DMA6_CHCR &= SWAP32(~0x01000000);
+ DMA_INTERRUPT(6);
+ }
}
}