From 1ad9bfbd16adfb3e5161a3605aea4f76a520c253 Mon Sep 17 00:00:00 2001 From: N1277 Date: Thu, 15 Jul 2010 09:18:27 +0000 Subject: [PATCH] =?UTF-8?q?CTR=E3=81=AE=E4=BA=92=E6=8F=9B=E3=83=A2?= =?UTF-8?q?=E3=83=BC=E3=83=89=E5=90=91=E3=81=91=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=81=A7=E3=81=AF=E5=B8=B8=E9=A7=90=E3=83=A2=E3=82=B8=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AE=E3=83=AD=E3=83=BC=E3=83=89=E3=81=A8?= =?UTF-8?q?=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=92=E8=A1=8C=E3=82=8F=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20100611_RedLauncher_Remodel@2933 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/buildtools/commondefs.sysmenu | 10 ++++++++++ build/libraries_sysmenu/sysmenu/ARM9/src/title.c | 4 ++++ build/systemMenu_RED/Launcher/ARM9/src/main.c | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 137a1bde..bb0a1f46 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -18,6 +18,16 @@ ifndef TWL_SYSMENU_COMMONDEFS_ TWL_SYSMENU_COMMONDEFS_ = TRUE +SYSM_FOR_CTR = TRUE +SYSM_NO_LOAD = TRUE + +ifdef SYSM_FOR_CTR +MACRO_FLAGS += -DSYSM_FOR_CTR +ifdef SYSM_NO_LOAD +MACRO_FLAGS += -DSYSM_NO_LOAD +endif +endif + NITRO_NO_STD_PCHDR = TRUE # プリコンパイルヘッダ抑止 EMPTY ?= diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index fb0201b8..89c52ed0 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -889,6 +889,8 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", sp_authcode, // AES初期化(ヘッダと再配置情報がそろってから) (void)SYSM_InitDecryptAESRegion_W( (ROM_Header_Short *)SYSM_APP_ROM_HEADER_BUF ); +#ifndef SYSM_NO_LOAD + for (i = region_arm9_ntr; i < region_max; ++i) { BOOL result; @@ -977,6 +979,8 @@ OS_TPrintf("RebootSystem failed: cant read file(%d, %d)\n", source[i], len); SVC_HMACSHA1GetHash(&dht_arg.ctx, &s_calc_hash[1 * SVC_SHA1_DIGEST_SIZE]); } +#endif // SYSM_NO_LOAD + if(!isCardApp) { (void)FS_CloseFile(file); diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index 101fedab..611d10c3 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -544,8 +544,12 @@ MAIN_LOOP_START: PrintPause(); } if( SYSM_IsLoadTitleFinished() ) { +#ifdef SYSM_NO_LOAD + state = BOOT; +#else // SYSM_NO_LOAD SYSM_StartAuthenticateTitle( pBootTitle ); state = AUTHENTICATE; +#endif // SYSM_NO_LOAD } if( !direct_boot ) {