X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxhw.h;h=574ee3337fdb59a3c73f9c49c88d3478b7e65285;hb=e5241564f4444496f51f4de9bf533b1d910449ec;hp=cd4e928c58b4b4e54f174a1819b0fe6ac3c2f99e;hpb=ef79bbde537d6b9c745a7d86cb9df1d04c35590d;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxhw.h b/libpcsxcore/psxhw.h
index cd4e928c..574ee333 100644
--- a/libpcsxcore/psxhw.h
+++ b/libpcsxcore/psxhw.h
@@ -57,20 +57,43 @@ extern "C" {
 #define HW_DMA_PCR   (psxHu32ref(0x10f0))
 #define HW_DMA_ICR   (psxHu32ref(0x10f4))
 
-#define	DMA_INTERRUPT(n) \
-	if (SWAPu32(HW_DMA_ICR) & (1 << (16 + n))) {    \
-		HW_DMA_ICR |= SWAP32(1 << (24 + n));        \
-		psxHu32ref(0x1070) |= SWAP32(8);            \
-	}
+#define HW_DMA_ICR_BUS_ERROR     (1<<15)
+#define HW_DMA_ICR_GLOBAL_ENABLE (1<<23)
+#define HW_DMA_ICR_IRQ_SENT      (1<<31)
+
+#define DMA_INTERRUPT(n) { \
+	u32 icr = SWAPu32(HW_DMA_ICR); \
+	if (icr & (1 << (16 + n))) { \
+		icr |= 1 << (24 + n); \
+		if (icr & HW_DMA_ICR_GLOBAL_ENABLE && !(icr & HW_DMA_ICR_IRQ_SENT)) { \
+			psxHu32ref(0x1070) |= SWAP32(8); \
+			icr |= HW_DMA_ICR_IRQ_SENT; \
+		} \
+		HW_DMA_ICR = SWAP32(icr); \
+	} \
+}
 
 void psxHwReset();
 u8 psxHwRead8(u32 add);
 u16 psxHwRead16(u32 add);
 u32 psxHwRead32(u32 add);
-void psxHwWrite8(u32 add, u8  value);
-void psxHwWrite16(u32 add, u16 value);
+void psxHwWrite8(u32 add, u32 value);
+void psxHwWrite16(u32 add, u32 value);
 void psxHwWrite32(u32 add, u32 value);
-int psxHwFreeze(gzFile f, int Mode);
+int psxHwFreeze(void *f, int Mode);
+
+void psxHwWriteIstat(u32 value);
+void psxHwWriteImask(u32 value);
+void psxHwWriteChcr0(u32 value);
+void psxHwWriteChcr1(u32 value);
+void psxHwWriteChcr2(u32 value);
+void psxHwWriteChcr3(u32 value);
+void psxHwWriteChcr4(u32 value);
+void psxHwWriteChcr6(u32 value);
+void psxHwWriteDmaIcr32(u32 value);
+void psxHwWriteGpuSR(u32 value);
+u32  psxHwReadGpuSR(void);
+u32  psxHwReadGpuSRbusyHack(void);
 
 #ifdef __cplusplus
 }