diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-07-22 21:54:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 21:54:07 +0300 |
| commit | 95d03abbfc10558d4a51f38d8131d47bbded6f8e (patch) | |
| tree | 45f35a52ea8ff6021fc06ba1bf4690a83ce1de2c /arm9/lib/include | |
| parent | 7cd7b320d3336bdfe57b0a9d12174e32b242c088 (diff) | |
| parent | 618a599c5bacc80d88c0d461ecb1efac7674dd7c (diff) | |
Merge pull request #242 from red031000/master
split mod05_021E1374 to mod05_02E1AD8 + arm9 OS_alarm
Diffstat (limited to 'arm9/lib/include')
| -rw-r--r-- | arm9/lib/include/OS_alarm.h | 14 | ||||
| -rw-r--r-- | arm9/lib/include/OS_interrupt.h | 1 | ||||
| -rw-r--r-- | arm9/lib/include/registers.h | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/arm9/lib/include/OS_alarm.h b/arm9/lib/include/OS_alarm.h index ebdf01ba..c8d0682d 100644 --- a/arm9/lib/include/OS_alarm.h +++ b/arm9/lib/include/OS_alarm.h @@ -6,8 +6,20 @@ #include "OS_tick.h" #include "nitro/OS_alarm_shared.h" -void OS_CancelAlarm(OSAlarm *alarm); +struct OSiAlarmQueue +{ + OSAlarm *head; + OSAlarm *tail; +}; + +static void OSi_SetTimer(OSAlarm *alarm); +void OS_InitAlarm(void); +BOOL OS_IsAlarmAvailable(void); void OS_CreateAlarm(OSAlarm *alarm); +static void OSi_InsertAlarm(OSAlarm *alarm, OSTick fire); void OS_SetAlarm(OSAlarm *alarm, OSTick tick, OSAlarmHandler handler, void *arg); +void OS_CancelAlarm(OSAlarm *alarm); +void OSi_AlarmHandler(void *arg); +static void OSi_ArrangeTimer(void); #endif //POKEDIAMOND_ARM9_OS_ALARM_H diff --git a/arm9/lib/include/OS_interrupt.h b/arm9/lib/include/OS_interrupt.h index a828c62e..d84cae00 100644 --- a/arm9/lib/include/OS_interrupt.h +++ b/arm9/lib/include/OS_interrupt.h @@ -5,6 +5,7 @@ #include "nitro/OS_interrupt_shared.h" #define OS_IE_TIMER0 (1UL << REG_OS_IE_T0_SHIFT) +#define OS_IE_TIMER1 (1UL << REG_OS_IE_T1_SHIFT) extern OSIrqFunction OS_IRQTable[]; extern OSIrqCallbackInfo OSi_IrqCallbackInfo[8]; diff --git a/arm9/lib/include/registers.h b/arm9/lib/include/registers.h index 75046308..37ca97e6 100644 --- a/arm9/lib/include/registers.h +++ b/arm9/lib/include/registers.h @@ -346,6 +346,7 @@ #define reg_CARD_DATA (*(REGType32v *)0x4100010) //? #define REG_OS_IE_T0_SHIFT 3 +#define REG_OS_IE_T1_SHIFT 4 #define REG_OS_TM0CNT_H_I_MASK 0x0040 #define REG_OS_TM0CNT_H_E_MASK 0x0080 |