Merge branch 'master' into pikalax_work

7 files changed, 61 insertions, 0 deletions

diff --git a/arm7/lib/include/MI_dma.h b/arm7/lib/include/MI_dma.h
new file mode 100644
index 00000000..b728f814
--- /dev/null
+++ b/arm7/lib/include/MI_dma.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_MI_DMA_H
+#define GUARD_MI_DMA_H
+
+#include "nitro/dma.h"
+#include "nitro/types.h"
+
+void MI_StopDma(u32 channel);
+void MI_WaitDma(u32 channel);
+
+#endif
diff --git a/arm7/lib/include/MI_memory.h b/arm7/lib/include/MI_memory.h
new file mode 100644
index 00000000..cb0c53fc
--- /dev/null
+++ b/arm7/lib/include/MI_memory.h
@@ -0,0 +1,15 @@
+#ifndef GUARD_MI_MEMORY_H
+#define GUARD_MI_MEMORY_H
+
+#include "nitro/types.h"
+
+void MIi_CpuClear16(register u16 value, register u16 * dst, register u32 size);
+void MIi_CpuCopy16(register u16 * src, register u16 * dst, register u32 size);
+void MIi_CpuClear32(register u32 value, register u32 * dst, register u32 size);
+void MIi_CpuCopy32(register u32 * src, register u32 * dst, register u32 size);
+void MIi_CpuClearFast(register u32 value, register u32 * dst, register u32 size);
+void MIi_CpuCopyFast(register u32 * src, register u32 * dst, register u32 size);
+void MI_CpuFill8(register u8 value, register u8 * dst, register u32 size);
+void MI_CpuCopy8(register u8 * src, register u8 * dst, register u32 size);
+
+#endif
diff --git a/arm7/lib/include/MI_swap.h b/arm7/lib/include/MI_swap.h
new file mode 100644
index 00000000..8b18c5c1
--- /dev/null
+++ b/arm7/lib/include/MI_swap.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_MI_SWAP_H
+#define GUARD_MI_SWAP_H
+
+#include "nitro/types.h"
+
+u32 MI_SwapWord(register u32 data, register u32 * dst);
+
+#endif
diff --git a/arm7/lib/include/OS_init.h b/arm7/lib/include/OS_init.h
index 9c9b1f93..c90740c2 100644
--- a/arm7/lib/include/OS_init.h
+++ b/arm7/lib/include/OS_init.h
@@ -4,6 +4,8 @@
 #include "nitro/types.h"
 #include "OS_system.h"
 #include "OS_arena.h"
+#include "OS_alloc.h"
+#include "OS_reset.h"
 
 void OS_Init(void);
 
diff --git a/arm7/lib/include/OS_interrupt.h b/arm7/lib/include/OS_interrupt.h
new file mode 100644
index 00000000..afcb9b5f
--- /dev/null
+++ b/arm7/lib/include/OS_interrupt.h
@@ -0,0 +1,6 @@
+#ifndef POKEDIAMOND_ARM7_OS_INTERRUPT_H
+#define POKEDIAMOND_ARM7_OS_INTERRUPT_H
+
+#include "nitro/OS_interrupt_shared.h"
+
+#endif //POKEDIAMOND_ARM7_OS_INTERRUPT_H
diff --git a/arm7/lib/include/OS_reset.h b/arm7/lib/include/OS_reset.h
new file mode 100644
index 00000000..f643dd58
--- /dev/null
+++ b/arm7/lib/include/OS_reset.h
@@ -0,0 +1,14 @@
+#ifndef POKEDIAMOND_ARM7_OS_RESET_H
+#define POKEDIAMOND_ARM7_OS_RESET_H
+
+#include "nitro/types.h"
+#include "nitro/OS_reset_shared.h"
+#include "PXI_fifo.h"
+
+void OS_InitReset(void);
+BOOL OS_IsResetOccurred(void);
+static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err);
+static void OSi_SendToPxi(u16 data);
+void OS_ResetSystem(void);
+
+#endif //POKEDIAMOND_ARM7_OS_RESET_H
diff --git a/arm7/lib/include/PXI_fifo.h b/arm7/lib/include/PXI_fifo.h
new file mode 100644
index 00000000..6d634f72
--- /dev/null
+++ b/arm7/lib/include/PXI_fifo.h
@@ -0,0 +1,6 @@
+#ifndef POKEDIAMOND_ARM7_PXI_FIFO_H
+#define POKEDIAMOND_ARM7_PXI_FIFO_H
+
+#include "nitro/PXI_fifo_shared.h"
+
+#endif //POKEDIAMOND_ARM7_PXI_FIFO_H