Merge remote-tracking branch 'upstream/master'

1 files changed, 40 insertions, 0 deletions

diff --git a/include/nitro/OS_alloc_shared.h b/include/nitro/OS_alloc_shared.h
new file mode 100644
index 00000000..cf92032a
--- /dev/null
+++ b/include/nitro/OS_alloc_shared.h
@@ -0,0 +1,40 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include OS_alloc.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_OS_ALLOC_SHARED_H
+#define POKEDIAMOND_OS_ALLOC_SHARED_H
+
+typedef s32 OSHeapHandle;
+
+typedef struct Cell Cell;
+
+struct Cell {
+    Cell* prev;
+    Cell* next;
+    long size;
+};
+
+typedef struct {
+    long size;
+    Cell *free;
+    Cell *allocated;
+} HeapDesc;
+
+typedef struct {
+    volatile OSHeapHandle currentHeap;
+    int numHeaps;
+    void* arenaStart;
+    void* arenaEnd;
+    HeapDesc* heapArray;
+} OSHeapInfo;
+
+#endif //POKEDIAMOND_OS_ALLOC_SHARED_H