2 files changed, 61 insertions, 8 deletions
diff --git a/arm9/lib/include/MI_dma.h b/arm9/lib/include/MI_dma.h
index 15dc2c06..e8938ef9 100644
--- a/arm9/lib/include/MI_dma.h
+++ b/arm9/lib/include/MI_dma.h
@@ -2,7 +2,68 @@
 #define POKEDIAMOND_ARM9_MI_DMA_H
 
 #include "nitro/MI_dma_shared.h"
+#include "consts.h"
+#include "OS_system.h"
 
 typedef void (*MIDmaCallback)(void *);
 
+#define REG_ADDR_DMA0CNT        0x40000b8
+#define REG_ADDR_DMA0_CLR_DATA  0x40000e0
+
+#define MI_CNT_CLEAR32(size)    (0x85000000 | ((size)/4))
+#define MI_CNT_CLEAR32_IF(size) (0xc5000000 | ((size)/4))
+#define MI_CNT_COPY32(size)     (0x84000000 | ((size)/4))
+#define MI_CNT_COPY32_IF(size)  (0xc4000000 | ((size)/4))
+#define MI_CNT_COPY16(size)     (0x80000000 | ((size)/2))
+
+typedef union
+{
+    u32 b32;
+    u16 b16;
+} MIiDmaClearSrc;
+
+void MI_DmaFill32(u32 dmaNo, void *dest, u32 data, u32 size);
+void MI_DmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size);
+void MI_DmaCopy16(u32 dmaNo, const void *src, void *dest, u32 size);
+void MI_DmaFill32Async(u32 dmaNo, void *dest, u32 data, u32 size, MIDmaCallback callback, void *arg);
+void MI_DmaCopy32Async(u32 dmaNo, const void *src, void *dest, u32 size, MIDmaCallback callback, void *arg);
+void MI_WaitDma(u32 dmaNo);
+void MI_StopDma(u32 dmaNo);
+void MIi_CheckAnotherAutoDMA(u32 dmaNo, u32 dmaType);
+void MIi_CheckDma0SourceAddress(u32 dmaNo, u32 src, u32 size, u32 dir);
+void MIi_DmaSetParams(u32 dmaNo, u32 src, u32 dest, u32 ctrl);
+void MIi_DmaSetParams_wait(u32 dmaNo, u32 src, u32 dest, u32 ctrl);
+void MIi_DmaSetParams_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl);
+void MIi_DmaSetParams_wait_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl);
+
+static inline void MIi_DmaSetParams_wait_src32(u32 dmaNo, u32 data, u32 dest, u32 ctrl)
+{
+    OSIntrMode lastIntrMode = OS_DisableInterrupts();
+
+    MIiDmaClearSrc *scrp = (MIiDmaClearSrc *) ((u32)REG_ADDR_DMA0_CLR_DATA + dmaNo * 4);
+    scrp->b32 = data;
+    MIi_DmaSetParams_wait_noInt(dmaNo, (u32)scrp, dest, ctrl);
+
+    (void)OS_RestoreInterrupts(lastIntrMode);
+}
+
+static inline void MIi_DmaSetParams_src32(u32 dmaNo, u32 data, u32 dest, u32 ctrl)
+{
+    OSIntrMode lastIntrMode = OS_DisableInterrupts();
+
+    MIiDmaClearSrc *srcp = (MIiDmaClearSrc *) ((u32)REG_ADDR_DMA0_CLR_DATA + dmaNo * 4);
+    srcp->b32 = data;
+    MIi_DmaSetParams_noInt(dmaNo, (u32)srcp, dest, ctrl);
+
+    (void)OS_RestoreInterrupts(lastIntrMode);
+}
+
+static inline void MIi_CallCallback(MIDmaCallback callback, void *arg)
+{
+    if (callback)
+    {
+        (callback) (arg);
+    }
+}
+
 #endif //POKEDIAMOND_ARM9_MI_DMA_H
diff --git a/arm9/lib/include/gx.h b/arm9/lib/include/gx.h
index f1c9fa50..bc89aa04 100644
--- a/arm9/lib/include/gx.h
+++ b/arm9/lib/include/gx.h
@@ -9,17 +9,9 @@
 
 void GXi_NopClearFifo128_(void *);
 void MI_Copy16B(const void *, void *);
-void MI_DmaFill32Async(u32, void *, u32, u32, u32, u32);
-void MI_DmaFill32(u32, void *, u32, u32);
-void MIi_CpuClear32(u32, void *, u32);
 void MI_Copy64B(void *src, void *dst);
-void MI_WaitDma(u32);
-void MI_DmaCopy32Async(u32, const void *, void *, u32, void *, void *);
-void MI_DmaCopy16(u32 unk, const void *src, void *dst, u32 size);
-void MI_DmaCopy32(u32 unk, const void *src, void *dst, u32 size);
 void MIi_CpuCopy32(const void *src, void *dst, u32 size);
 void OSi_UnlockVram(u16, u16);
-void MIi_CpuClear32(u32, void *, u32);
 
 #include "GXcommon.h"
 #include "GX_struct_2d.h"