From f5020bf1a7c5a1fe1fcd35a86d2e33794ba621a4 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 24 May 2020 18:20:52 +0100 Subject: cleanup OS --- arm9/lib/src/OS_arena.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'arm9/lib/src/OS_arena.c') diff --git a/arm9/lib/src/OS_arena.c b/arm9/lib/src/OS_arena.c index 31796771..9e7d3223 100644 --- a/arm9/lib/src/OS_arena.c +++ b/arm9/lib/src/OS_arena.c @@ -17,7 +17,7 @@ extern void SDK_SECTION_ARENA_DTCM_START(); // TODO: technically this should be extern void SDK_IRQ_STACKSIZE(); // TODO: technically this should be defined in the lcf extern void SDK_SYS_STACKSIZE(); // TODO: technically this should be defined in the lcf -ARM_FUNC void OS_InitArena() { +ARM_FUNC void OS_InitArena(void) { if (OSi_Initialized) { return; } @@ -42,7 +42,7 @@ ARM_FUNC void OS_InitArena() { OS_SetArenaLo(OS_ARENA_WRAM_MAIN, OS_GetInitArenaLo(OS_ARENA_WRAM_MAIN)); } -ARM_FUNC void OS_InitArenaEx() { +ARM_FUNC void OS_InitArenaEx(void) { OS_SetArenaHi(2, OS_GetInitArenaHi(OS_ARENA_MAINEX)); OS_SetArenaLo(2, OS_GetInitArenaLo(OS_ARENA_MAINEX)); @@ -73,22 +73,22 @@ ARM_FUNC void* OS_GetInitArenaHi(OSArenaId id) { case OS_ARENA_ITCM: return (void *)HW_ITCM_ARENA_HI_DEFAULT; case OS_ARENA_DTCM: - u32 irqStackLo = (u32)HW_DTCM_IRQ_STACK_END - (s32)SDK_IRQ_STACKSIZE; + { + u32 irqStackLo = (u32) HW_DTCM_IRQ_STACK_END - (s32) SDK_IRQ_STACKSIZE; u32 sysStackLo; - if (!(s32)SDK_SYS_STACKSIZE) { + if (!(s32) SDK_SYS_STACKSIZE) { sysStackLo = HW_DTCM; - if (sysStackLo < (u32)SDK_SECTION_ARENA_DTCM_START) { - sysStackLo = (u32)SDK_SECTION_ARENA_DTCM_START; + if (sysStackLo < (u32) SDK_SECTION_ARENA_DTCM_START) { + sysStackLo = (u32) SDK_SECTION_ARENA_DTCM_START; } + } else if ((s32) SDK_SYS_STACKSIZE < 0) { + sysStackLo = (u32) SDK_SECTION_ARENA_DTCM_START - (s32) SDK_SYS_STACKSIZE; + } else { + sysStackLo = irqStackLo - (s32) SDK_SYS_STACKSIZE; } - else if ((s32)SDK_SYS_STACKSIZE < 0) { - sysStackLo = (u32)SDK_SECTION_ARENA_DTCM_START - (s32)SDK_SYS_STACKSIZE; - } - else { - sysStackLo = irqStackLo - (s32)SDK_SYS_STACKSIZE; - } - return (void*)sysStackLo; + return (void *) sysStackLo; + } case OS_ARENA_SHARED: return (void *)HW_SHARED_ARENA_HI_DEFAULT; case OS_ARENA_WRAM_MAIN: -- cgit v1.2.3