diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-06-12 14:39:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 14:39:00 -0400 |
| commit | 09514ee0e6982c61d884682b4b747a4383f0d1b8 (patch) | |
| tree | fe67fb209023d19114ca07efa71f1846dd030911 /arm9/lib/include/OS_reset.h | |
| parent | 2d8d454dfe8691f4cd1077c50ab6f3c286c28ce1 (diff) | |
| parent | c4263506fa96acc210d1cf356023a3ffde805a0b (diff) | |
Merge branch 'master' into pikalax_work
Diffstat (limited to 'arm9/lib/include/OS_reset.h')
| -rw-r--r-- | arm9/lib/include/OS_reset.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/arm9/lib/include/OS_reset.h b/arm9/lib/include/OS_reset.h index cb7680d1..ef62184b 100644 --- a/arm9/lib/include/OS_reset.h +++ b/arm9/lib/include/OS_reset.h @@ -1,17 +1,10 @@ -// -// Created by red031000 on 2020-05-06. -// - -#ifndef POKEDIAMOND_OS_RESET_H -#define POKEDIAMOND_OS_RESET_H +#ifndef POKEDIAMOND_ARM9_OS_RESET_H +#define POKEDIAMOND_ARM9_OS_RESET_H #include "consts.h" +#include "nitro/OS_reset_shared.h" #include "PXI_fifo.h" -#define OS_PXI_COMMAND_MASK 0x7f00 -#define OS_PXI_COMMAND_SHIFT 8 -#define OS_PXI_COMMAND_RESET 0x10 - void OS_InitReset(void); static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err); static void OSi_SendToPxi(u16 data); @@ -27,4 +20,4 @@ static inline u32 OS_GetResetParameter(void) return (u32)*(u32 *)HW_RESET_PARAMETER_BUF; } -#endif //POKEDIAMOND_OS_RESET_H +#endif //POKEDIAMOND_ARM9_OS_RESET_H |