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/include | |
| parent | 8ce183851366b01c1bda5b2272f95e27ae7ef2fd (diff) | |
| parent | 30c442497e7e2d8eb5cb6b318b0888dcb64f5977 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/include')
| -rw-r--r-- | arm9/lib/include/MI_dma.h | 8 | ||||
| -rw-r--r-- | arm9/lib/include/OS_spinLock.h | 13 | ||||
| -rw-r--r-- | arm9/lib/include/mmap.h | 1 | ||||
| -rw-r--r-- | arm9/lib/include/syscall.h | 6 |
4 files changed, 12 insertions, 16 deletions
diff --git a/arm9/lib/include/MI_dma.h b/arm9/lib/include/MI_dma.h index eddcedbb..15dc2c06 100644 --- a/arm9/lib/include/MI_dma.h +++ b/arm9/lib/include/MI_dma.h @@ -1,6 +1,8 @@ -#ifndef NITRO_MI_DMA_H_ -#define NITRO_MI_DMA_H_ +#ifndef POKEDIAMOND_ARM9_MI_DMA_H +#define POKEDIAMOND_ARM9_MI_DMA_H + +#include "nitro/MI_dma_shared.h" typedef void (*MIDmaCallback)(void *); -#endif //NITRO_MI_DMA_H_ +#endif //POKEDIAMOND_ARM9_MI_DMA_H 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 diff --git a/arm9/lib/include/mmap.h b/arm9/lib/include/mmap.h index 6a5f23c5..5967695c 100644 --- a/arm9/lib/include/mmap.h +++ b/arm9/lib/include/mmap.h @@ -49,7 +49,6 @@ extern u32 SDK_AUTOLOAD_DTCM_START[]; #define HW_LOCK_ID_FLAG_MAIN (HW_MAIN_MEM + 0x007fffb0) #define HW_SHARED_LOCK_BUF (HW_MAIN_MEM + 0x007fffc0) #define HW_CARD_LOCK_BUF (HW_MAIN_MEM + 0x007fffe0) -#define HW_CTRDG_LOCK_BUF (HW_MAIN_MEM + 0x007fffe8) #define HW_BUTTON_XY_BUF (HW_MAIN_MEM + 0x007fffa8) diff --git a/arm9/lib/include/syscall.h b/arm9/lib/include/syscall.h index 8561cabe..427134a7 100644 --- a/arm9/lib/include/syscall.h +++ b/arm9/lib/include/syscall.h @@ -1,6 +1,6 @@ -#ifndef NITRO_SYSCALL_H_ -#define NITRO_SYSCALL_H_ +#ifndef POKEDIAMOND_ARM9_SYSCALL_H +#define POKEDIAMOND_ARM9_SYSCALL_H void SVC_WaitByLoop(u32 ct); -#endif //NITRO_SYSCALL_H_ +#endif //POKEDIAMOND_ARM9_SYSCALL_H |