Merge pull request #33 from red031000/os_lib

update os_lib from master and split os_alloc and os_arena

1 files changed, 1 insertions, 30 deletions

diff --git a/include/nitro/os_alloc.h b/include/nitro/os_alloc.h
index e3c37079..1c4b6122 100644
--- a/include/nitro/os_alloc.h
+++ b/include/nitro/os_alloc.h
@@ -6,26 +6,7 @@
 #define POKEDIAMOND_OS_ALLOC_H
 
 #include "types.h"
-
-typedef enum {
-    OS_ARENA_MAIN = 0,
-    OS_ARENA_MAIN_SUBPRIV = 1,
-    OS_ARENA_MAINEX = 2,
-    OS_ARENA_ITCM = 3,
-    OS_ARENA_DTCM = 4,
-    OS_ARENA_SHARED = 5,
-    OS_ARENA_WRAM_MAIN = 6,
-    OS_ARENA_WRAM_SUB = 7,
-    OS_ARENA_WRAM_SUBPRIV = 8,
-    OS_ARENA_MAX = 9
-} OSArenaId;
-
-typedef struct {
-    void* lo[OS_ARENA_MAX];
-    void* hi[OS_ARENA_MAX];
-    u16 initialized;
-    u8 padding[2];
-} OSArenaInfo;
+#include "os_arena.h"
 
 typedef int OSHeapHandle;
 
@@ -51,16 +32,6 @@ typedef struct {
     HeapDesc* heapArray;
 } OSHeapInfo;
 
-void* OS_AllocFromArenaHi(OSArenaId id, u32 size, u32 align);
-void* OS_AllocFromArenaLo(OSArenaId id, u32 size, u32 align);
-void OS_SetArenaLo(OSArenaId id, void *newLo);
-void OS_SetArenaHi(OSArenaId id, void *newHi);
-void* OS_GetInitArenaLo(OSArenaId id);
-void* OS_GetInitArenaHi(OSArenaId id);
-void* OS_GetArenaLo(OSArenaId id);
-void* OS_GetArenaHi(OSArenaId id);
-void OS_InitArenaEx();
-void OS_InitArena();
 void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void *ptr);
 void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size);