summaryrefslogtreecommitdiff
path: root/arm9/lib/include
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/lib/include')
-rw-r--r--arm9/lib/include/OS_init.h3
-rw-r--r--arm9/lib/include/OS_timer.h9
2 files changed, 7 insertions, 5 deletions
diff --git a/arm9/lib/include/OS_init.h b/arm9/lib/include/OS_init.h
index 03ff26d2..7cf21709 100644
--- a/arm9/lib/include/OS_init.h
+++ b/arm9/lib/include/OS_init.h
@@ -6,6 +6,7 @@
#include "OS_tcm.h"
#include "OS_spinLock.h"
#include "OS_context.h"
+#include "OS_timer.h"
#include "OS_tick.h"
#include "OS_alarm.h"
#include "OS_mutex.h"
@@ -22,8 +23,6 @@
#include "OS_irqTable.h"
#include "OS_interrupt.h"
#include "OS_reset.h"
-#include "OS_spinLock.h"
-#include "OS_tick.h"
void OS_Init(void);
diff --git a/arm9/lib/include/OS_timer.h b/arm9/lib/include/OS_timer.h
index effa5fc0..4a10041b 100644
--- a/arm9/lib/include/OS_timer.h
+++ b/arm9/lib/include/OS_timer.h
@@ -1,6 +1,9 @@
-#ifndef POKEDIAMOND_OS_TIMER_H
-#define POKEDIAMOND_OS_TIMER_H
+#ifndef POKEDIAMOND_ARM9_OS_TIMER_H
+#define POKEDIAMOND_ARM9_OS_TIMER_H
#include "nitro/OS_timer_shared.h"
+#include "nitro/types.h"
-#endif //POKEDIAMOND_OS_TIMER_H
+void OSi_SetTimerReserved(s32 timerNum);
+
+#endif //POKEDIAMOND_ARM9_OS_TIMER_H