diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-14 17:10:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-14 17:10:02 -0400 |
| commit | 00beac9a26357014440295a095a06ad323bbf737 (patch) | |
| tree | 7b4b6c58edd2f86ec564e082659092989e7d9b0a /arm9/lib/src/OS_spinLock.c | |
| parent | 8ce183851366b01c1bda5b2272f95e27ae7ef2fd (diff) | |
| parent | 30c442497e7e2d8eb5cb6b318b0888dcb64f5977 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/OS_spinLock.c')
| -rw-r--r-- | arm9/lib/src/OS_spinLock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/lib/src/OS_spinLock.c b/arm9/lib/src/OS_spinLock.c index 5050a7bd..c0398be9 100644 --- a/arm9/lib/src/OS_spinLock.c +++ b/arm9/lib/src/OS_spinLock.c @@ -21,7 +21,7 @@ ARM_FUNC void OS_InitLock(void) } isInitialized = TRUE; - OSLockWord* lockp = (OSLockWord *)0x027FFFF0; + OSLockWord* lockp = (OSLockWord *)HW_INIT_LOCK_BUF; lockp->lockFlag = 0; @@ -45,7 +45,7 @@ ARM_FUNC void OS_InitLock(void) (void)OS_TryLockByWord(0x7f, lockp, NULL); } -ARM_FUNC s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void), //should be static +ARM_FUNC s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void), BOOL disableFiq) { s32 lastLockFlag; |