diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-07-14 08:31:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 08:31:45 +0300 |
| commit | e62dcb7dc070fab232b124510938473cc35a2e78 (patch) | |
| tree | e559d4ac0279f78b740b443a8c3936138dbfd226 /arm7/lib/src | |
| parent | 6ebca13d4c5a290e239364f90bf137c12f332a13 (diff) | |
| parent | d2ff9e5df70f2c6be6a0c822ba2e689f82911911 (diff) | |
Merge pull request #233 from red031000/master
palette padding changes + OS_timer
Diffstat (limited to 'arm7/lib/src')
| -rw-r--r-- | arm7/lib/src/OS_init.c | 3 | ||||
| -rw-r--r-- | arm7/lib/src/OS_tick.c | 2 | ||||
| -rw-r--r-- | arm7/lib/src/OS_timer.c | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/arm7/lib/src/OS_init.c b/arm7/lib/src/OS_init.c index 271d067b..d465aa9a 100644 --- a/arm7/lib/src/OS_init.c +++ b/arm7/lib/src/OS_init.c @@ -2,9 +2,8 @@ #include "OS_init.h" extern void PXI_Init(void); -extern void OS_InitTick(void); -extern void OS_InitAlarm(void); extern void OS_InitThread(void); +extern void OS_InitAlarm(void); extern void CTRDG_Init(void); ARM_FUNC void OS_Init(void) diff --git a/arm7/lib/src/OS_tick.c b/arm7/lib/src/OS_tick.c index e45b6833..bc42a54f 100644 --- a/arm7/lib/src/OS_tick.c +++ b/arm7/lib/src/OS_tick.c @@ -4,8 +4,6 @@ #include "OS_timer.h" #include "function_target.h" -extern void OSi_SetTimerReserved(u32); - static u16 OSi_UseTick; static OSTick OSi_TickCounter; static BOOL OSi_NeedResetTimer; diff --git a/arm7/lib/src/OS_timer.c b/arm7/lib/src/OS_timer.c new file mode 100644 index 00000000..69a1a6cd --- /dev/null +++ b/arm7/lib/src/OS_timer.c @@ -0,0 +1,9 @@ +#include "OS_timer.h" +#include "function_target.h" + +static u16 OSi_TimerReserved = 0; + +ARM_FUNC void OSi_SetTimerReserved(s32 timerNum) +{ + OSi_TimerReserved |= (1 << timerNum); +} |