X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxdma.h;fp=libpcsxcore%2Fpsxdma.h;h=b73781fc9b84604a2f0fecec1ea6b5e2bd13a2a7;hp=6736cdb22b19107295d2c46ccb418f28dd8d73bf;hb=d28b54b1d1d161b3f3acc3299c43106a022451e6;hpb=96d9fde1230e5ae6de069ff9e4a0f16185650ab5

diff --git a/libpcsxcore/psxdma.h b/libpcsxcore/psxdma.h
index 6736cdb2..b73781fc 100644
--- a/libpcsxcore/psxdma.h
+++ b/libpcsxcore/psxdma.h
@@ -30,24 +30,24 @@ extern "C" {
 #include "psxmem.h"
 
 #define GPUDMA_INT(eCycle) { \
-	psxRegs.interrupt |= 0x01000000; \
-	psxRegs.intCycle[3 + 24 + 1] = eCycle; \
-	psxRegs.intCycle[3 + 24] = psxRegs.cycle; \
-	new_dyna_set_event(3, eCycle); \
+	psxRegs.interrupt |= (1 << PSXINT_GPUDMA); \
+	psxRegs.intCycle[PSXINT_GPUDMA].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_GPUDMA].sCycle = psxRegs.cycle; \
+	new_dyna_set_event(PSXINT_GPUDMA, eCycle); \
 }
 
 #define SPUDMA_INT(eCycle) { \
-    psxRegs.interrupt |= 0x04000000; \
-    psxRegs.intCycle[1 + 24 + 1] = eCycle; \
-    psxRegs.intCycle[1 + 24] = psxRegs.cycle; \
-    new_dyna_set_event(5, eCycle); \
+	psxRegs.interrupt |= (1 << PSXINT_SPUDMA); \
+	psxRegs.intCycle[PSXINT_SPUDMA].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_SPUDMA].sCycle = psxRegs.cycle; \
+	new_dyna_set_event(PSXINT_SPUDMA, eCycle); \
 }
 
 #define MDECOUTDMA_INT(eCycle) { \
-	psxRegs.interrupt |= 0x02000000; \
-	psxRegs.intCycle[5 + 24 + 1] = eCycle; \
-	psxRegs.intCycle[5 + 24] = psxRegs.cycle; \
-	new_dyna_set_event(4, eCycle); \
+	psxRegs.interrupt |= (1 << PSXINT_MDECOUTDMA); \
+	psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle = psxRegs.cycle; \
+	new_dyna_set_event(PSXINT_MDECOUTDMA, eCycle); \
 }
 
 void psxDma2(u32 madr, u32 bcr, u32 chcr);