diff options
Diffstat (limited to 'arm9/lib/include')
| -rw-r--r-- | arm9/lib/include/OS_interrupt.h | 9 | ||||
| -rw-r--r-- | arm9/lib/include/OS_reset.h | 15 | ||||
| -rw-r--r-- | arm9/lib/include/PXI_fifo.h | 35 | ||||
| -rw-r--r-- | arm9/lib/include/mmap.h | 1 |
4 files changed, 12 insertions, 48 deletions
diff --git a/arm9/lib/include/OS_interrupt.h b/arm9/lib/include/OS_interrupt.h index 6ffa3a10..ec58a636 100644 --- a/arm9/lib/include/OS_interrupt.h +++ b/arm9/lib/include/OS_interrupt.h @@ -1,7 +1,8 @@ -#ifndef POKEDIAMOND_OS_INTERRUPT_H -#define POKEDIAMOND_OS_INTERRUPT_H +#ifndef POKEDIAMOND_ARM9_OS_INTERRUPT_H +#define POKEDIAMOND_ARM9_OS_INTERRUPT_H #include "nitro/types.h" +#include "nitro/OS_interrupt_shared.h" typedef void (*OSIrqFunction) (void); @@ -12,8 +13,6 @@ typedef struct void* arg; } OSIrqCallbackInfo; -typedef u32 OSIrqMask; - extern OSIrqFunction OS_IRQTable[]; extern OSIrqCallbackInfo OSi_IrqCallbackInfo[8]; @@ -28,4 +27,4 @@ OSIrqMask OS_DisableIrqMask(OSIrqMask mask); OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask); void OS_SetIrqStackChecker(void); -#endif //POKEDIAMOND_OS_INTERRUPT_H +#endif //POKEDIAMOND_ARM9_OS_INTERRUPT_H diff --git a/arm9/lib/include/OS_reset.h b/arm9/lib/include/OS_reset.h index cb7680d1..ef62184b 100644 --- a/arm9/lib/include/OS_reset.h +++ b/arm9/lib/include/OS_reset.h @@ -1,17 +1,10 @@ -// -// Created by red031000 on 2020-05-06. -// - -#ifndef POKEDIAMOND_OS_RESET_H -#define POKEDIAMOND_OS_RESET_H +#ifndef POKEDIAMOND_ARM9_OS_RESET_H +#define POKEDIAMOND_ARM9_OS_RESET_H #include "consts.h" +#include "nitro/OS_reset_shared.h" #include "PXI_fifo.h" -#define OS_PXI_COMMAND_MASK 0x7f00 -#define OS_PXI_COMMAND_SHIFT 8 -#define OS_PXI_COMMAND_RESET 0x10 - void OS_InitReset(void); static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err); static void OSi_SendToPxi(u16 data); @@ -27,4 +20,4 @@ static inline u32 OS_GetResetParameter(void) return (u32)*(u32 *)HW_RESET_PARAMETER_BUF; } -#endif //POKEDIAMOND_OS_RESET_H +#endif //POKEDIAMOND_ARM9_OS_RESET_H diff --git a/arm9/lib/include/PXI_fifo.h b/arm9/lib/include/PXI_fifo.h index 1d45dda2..45caa906 100644 --- a/arm9/lib/include/PXI_fifo.h +++ b/arm9/lib/include/PXI_fifo.h @@ -1,33 +1,6 @@ -// -// Created by red031000 on 2020-05-06. -// +#ifndef POKEDIAMOND_ARM9_PXI_FIFO_H +#define POKEDIAMOND_ARM9_PXI_FIFO_H -#ifndef POKEDIAMOND_PXI_FIFO_H -#define POKEDIAMOND_PXI_FIFO_H +#include "nitro/PXI_fifo_shared.h" -#include "function_target.h" - -ENUMS_ALWAYS_INT_ON -typedef enum { - PXI_FIFO_TAG_EX = 0, // Extension format - PXI_FIFO_TAG_USER_0, // for application programmer, use it in free - PXI_FIFO_TAG_USER_1, // for application programmer, use it in free - PXI_FIFO_TAG_SYSTEM, // SDK inner usage - PXI_FIFO_TAG_NVRAM, // NVRAM - PXI_FIFO_TAG_RTC, // RTC - PXI_FIFO_TAG_TOUCHPANEL, // Touch Panel - PXI_FIFO_TAG_SOUND, // Sound - PXI_FIFO_TAG_PM, // Power Management - PXI_FIFO_TAG_MIC, // Microphone - PXI_FIFO_TAG_WM, // Wireless Manager - PXI_FIFO_TAG_FS, // File System - PXI_FIFO_TAG_OS, // OS - PXI_FIFO_TAG_CTRDG, // Cartridge - PXI_FIFO_TAG_CARD, // Card - PXI_FIFO_TAG_WVR, // Control driving wireless library - PXI_FIFO_TAG_CTRDG_Ex, // Cartridge Ex - PXI_MAX_FIFO_TAG = 32 // MAX FIFO TAG -} PXIFifoTag; -ENUMS_ALWAYS_INT_RESET - -#endif //POKEDIAMOND_PXI_FIFO_H +#endif //POKEDIAMOND_ARM9_PXI_FIFO_H diff --git a/arm9/lib/include/mmap.h b/arm9/lib/include/mmap.h index d0e73aec..6a5f23c5 100644 --- a/arm9/lib/include/mmap.h +++ b/arm9/lib/include/mmap.h @@ -27,7 +27,6 @@ extern u32 SDK_AUTOLOAD_DTCM_START[]; #define HW_RESET_PARAMETER_BUF (HW_MAIN_MEM + 0x007ffc20) #define HW_ROM_BASE_OFFSET_BUF (HW_MAIN_MEM + 0x007ffc2c) -#define HW_WM_BOOT_BUF (HW_MAIN_MEM + 0x007ffc40) #define HW_ROM_HEADER_BUF (HW_MAIN_MEM + 0x007ffe00) // ROM registration area data buffer #define HW_RED_RESERVED (HW_MAIN_MEM + 0x007ff800) // Some kind of reserved data for shared memory #define HW_MAIN_MEM_SYSTEM (HW_MAIN_MEM + 0x007ffc00) |