diff options
| author | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
|---|---|---|
| committer | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
| commit | abd2d1e16494867989e710e5235c6425fa4e8c34 (patch) | |
| tree | 7eff3e1db566801104a8fc2672bbe57e06f7009e /arm9/lib/include/OS_spinLock.h | |
| parent | 70556fc300ba85dad248d20b3c79c415e2ef88e5 (diff) | |
| parent | 12c17948602bf14535c91c530f214b99863e038e (diff) | |
conflicts
Diffstat (limited to 'arm9/lib/include/OS_spinLock.h')
| -rw-r--r-- | arm9/lib/include/OS_spinLock.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arm9/lib/include/OS_spinLock.h b/arm9/lib/include/OS_spinLock.h index 5dc47522..a5d27585 100644 --- a/arm9/lib/include/OS_spinLock.h +++ b/arm9/lib/include/OS_spinLock.h @@ -1,15 +1,10 @@ -#ifndef POKEDIAMOND_OS_SPINLOCK_H -#define POKEDIAMOND_OS_SPINLOCK_H +#ifndef POKEDIAMOND_ARM9_OS_SPINLOCK_H +#define POKEDIAMOND_ARM9_OS_SPINLOCK_H #include "nitro/types.h" +#include "nitro/OS_spinLock_shared.h" #include "syscall.h" -typedef volatile struct OSLockWord { - u32 lockFlag; - u16 ownerID; - u16 extension; -} OSLockWord; - static inline void OSi_WaitByLoop(void) { SVC_WaitByLoop(0x1000 / 4); @@ -38,4 +33,4 @@ s32 OS_UnLockCartridge(u16 lockID); s32 OS_GetLockID(void); void OS_ReleaseLockID(register u16 lockID); -#endif //POKEDIAMOND_OS_SPINLOCK_H +#endif //POKEDIAMOND_ARM9_OS_SPINLOCK_H |