diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-09 22:30:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 22:30:09 +0300 |
| commit | 912f95b5d5125f1d20b80c9909527259c09c1262 (patch) | |
| tree | 9d4fb9b4cee8f4b3697f9103e28897d7cd225de2 /arm7/lib/include | |
| parent | f58a454f545497f6cb0a2a0d97778fd31788e13b (diff) | |
| parent | c8f98c38d5baf6bf86531188b1a6ff0745d8d8c9 (diff) | |
Merge branch 'master' into pikalax_work
Diffstat (limited to 'arm7/lib/include')
| -rw-r--r-- | arm7/lib/include/OS_arena.h | 14 | ||||
| -rw-r--r-- | arm7/lib/include/OS_init.h | 1 | ||||
| -rw-r--r-- | arm7/lib/include/consts.h | 1 | ||||
| -rw-r--r-- | arm7/lib/include/mmap.h | 26 |
4 files changed, 42 insertions, 0 deletions
diff --git a/arm7/lib/include/OS_arena.h b/arm7/lib/include/OS_arena.h new file mode 100644 index 00000000..9227e539 --- /dev/null +++ b/arm7/lib/include/OS_arena.h @@ -0,0 +1,14 @@ +#ifndef POKEDIAMOND_ARM7_OS_ARENA_H +#define POKEDIAMOND_ARM7_OS_ARENA_H + +#include "nitro/OS_arena_shared.h" + +void OS_InitArena(void); +void* OS_GetArenaHi(OSArenaId id); +void* OS_GetArenaLo(OSArenaId id); +void* OS_GetInitArenaHi(OSArenaId id); +void* OS_GetInitArenaLo(OSArenaId id); +void OS_SetArenaHi(OSArenaId id, void* newHi); +void OS_SetArenaLo(OSArenaId id, void* newLo); + +#endif //POKEDIAMOND_ARM7_OS_ARENA_H diff --git a/arm7/lib/include/OS_init.h b/arm7/lib/include/OS_init.h index 50d5e3c4..9c9b1f93 100644 --- a/arm7/lib/include/OS_init.h +++ b/arm7/lib/include/OS_init.h @@ -3,6 +3,7 @@ #include "nitro/types.h" #include "OS_system.h" +#include "OS_arena.h" void OS_Init(void); diff --git a/arm7/lib/include/consts.h b/arm7/lib/include/consts.h index aaf8e429..dd297402 100644 --- a/arm7/lib/include/consts.h +++ b/arm7/lib/include/consts.h @@ -2,5 +2,6 @@ #define POKEDIAMOND_ARM7_CONSTS_H #include "nitro/consts_shared.h" +#include "mmap.h" #endif //POKEDIAMOND_ARM7_CONSTS_H diff --git a/arm7/lib/include/mmap.h b/arm7/lib/include/mmap.h new file mode 100644 index 00000000..24d15ad7 --- /dev/null +++ b/arm7/lib/include/mmap.h @@ -0,0 +1,26 @@ +#ifndef POKEDIAMOND_ARM7_MMAP_H +#define POKEDIAMOND_ARM7_MMAP_H + +#include "nitro/mmap_shared.h" + +#define HW_WRAM_END 0x03800000 +#define HW_PRV_WRAM 0x03800000 +#define HW_PRV_WRAM_END 0x03810000 + +#define HW_PRV_WRAM_SIZE (HW_PRV_WRAM_END-HW_PRV_WRAM) + +#define HW_SVC_STACK_SIZE 0x40 +#define HW_PRV_WRAM_SYSRV_SIZE 0x40 + +#define HW_MAIN_MEM_SUB_SIZE (HW_MAIN_MEM_SIZE - HW_MAIN_MEM_MAIN_SIZE - HW_MAIN_MEM_SHARED_SIZE) + +#define HW_MAIN_MEM_SUB (HW_MAIN_MEM_MAIN_END + 0x400000) +#define HW_MAIN_MEM_SUB_END (HW_MAIN_MEM_SUB + HW_MAIN_MEM_SUB_SIZE) + +#define HW_PRV_WRAM_IRQ_STACK_END (HW_PRV_WRAM_SVC_STACK) +#define HW_PRV_WRAM_SVC_STACK (HW_PRV_WRAM_SVC_STACK_END - HW_SVC_STACK_SIZE) +#define HW_PRV_WRAM_SVC_STACK_END (HW_PRV_WRAM_SYSRV) + +#define HW_PRV_WRAM_SYSRV (HW_PRV_WRAM + HW_PRV_WRAM_SIZE - HW_PRV_WRAM_SYSRV_SIZE) + +#endif //POKEDIAMOND_ARM7_MMAP_H |