From 07f5d61d46874a88796614d15517de3e3f1f0410 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 6 May 2020 16:46:28 +0100 Subject: match OS_reset.c --- arm9/lib/include/consts.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arm9/lib/include/consts.h') diff --git a/arm9/lib/include/consts.h b/arm9/lib/include/consts.h index 0e5066de..c37d6269 100644 --- a/arm9/lib/include/consts.h +++ b/arm9/lib/include/consts.h @@ -48,6 +48,8 @@ #define HW_C6_PR_2GB 0x3c #define HW_C6_PR_4GB 0x3e +#define PXI_PROC_ARM7 0x01 + #define OSi_CONSOLE_NOT_DETECT 0xffffffff #define OS_CONSOLE_NITRO 0x80000000 -- cgit v1.2.3 From 1aa4ae38b610ec5f7527444b9b0386334333679b Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 6 May 2020 20:56:25 +0100 Subject: registers --- arm9/lib/include/consts.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'arm9/lib/include/consts.h') diff --git a/arm9/lib/include/consts.h b/arm9/lib/include/consts.h index c37d6269..b99b4148 100644 --- a/arm9/lib/include/consts.h +++ b/arm9/lib/include/consts.h @@ -6,6 +6,7 @@ #define POKEDIAMOND_CONSTS_H #include "mmap.h" +#include "registers.h" #define HW_PSR_CPU_MODE_MASK 0x1f // CPU mode @@ -13,19 +14,6 @@ #define HW_PSR_DISABLE_IRQ 0x80 // Disable IRQ #define HW_PSR_DISABLE_IRQ_FIQ 0xc0 // Disable FIQ and IRQ -#define HW_REG_BASE 0x04000000 -#define REG_VCOUNT_OFFSET 0x006 -#define REG_VCOUNT_ADDR (HW_REG_BASE + REG_VCOUNT_OFFSET) -#define reg_GX_VCOUNT (*(REGType16v *)REG_VCOUNT_ADDR) - -#define REG_KEYINPUT_OFFSET 0x130 -#define REG_KEYINPUT_ADDR (HW_REG_BASE + REG_KEYINPUT_OFFSET) -#define reg_PAD_KEYINPUT (*(REGType16v *)REG_KEYINPUT_ADDR) - -#define REG_GXSTAT_OFFSET 0x600 -#define REG_GXSTAT_ADDR (HW_REG_BASE + REG_GXSTAT_OFFSET) -#define reg_G3X_GXSTAT (*(REGType32v *)REG_GXSTAT_ADDR) - #define HW_C6_PR_4KB 0x16 #define HW_C6_PR_8KB 0x18 #define HW_C6_PR_16KB 0x1a -- cgit v1.2.3