From 7a7bce2bc77bf7886916787cb09f6d39704818c3 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 14 Jun 2020 17:32:24 +0100 Subject: arm7 OS_spinLock --- include/nitro/MI_dma_shared.h | 37 +++++++++++++++++++++++++++++++++++++ include/nitro/OS_spinLock_shared.h | 24 ++++++++++++++++++++++++ include/nitro/dma.h | 25 ------------------------- include/nitro/mmap_shared.h | 2 ++ 4 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 include/nitro/MI_dma_shared.h create mode 100644 include/nitro/OS_spinLock_shared.h delete mode 100644 include/nitro/dma.h (limited to 'include/nitro') diff --git a/include/nitro/MI_dma_shared.h b/include/nitro/MI_dma_shared.h new file mode 100644 index 00000000..e839417a --- /dev/null +++ b/include/nitro/MI_dma_shared.h @@ -0,0 +1,37 @@ +/* + * 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 + +#define DMA_DEST_INC 0x0000 +#define DMA_DEST_DEC 0x0020 +#define DMA_DEST_FIXED 0x0040 +#define DMA_DEST_RELOAD 0x0060 +#define DMA_SRC_INC 0x0000 +#define DMA_SRC_DEC 0x0080 +#define DMA_SRC_FIXED 0x0100 +#define DMA_REPEAT 0x0200 +#define DMA_16BIT 0x0000 +#define DMA_32BIT 0x0400 +#define DMA_DREQ_ON 0x0800 +#define DMA_START_NOW 0x0000 +#define DMA_START_VBLANK 0x1000 +#define DMA_START_HBLANK 0x2000 +#define DMA_START_SPECIAL 0x3000 +#define DMA_START_MASK 0x3000 +#define DMA_INTR_ENABLE 0x4000 +#define DMA_ENABLE 0x8000 + +#endif 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/dma.h b/include/nitro/dma.h deleted file mode 100644 index 32944cb3..00000000 --- a/include/nitro/dma.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef GUARD_DMA_H -#define GUARD_DMA_H - -#define REG_ADDR_DMA0SAD 0x040000b0 - -#define DMA_DEST_INC 0x0000 -#define DMA_DEST_DEC 0x0020 -#define DMA_DEST_FIXED 0x0040 -#define DMA_DEST_RELOAD 0x0060 -#define DMA_SRC_INC 0x0000 -#define DMA_SRC_DEC 0x0080 -#define DMA_SRC_FIXED 0x0100 -#define DMA_REPEAT 0x0200 -#define DMA_16BIT 0x0000 -#define DMA_32BIT 0x0400 -#define DMA_DREQ_ON 0x0800 -#define DMA_START_NOW 0x0000 -#define DMA_START_VBLANK 0x1000 -#define DMA_START_HBLANK 0x2000 -#define DMA_START_SPECIAL 0x3000 -#define DMA_START_MASK 0x3000 -#define DMA_INTR_ENABLE 0x4000 -#define DMA_ENABLE 0x8000 - -#endif 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 -- cgit v1.2.3