ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweak boot from card flag

This commit is contained in:
zeromus 2010-04-04 07:28:00 +00:00
parent 4c5e700318
commit 796364c337
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/MMU.cpp
View File

@ -985,10 +985,6 @@ void MMU_Reset()
MMU_timing.arm9dataFetch.Reset();
MMU_timing.arm9codeCache.Reset();
MMU_timing.arm9dataCache.Reset();
// Booted from card -- EXTREMELY IMPORTANT!!! Thanks to cReDiAr
MMU_write8(0,0x027ffc40,0x1);
MMU_write8(1,0x027ffc40,0x1);
}
void MMU_setRom(u8 * rom, u32 mask)

18
desmume/src/NDSSystem.cpp
View File

@ -1679,7 +1679,7 @@ bool nds_loadstate(EMUFILE* is, int size)
//#define LOG_ARM9
//#define LOG_ARM7
//bool dolog = true;
//bool dolog = false;
FORCEINLINE void arm9log()
{
@ -2147,8 +2147,8 @@ void NDS_Reset()
armcpu_init(&NDS_ARM7, header->ARM7exe);
armcpu_init(&NDS_ARM9, header->ARM9exe);
_MMU_write08<ARMCPU_ARM9>(0x04000300, 1);
_MMU_write08<ARMCPU_ARM7>(0x04000300, 1);
_MMU_write08<ARMCPU_ARM9>(REG_POSTFLG, 1);
_MMU_write08<ARMCPU_ARM7>(REG_POSTFLG, 1);
}
//bitbox 4k demo is so stripped down it relies on default stack values
//otherwise the arm7 will crash before making a sound
@ -2176,12 +2176,9 @@ void NDS_Reset()
nds.ensataIpcSyncCounter = 0;
SetupMMU(nds.debugConsole);
_MMU_write16<ARMCPU_ARM9>(0x04000130, 0x3FF);
_MMU_write16<ARMCPU_ARM7>(0x04000130, 0x3FF);
_MMU_write08<ARMCPU_ARM7>(0x04000136, 0x43);
//picross polls this value when it boots. firmware sets it.
//_MMU_write16<ARMCPU_ARM9>(REG_POWCNT1, 0x20F);
_MMU_write16<ARMCPU_ARM9>(REG_KEYINPUT, 0x3FF);
_MMU_write16<ARMCPU_ARM7>(REG_KEYINPUT, 0x3FF);
_MMU_write08<ARMCPU_ARM7>(REG_EXTKEYIN, 0x43);
LidClosed = FALSE;
countLid = 0;
@ -2242,6 +2239,9 @@ void NDS_Reset()
_MMU_write32<ARMCPU_ARM7>(0x27FFE34, firmware->ARM7bootAddr);
}
// make system think it's booted from card -- EXTREMELY IMPORTANT!!! Thanks to cReDiAr
_MMU_write08<ARMCPU_ARM9>(0x02FFFC40,0x1);
_MMU_write08<ARMCPU_ARM9>(0x02FFFC40,0x1);
// Save touchscreen calibration info in a structure
// so we can easily access it at any time