LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge branch 'master' into developer

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
TuxSH
2016-06-11 00:00:53 +02:00
parent ef60c8ea4c edfd63e1f7
commit 984c3e549c
25 changed files with 321 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
exceptions/arm11/source/mainHandler.c
View File

@@ -91,7 +91,7 @@ void __attribute__((noreturn)) mainHandler(u32 regs[REG_DUMP_SIZE / 4], u32 type
dumpHeader.totalSize = sizeof(ExceptionDumpHeader) + dumpHeader.registerDumpSize + dumpHeader.codeDumpSize + dumpHeader.stackDumpSize + dumpHeader.additionalDataSize;
*(ExceptionDumpHeader *)final = dumpHeader;
clearDCacheAndDMB();
mcuReboot();
mcuReboot(); //Also contains DCache-cleaning code
}

1
exceptions/arm9/source/mainHandler.c
View File

@@ -67,6 +67,7 @@ void __attribute__((noreturn)) mainHandler(u32 regs[REG_DUMP_SIZE / 4], u32 type
for(u32 i = 0; i < dumpHeader.stackDumpSize / 4; i++)
*final++ = sp[i];
((void (*)())0xFFFF0830)(); //Ensure that all memory transfers have completed and that the data cache has been flushed
i2cWriteRegister(I2C_DEV_MCU, 0x20, 1 << 2); //Reboot
while(1);
}