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 /include | |
| parent | 8ce183851366b01c1bda5b2272f95e27ae7ef2fd (diff) | |
| parent | 30c442497e7e2d8eb5cb6b318b0888dcb64f5977 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'include')
| -rw-r--r-- | include/nitro/MI_dma_shared.h (renamed from include/nitro/dma.h) | 16 | ||||
| -rw-r--r-- | include/nitro/OS_spinLock_shared.h | 24 | ||||
| -rw-r--r-- | include/nitro/mmap_shared.h | 2 |
3 files changed, 40 insertions, 2 deletions
diff --git a/include/nitro/dma.h b/include/nitro/MI_dma_shared.h index 32944cb3..e839417a 100644 --- a/include/nitro/dma.h +++ b/include/nitro/MI_dma_shared.h @@ -1,5 +1,17 @@ -#ifndef GUARD_DMA_H -#define GUARD_DMA_H +/* + * NOTE: + * This file is shared between ARM9 and ARM7 + * DO NOT PUT PROC SPECIFIC CODE IN HERE + * Thank You! + */ + +/* + * DO NOT INCLUDE THIS FILE DIRECTLY + * Include MI_dma.h from the specific proc's lib + */ + +#ifndef GUARD_DMA_SHARED_H +#define GUARD_DMA_SHARED_H #define REG_ADDR_DMA0SAD 0x040000b0 diff --git a/include/nitro/OS_spinLock_shared.h b/include/nitro/OS_spinLock_shared.h new file mode 100644 index 00000000..31f0be32 --- /dev/null +++ b/include/nitro/OS_spinLock_shared.h @@ -0,0 +1,24 @@ +/* + * NOTE: + * This file is shared between ARM9 and ARM7 + * DO NOT PUT PROC SPECIFIC CODE IN HERE + * Thank You! + */ + +/* + * DO NOT INCLUDE THIS FILE DIRECTLY + * Include OS_spinLock.h from the specific proc's lib + */ + +#ifndef POKEDIAMOND_OS_SPINLOCK_SHARED_H +#define POKEDIAMOND_OS_SPINLOCK_SHARED_H + +#include "nitro/types.h" + +typedef volatile struct OSLockWord { + u32 lockFlag; + u16 ownerID; + u16 extension; +} OSLockWord; + +#endif //POKEDIAMOND_OS_SPINLOCK_SHARED_H diff --git a/include/nitro/mmap_shared.h b/include/nitro/mmap_shared.h index 587887bb..f7ba4fb4 100644 --- a/include/nitro/mmap_shared.h +++ b/include/nitro/mmap_shared.h @@ -20,6 +20,8 @@ #define HW_WM_BOOT_BUF (HW_MAIN_MEM + 0x007ffc40) #define HW_ARENA_INFO_BUF (HW_MAIN_MEM + 0x007ffda0) +#define HW_CTRDG_LOCK_BUF (HW_MAIN_MEM + 0x007fffe8) +#define HW_INIT_LOCK_BUF (HW_MAIN_MEM + 0x007ffff0) #define HW_MAIN_MEM_MAIN_END (HW_MAIN_MEM + HW_MAIN_MEM_MAIN_SIZE) #endif //POKEDIAMOND_MMAP_SHARED_H |