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: more status bits
[pcsx_rearmed.git]
/
libpcsxcore
/
psxdma.c
diff --git
a/libpcsxcore/psxdma.c
b/libpcsxcore/psxdma.c
index
25ee2f0
..
55d2a0a
100644
(file)
--- a/
libpcsxcore/psxdma.c
+++ b/
libpcsxcore/psxdma.c
@@
-208,8
+208,8
@@
void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
set_event(PSXINT_GPUDMA, cycles_sum);
psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
set_event(PSXINT_GPUDMA, cycles_sum);
- //printf("%u dma2cf: %
d,%d %08x\n", psxRegs.cycle, cycles_sum
,
- //
cycles_last_cmd
, HW_DMA2_MADR);
+ //printf("%u dma2cf: %
6d,%4d %08x %08x %08x %08x\n", psxRegs.cycle
,
+ //
cycles_sum, cycles_last_cmd, madr, bcr, chcr
, HW_DMA2_MADR);
return;
default:
return;
default:
@@
-233,7
+233,7
@@
void gpuInterrupt() {
cycles_sum += psxRegs.gpuIdleAfter - psxRegs.cycle;
psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
set_event(PSXINT_GPUDMA, cycles_sum);
cycles_sum += psxRegs.gpuIdleAfter - psxRegs.cycle;
psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
set_event(PSXINT_GPUDMA, cycles_sum);
- //printf("%u dma2cn: %
d,%
d %08x\n", psxRegs.cycle, cycles_sum,
+ //printf("%u dma2cn: %
6d,%4
d %08x\n", psxRegs.cycle, cycles_sum,
// cycles_last_cmd, HW_DMA2_MADR);
return;
}
// cycles_last_cmd, HW_DMA2_MADR);
return;
}
@@
-244,6
+244,10
@@
void gpuInterrupt() {
}
}
}
}
+void psxAbortDma2() {
+ psxRegs.gpuIdleAfter = psxRegs.cycle + 32;
+}
+
void psxDma6(u32 madr, u32 bcr, u32 chcr) {
u32 words, words_max;
u32 *mem;
void psxDma6(u32 madr, u32 bcr, u32 chcr) {
u32 words, words_max;
u32 *mem;