ApacheThunder/NTR_Launcher
1
Fork 0
mirror of https://github.com/ApacheThunder/NTR_Launcher.git synced 2025-06-19 03:25:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from lifehackerhansol/hotfix2

Browse Source 
Fix compilation error with latest devkitARM
This commit is contained in:
ApacheThunder 2021-07-11 17:46:22 -05:00 committed by GitHub
commit b8c2decfdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,6 +1,7 @@
*.exe
*.cia
*.nds
*.app
*.o
*.arm7
Thumbs.db
@ -15,4 +16,5 @@ arm9/data/load.bin
BootLoader/build
BootLoader/load.bin
arm9/source/version.h
desktop.ini
desktop.ini
data

4
BootLoader/source/common.h
View File

@ -25,14 +25,14 @@
#define resetCpu() \
__asm volatile("swi 0x000000")
enum { ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
typedef enum { ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
// initCard error codes:
ERR_LOAD_NORM=0x11, ERR_LOAD_OTHR=0x12, ERR_SEC_NORM=0x13, ERR_SEC_OTHR=0x14, ERR_LOGO_CRC=0x15, ERR_HEAD_CRC=0x16,
// hookARM7Binary error codes:
ERR_NOCHEAT=0x21, ERR_HOOK=0x22,
} ERROR_CODES;
enum {ARM9_BOOT, ARM9_START, ARM9_MEMCLR, ARM9_READY, ARM9_BOOTBIN, ARM9_DISPERR, ARM9_SETSCFG} ARM9_STATE;
typedef enum {ARM9_BOOT, ARM9_START, ARM9_MEMCLR, ARM9_READY, ARM9_BOOTBIN, ARM9_DISPERR, ARM9_SETSCFG} ARM9_STATE;
extern tNDSHeader* ndsHeader;
extern bool arm9_dsiModeConfirmed;

6
BootLoaderAlt/source/common.h
View File

@ -26,7 +26,7 @@
#define resetCpu() \
__asm volatile("swi 0x000000")
enum { ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
typedef enum { ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
// initCard error codes:
ERR_LOAD_NORM=0x11, ERR_LOAD_OTHR=0x12, ERR_SEC_NORM=0x13, ERR_SEC_OTHR=0x14, ERR_LOGO_CRC=0x15, ERR_HEAD_CRC=0x16,
// hookARM7Binary error codes:
@ -34,7 +34,7 @@ enum { ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_
} ERROR_CODES;
// Values fixed so they can be shared with ASM code
enum {
typedef enum {
ARM9_BOOT = 0,
ARM9_START = 1,
ARM9_RESET = 2,
@ -42,7 +42,7 @@ enum {
ARM9_MEMCLR = 4
} ARM9_STATE;
enum {
typedef enum {
ARM7_BOOT = 0,
ARM7_START = 1,
ARM7_RESET = 2,