From 0990dbe286af916bec737b67836c690fcd66658d Mon Sep 17 00:00:00 2001 From: N1277 Date: Thu, 8 Jul 2010 03:16:56 +0000 Subject: [PATCH] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88=E3=81=9Ame?= =?UTF-8?q?nu=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=E3=81=A7TWL?= =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=E3=81=AE=E5=B8=B8?= =?UTF-8?q?=E9=A7=90=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E3=83=AD=E3=83=BC=E3=83=89=E3=81=97=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=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@2928 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/nandfirm/menu-launcher/ARM7/main.c | 6 ++++++ build/nandfirm/menu-launcher/ARM9/main.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c index 660813d7..93249c37 100644 --- a/build/nandfirm/menu-launcher/ARM7/main.c +++ b/build/nandfirm/menu-launcher/ARM7/main.c @@ -17,6 +17,8 @@ #include #include +#define FIRM_FOR_CTR + /* PROFILE_ENABLE を定義するとある程度のパフォーマンスチェックができます。 利用するためには、main.cかどこかに、u32 profile[256]; u32 pf_cnt = 0; を @@ -259,6 +261,8 @@ void TwlSpMain( void ) // PM_BackLightOn( FALSE ); +#ifndef FIRM_FOR_CTR + if ( !FS_LoadStatic( fd ) ) { OS_TPrintf("Failed to call FS_LoadStatic().\n"); @@ -270,6 +274,8 @@ void TwlSpMain( void ) // PM_BackLightOn( FALSE ); +#endif // FIRM_FOR_CTR + if ( PXI_RecvID() != FIRM_PXI_ID_DONE_STATIC ) { OS_TPrintf("PXI_RecvID() was received invalid value (!=FIRM_PXI_ID_DONE_STATIC).\n"); diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c index af977228..fedc1c66 100644 --- a/build/nandfirm/menu-launcher/ARM9/main.c +++ b/build/nandfirm/menu-launcher/ARM9/main.c @@ -18,6 +18,8 @@ #include #include "print.h" +#define FIRM_FOR_CTR + #ifdef FIRM_USE_PRODUCT_KEYS #define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[0] // 鍵管理.xls参照 #else @@ -349,6 +351,8 @@ void TwlMain( void ) // 8: after PXI PUSH_PROFILE(); +#ifndef FIRM_FOR_CTR + if ( !FS_LoadStatic( NULL ) ) { OS_TPrintf("Failed to call FS_LoadStatic().\n"); @@ -358,6 +362,8 @@ void TwlMain( void ) // 9: after FS_LoadStatic PUSH_PROFILE(); +#endif // FIRM_FOR_CTR + PXI_NotifyID( FIRM_PXI_ID_DONE_STATIC ); // 10: after PXI PUSH_PROFILE(); @@ -391,7 +397,11 @@ void TwlMain( void ) OS_BootFromFIRM(); end: + +#ifndef FIRM_FOR_CTR PrintError("Error: %d-%s-%s", point, g_strIPLSvnRevision, g_strSDKSvnRevision); +#endif // FIRM_FOR_CTR + EraseAll(); // failed