-added two missing sd card inits in DML (fixed saving) and

in nand emu (fixes launching from sd card) (thanks CaseyOmah
for the information)
-added small welcome message in debug output ;)
This commit is contained in:
fix94.1 2012-02-18 15:29:22 +00:00
parent 9fcc0f4d35
commit ab07319073
2 changed files with 8 additions and 1 deletions

View File

@ -15,6 +15,8 @@
#include "wifi_gecko.h" #include "wifi_gecko.h"
#include "cios.hpp" #include "cios.hpp"
#include "nand.hpp" #include "nand.hpp"
#include "defines.h"
#include "svnrev.h"
extern "C" { extern void __exception_setreload(int t);} extern "C" { extern void __exception_setreload(int t);}
@ -27,6 +29,8 @@ int main(int argc, char **argv)
geckoinit = InitGecko(); geckoinit = InitGecko();
__exception_setreload(5); __exception_setreload(5);
gprintf("\nWelcome to %s %s r%s!\nThis is the debug output.\n", APP_NAME, APP_VERSION, SVN_REV);
SYS_SetArena1Hi(APPLOADER_START); SYS_SetArena1Hi(APPLOADER_START);
CVideo vid; CVideo vid;

View File

@ -620,9 +620,10 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool DML)
m_gcfg1.save(true); m_gcfg1.save(true);
m_cfg.save(true); m_cfg.save(true);
cleanup();
Close_Inputs(); Close_Inputs();
USBStorage_Deinit(); USBStorage_Deinit();
cleanup(); SDHC_Init();
//Tell DML to boot the game from sd card //Tell DML to boot the game from sd card
*(vu32*)0x80001800 = 0xB002D105; *(vu32*)0x80001800 = 0xB002D105;
@ -857,6 +858,8 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
cleanup(); cleanup();
Close_Inputs(); Close_Inputs();
USBStorage_Deinit(); USBStorage_Deinit();
if(currentPartition == 0 && !forwarder)
SDHC_Init();
if(forwarder) if(forwarder)
{ {