diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-21 08:11:17 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-21 08:11:17 -0400 |
commit | f78d404d3212f2148af5ca9974e4db6daec66e89 (patch) | |
tree | 51d0fb4bfea6d1471c3f71313284df1dd0b38e5c /arm9/lib/include | |
parent | 684cde0b321e955fdec5b86e125d9993ebb318c6 (diff) |
Merge ioreg_GX into registers; fix indentation
Diffstat (limited to 'arm9/lib/include')
-rw-r--r-- | arm9/lib/include/ioreg_GX.h | 32 | ||||
-rw-r--r-- | arm9/lib/include/registers.h | 28 | ||||
-rw-r--r-- | arm9/lib/include/tp.h | 4 |
3 files changed, 28 insertions, 36 deletions
diff --git a/arm9/lib/include/ioreg_GX.h b/arm9/lib/include/ioreg_GX.h deleted file mode 100644 index d6f7f448..00000000 --- a/arm9/lib/include/ioreg_GX.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef NITRO_IOREG_GX_H_ -#define NITRO_IOREG_GX_H_ - -#define REG_GX_POWCNT_GE_SHIFT 3 -#define REG_GX_POWCNT_GE_SIZE 1 -#define REG_GX_POWCNT_GE_MASK 0x0008 - -#define REG_GX_POWCNT_RE_SHIFT 2 -#define REG_GX_POWCNT_RE_SIZE 1 -#define REG_GX_POWCNT_RE_MASK 0x0004 - -#define REG_GX_POWCNT_E2DG_SHIFT 1 -#define REG_GX_POWCNT_E2DG_SIZE 1 -#define REG_GX_POWCNT_E2DG_MASK 0x0002 - -#define REG_GX_POWCNT_LCD_SHIFT 0 -#define REG_GX_POWCNT_LCD_SIZE 1 -#define REG_GX_POWCNT_LCD_MASK 0x0001 - -#define REG_GX_POWCNT_LCDB_SHIFT 8 -#define REG_GX_POWCNT_LCDB_SIZE 1 -#define REG_GX_POWCNT_LCDB_MASK 0x0100 - -#define REG_GX_POWCNT_E2DGB_SHIFT 9 -#define REG_GX_POWCNT_E2DGB_SIZE 1 -#define REG_GX_POWCNT_E2DGB_MASK 0x0200 - -#define REG_GX_POWCNT_DSEL_SHIFT 15 -#define REG_GX_POWCNT_DSEL_SIZE 1 -#define REG_GX_POWCNT_DSEL_MASK 0x8000 - -#endif //NITRO_IOREG_GX_H_ diff --git a/arm9/lib/include/registers.h b/arm9/lib/include/registers.h index b2915f8c..ae5b7adc 100644 --- a/arm9/lib/include/registers.h +++ b/arm9/lib/include/registers.h @@ -485,4 +485,32 @@ ((u32)(a) << REG_PAD_KEYCNT_A_SHIFT)) #endif +#define REG_GX_POWCNT_GE_SHIFT 3 +#define REG_GX_POWCNT_GE_SIZE 1 +#define REG_GX_POWCNT_GE_MASK 0x0008 + +#define REG_GX_POWCNT_RE_SHIFT 2 +#define REG_GX_POWCNT_RE_SIZE 1 +#define REG_GX_POWCNT_RE_MASK 0x0004 + +#define REG_GX_POWCNT_E2DG_SHIFT 1 +#define REG_GX_POWCNT_E2DG_SIZE 1 +#define REG_GX_POWCNT_E2DG_MASK 0x0002 + +#define REG_GX_POWCNT_LCD_SHIFT 0 +#define REG_GX_POWCNT_LCD_SIZE 1 +#define REG_GX_POWCNT_LCD_MASK 0x0001 + +#define REG_GX_POWCNT_LCDB_SHIFT 8 +#define REG_GX_POWCNT_LCDB_SIZE 1 +#define REG_GX_POWCNT_LCDB_MASK 0x0100 + +#define REG_GX_POWCNT_E2DGB_SHIFT 9 +#define REG_GX_POWCNT_E2DGB_SIZE 1 +#define REG_GX_POWCNT_E2DGB_MASK 0x0200 + +#define REG_GX_POWCNT_DSEL_SHIFT 15 +#define REG_GX_POWCNT_DSEL_SIZE 1 +#define REG_GX_POWCNT_DSEL_MASK 0x8000 + #endif //POKEDIAMOND_ARM9_REGISTERS_H diff --git a/arm9/lib/include/tp.h b/arm9/lib/include/tp.h index 6692863f..d2687545 100644 --- a/arm9/lib/include/tp.h +++ b/arm9/lib/include/tp.h @@ -1,7 +1,3 @@ -// -// Created by Scott Norton on 8/20/20. -// - #ifndef NITRO_TP_H_ #define NITRO_TP_H_ |