summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/lib/include/OS_arena.h4
-rw-r--r--arm9/lib/include/OS_emulator.h4
-rw-r--r--arm9/lib/include/OS_entropy.h4
-rw-r--r--arm9/lib/include/OS_init.h2
-rw-r--r--arm9/lib/include/OS_interrupt.h2
-rw-r--r--arm9/lib/include/OS_system.h14
-rw-r--r--arm9/lib/include/OS_tcm.h2
-rw-r--r--arm9/lib/include/OS_terminate_proc.h4
-rw-r--r--arm9/lib/src/OS_arena.c26
-rw-r--r--arm9/lib/src/OS_emulator.c6
-rw-r--r--arm9/lib/src/OS_init.c18
-rw-r--r--arm9/lib/src/OS_interrupt.c2
-rw-r--r--arm9/lib/src/OS_system.c14
-rw-r--r--arm9/lib/src/OS_tcm.c2
-rw-r--r--arm9/lib/src/OS_terminate_proc.c4
15 files changed, 54 insertions, 54 deletions
diff --git a/arm9/lib/include/OS_arena.h b/arm9/lib/include/OS_arena.h
index f1893a3d..8cfef81d 100644
--- a/arm9/lib/include/OS_arena.h
+++ b/arm9/lib/include/OS_arena.h
@@ -27,8 +27,8 @@ typedef struct {
u8 padding[2];
} OSArenaInfo;
-void OS_InitArena();
-void OS_InitArenaEx();
+void OS_InitArena(void);
+void OS_InitArenaEx(void);
void* OS_GetArenaHi(OSArenaId id);
void* OS_GetArenaLo(OSArenaId id);
void* OS_GetInitArenaHi(OSArenaId id);
diff --git a/arm9/lib/include/OS_emulator.h b/arm9/lib/include/OS_emulator.h
index 54105258..30acec16 100644
--- a/arm9/lib/include/OS_emulator.h
+++ b/arm9/lib/include/OS_emulator.h
@@ -7,7 +7,7 @@
#include "consts.h"
-BOOL OS_IsRunOnEmulator();
-u32 OS_GetConsoleType();
+BOOL OS_IsRunOnEmulator(void);
+u32 OS_GetConsoleType(void);
#endif //POKEDIAMOND_OS_EMULATOR_H
diff --git a/arm9/lib/include/OS_entropy.h b/arm9/lib/include/OS_entropy.h
index b4695a72..78ac71b7 100644
--- a/arm9/lib/include/OS_entropy.h
+++ b/arm9/lib/include/OS_entropy.h
@@ -17,9 +17,9 @@ typedef struct NVRAMConfig{
extern vu64 OSi_TickCounter;
-extern u16 OS_GetTickLo();
+extern u16 OS_GetTickLo(void);
-static inline s32 GX_GetVCount()
+static inline s32 GX_GetVCount(void)
{
return reg_GX_VCOUNT;
}
diff --git a/arm9/lib/include/OS_init.h b/arm9/lib/include/OS_init.h
index 36fc5c8b..40685513 100644
--- a/arm9/lib/include/OS_init.h
+++ b/arm9/lib/include/OS_init.h
@@ -26,6 +26,6 @@
#include "OS_reset.h"
#include "OS_spinLock.h"
-void OS_Init();
+void OS_Init(void);
#endif //POKEDIAMOND_OS_INIT_H
diff --git a/arm9/lib/include/OS_interrupt.h b/arm9/lib/include/OS_interrupt.h
index 21ae8079..cbdc225f 100644
--- a/arm9/lib/include/OS_interrupt.h
+++ b/arm9/lib/include/OS_interrupt.h
@@ -21,7 +21,7 @@ typedef u32 OSIrqMask;
extern OSIrqFunction OS_IRQTable[];
extern OSIrqCallbackInfo OSi_IrqCallbackInfo[8];
-void OS_InitIrqTable();
+void OS_InitIrqTable(void);
void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function);
OSIrqFunction OS_GetIrqFunction(OSIrqMask intrBit);
void OSi_EnterDmaCallback(u32 dmaNo, void (*callback) (void *), void *arg);
diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h
index 6ce585dc..f71c6f98 100644
--- a/arm9/lib/include/OS_system.h
+++ b/arm9/lib/include/OS_system.h
@@ -26,15 +26,15 @@ typedef enum {
} OSIntrMode;
ENUMS_ALWAYS_INT_RESET
-OSIntrMode OS_EnableInterrupts();
-OSIntrMode OS_DisableInterrupts();
+OSIntrMode OS_EnableInterrupts(void);
+OSIntrMode OS_DisableInterrupts(void);
OSIntrMode OS_RestoreInterrupts(OSIntrMode state);
-OSIntrMode OS_DisableInterrupts_IrqAndFiq();
+OSIntrMode OS_DisableInterrupts_IrqAndFiq(void);
OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state);
-OSIntrMode OS_GetCpsrIrq();
-OSProcMode OS_GetProcMode();
-void OS_SpinWait();
-void OS_WaitVBlankIntr();
+OSIntrMode OS_GetCpsrIrq(void);
+OSProcMode OS_GetProcMode(void);
+void OS_SpinWait(void);
+void OS_WaitVBlankIntr(void);
void OS_WaitIrq(BOOL, u32);
#endif //POKEDIAMOND_OS_SYSTEM_H
diff --git a/arm9/lib/include/OS_tcm.h b/arm9/lib/include/OS_tcm.h
index 7112ca0e..66f8ec59 100644
--- a/arm9/lib/include/OS_tcm.h
+++ b/arm9/lib/include/OS_tcm.h
@@ -7,6 +7,6 @@
#include "consts.h"
-u32 OS_GetDTCMAddress();
+u32 OS_GetDTCMAddress(void);
#endif //POKEDIAMOND_OS_TCM_H
diff --git a/arm9/lib/include/OS_terminate_proc.h b/arm9/lib/include/OS_terminate_proc.h
index 26741e5d..d1abe3ad 100644
--- a/arm9/lib/include/OS_terminate_proc.h
+++ b/arm9/lib/include/OS_terminate_proc.h
@@ -5,7 +5,7 @@
#ifndef POKEDIAMOND_OS_TERMINATE_PROC_H
#define POKEDIAMOND_OS_TERMINATE_PROC_H
-void OS_Terminate();
-void OS_Halt();
+void OS_Terminate(void);
+void OS_Halt(void);
#endif //POKEDIAMOND_OS_TERMINATE_PROC_H
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:
diff --git a/arm9/lib/src/OS_emulator.c b/arm9/lib/src/OS_emulator.c
index c138b2bc..e92a7d9d 100644
--- a/arm9/lib/src/OS_emulator.c
+++ b/arm9/lib/src/OS_emulator.c
@@ -5,13 +5,13 @@
#include "OS_emulator.h"
#include "function_target.h"
-u32 OSi_ConsoleTypeCache = -1u; //todo fix bss
+u32 OSi_ConsoleTypeCache = -1u;
-ARM_FUNC BOOL OS_IsRunOnEmulator() {
+ARM_FUNC BOOL OS_IsRunOnEmulator(void) {
return FALSE;
}
-ARM_FUNC u32 OS_GetConsoleType() {
+ARM_FUNC u32 OS_GetConsoleType(void) {
OSi_ConsoleTypeCache = OS_CONSOLE_NITRO | OS_CONSOLE_DEV_CARD | OS_CONSOLE_SIZE_4MB;
return OSi_ConsoleTypeCache;
diff --git a/arm9/lib/src/OS_init.c b/arm9/lib/src/OS_init.c
index a34196f4..e1c7e63a 100644
--- a/arm9/lib/src/OS_init.c
+++ b/arm9/lib/src/OS_init.c
@@ -5,15 +5,15 @@
#include "function_target.h"
#include "OS_init.h"
-extern void PXI_Init();
-extern void OS_InitException();
-extern void MI_Init();
-extern void OS_InitVAlarm();
-extern void OSi_InitVramExclusive();
-extern void OS_InitThread();
-extern void CTRDG_Init();
-extern void CARD_Init();
-extern void PM_Init();
+extern void PXI_Init(void);
+extern void OS_InitException(void);
+extern void MI_Init(void);
+extern void OS_InitVAlarm(void);
+extern void OSi_InitVramExclusive(void);
+extern void OS_InitThread(void);
+extern void CTRDG_Init(void);
+extern void CARD_Init(void);
+extern void PM_Init(void);
ARM_FUNC void OS_Init(void) {
OS_InitArena();
diff --git a/arm9/lib/src/OS_interrupt.c b/arm9/lib/src/OS_interrupt.c
index 76deb069..4692fd54 100644
--- a/arm9/lib/src/OS_interrupt.c
+++ b/arm9/lib/src/OS_interrupt.c
@@ -11,7 +11,7 @@
extern OSThreadQueue OSi_IrqThreadQueue;
-ARM_FUNC void OS_InitIrqTable() {
+ARM_FUNC void OS_InitIrqTable(void) {
OS_InitThreadQueue(&OSi_IrqThreadQueue);
}
diff --git a/arm9/lib/src/OS_system.c b/arm9/lib/src/OS_system.c
index 5379433b..1d257679 100644
--- a/arm9/lib/src/OS_system.c
+++ b/arm9/lib/src/OS_system.c
@@ -5,7 +5,7 @@
#include "OS_system.h"
#include "syscall.h"
-ARM_FUNC asm OSIntrMode OS_EnableInterrupts() {
+ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) {
mrs r0, cpsr
bic r1, r0, #HW_PSR_DISABLE_IRQ
msr cpsr_c, r1
@@ -13,7 +13,7 @@ ARM_FUNC asm OSIntrMode OS_EnableInterrupts() {
bx lr
}
-ARM_FUNC asm OSIntrMode OS_DisableInterrupts() {
+ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) {
mrs r0, cpsr
orr r1, r0, #HW_PSR_DISABLE_IRQ
msr cpsr_c, r1
@@ -30,7 +30,7 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) {
bx lr
}
-ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq() {
+ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) {
mrs r0, cpsr
orr r1, r0, #HW_PSR_DISABLE_IRQ_FIQ
msr cpsr_c, r1
@@ -47,25 +47,25 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) {
bx lr
}
-ARM_FUNC asm OSIntrMode OS_GetCpsrIrq() {
+ARM_FUNC asm OSIntrMode OS_GetCpsrIrq(void) {
mrs r0, cpsr
and r0, r0, #HW_PSR_DISABLE_IRQ
bx lr
}
-ARM_FUNC asm OSProcMode OS_GetProcMode() {
+ARM_FUNC asm OSProcMode OS_GetProcMode(void) {
mrs r0, cpsr
and r0, r0, #HW_PSR_CPU_MODE_MASK
bx lr
}
-ARM_FUNC asm void OS_SpinWait() {
+ARM_FUNC asm void OS_SpinWait(void) {
subs r0, r0, #0x4
bhs OS_SpinWait
bx lr
}
-ARM_FUNC void OS_WaitVBlankIntr() {
+ARM_FUNC void OS_WaitVBlankIntr(void) {
SVC_WaitByLoop(0x1);
OS_WaitIrq(TRUE, OS_IE_V_BLANK);
}
diff --git a/arm9/lib/src/OS_tcm.c b/arm9/lib/src/OS_tcm.c
index 5a168c58..fa06e345 100644
--- a/arm9/lib/src/OS_tcm.c
+++ b/arm9/lib/src/OS_tcm.c
@@ -5,7 +5,7 @@
#include "OS_tcm.h"
#include "function_target.h"
-ARM_FUNC asm u32 OS_GetDTCMAddress() {
+ARM_FUNC asm u32 OS_GetDTCMAddress(void) {
mrc p15, 0x0, r0, c9, c1, 0x0
ldr r1, =OSi_TCM_REGION_BASE_MASK
and r0, r0, r1
diff --git a/arm9/lib/src/OS_terminate_proc.c b/arm9/lib/src/OS_terminate_proc.c
index eb267c6b..40b015d9 100644
--- a/arm9/lib/src/OS_terminate_proc.c
+++ b/arm9/lib/src/OS_terminate_proc.c
@@ -7,14 +7,14 @@
#include "function_target.h"
#include "OS_system.h"
-ARM_FUNC void OS_Terminate() {
+ARM_FUNC void OS_Terminate(void) {
while (TRUE) {
(void)OS_DisableInterrupts();
OS_Halt();
}
}
-ARM_FUNC asm void OS_Halt() {
+ARM_FUNC asm void OS_Halt(void) {
mov r0, #0x0
mcr p15, 0x0, r0, c7, c0, 0x4
bx lr
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 06:43:22 +0000