From b20cab0606e4d11ecccf016e82352bc9c93355c2 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Mon, 31 Mar 2008 12:16:18 +0000 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E3=81=AA=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E5=BE=8C=E3=81=ABTWLCFG*.d?= =?UTF-8?q?at=E3=82=92=E7=94=9F=E6=88=90=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E4=B8=8D=E5=85=B7=E5=90=88?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=88=E3=81=93=E3=82=8C=E3=81=BE?= =?UTF-8?q?=E3=81=A7=E3=81=AF=E5=86=8D=E8=B5=B7=E5=8B=95=E5=BE=8C=E3=81=AB?= =?UTF-8?q?=E3=83=AA=E3=82=AB=E3=83=90=E3=83=AA=E7=94=9F=E6=88=90=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=BE=E3=81=97=E3=81=9F=EF=BC=89?= =?UTF-8?q?=20namut=20:=20=E3=82=A8=E3=83=A9=E3=83=BC=E5=87=BA=E5=8A=9B?= =?UTF-8?q?=E3=82=92=E6=94=B9=E5=96=84?= 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/trunk@1019 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../libraries_sysmenu/namut/ARM9/src/namut.c | 59 ++++++++++++++----- .../HWInfoWriter/ARM9/src/hwi.c | 19 ++++-- .../HWInfoWriter/ARM9/src/hwi.h | 2 +- .../ARM7.TWL/src/formatter.c | 14 ++--- .../ARM9.TWL/include/process_hw_info.h | 11 ++++ .../ARM9.TWL/src/process_format.c | 22 +++++-- .../ARM9.TWL/src/process_hw_info.c | 12 ++-- 7 files changed, 102 insertions(+), 37 deletions(-) diff --git a/build/libraries_sysmenu/namut/ARM9/src/namut.c b/build/libraries_sysmenu/namut/ARM9/src/namut.c index 534625a4..d97ba7eb 100644 --- a/build/libraries_sysmenu/namut/ARM9/src/namut.c +++ b/build/libraries_sysmenu/namut/ARM9/src/namut.c @@ -122,22 +122,38 @@ BOOL NAMUT_Format(void) BOOL ret = TRUE; // プロテクトされていないタイトルの削除を行います - ret &= NAMUTi_DeleteNonprotectedTitle(); + if (!NAMUTi_DeleteNonprotectedTitle()) + { + ret = FALSE; + OS_TWarning("Fail! NAMUTi_DeleteNonprotectedTitle()\n"); + } // プロテクトタイトルのセーブデータをフォーマットします - ret &= NAMUTi_ClearSavedataAll(TRUE); + if (!NAMUTi_ClearSavedataAll(TRUE)) + { + ret = FALSE; + OS_TWarning("Fail! NAMUTi_ClearSavedataAll()\n"); + } // 指定ファイルを0xffでクリアします for (i=0; ilength ); + pBuffer = OS_AllocFromSubPrivWram( pFileList->length ); if( pBuffer == NULL ) { OS_TPrintf( "memory allocate error.\n" ); ERROR_RETURN(); @@ -406,7 +406,7 @@ static BOOL CheckFile( const FileProperty *pFileList ) } OS_TPrintf( " [VerifyTime : %dms] ", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); // メモリ解放 - OS_Free( pBuffer ); + OS_FreeToSubPrivWram( pBuffer ); // ファイルクローズ (void)FATFS_CloseFile( file ); OS_TPrintf( "ok.\n" ); diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h index 59a68f45..d14b0312 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h @@ -42,6 +42,17 @@ void* HWInfoProcess2(void); void* HWInfoProcess3(void); void* HWInfoProcess4(void); +/*---------------------------------------------------------------------------* + Name: HW情報全体のライト + + Description: + + Arguments: region : + + Returns: None. + *---------------------------------------------------------------------------*/ +BOOL WriteHWInfoFile( u8 region ); + /*---------------------------------------------------------------------------* Name: UpdateNandBoxCount diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c index f5cb56ad..ae54ab34 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "kami_font.h" #include "kami_pxi.h" #include "process_topmenu.h" @@ -209,13 +210,22 @@ void* FormatProcess2(void) kamiFontPrintf(24, y_pos, FONT_COLOR_BLACK, " WAIT"); kamiFontLoadScreenData(); - if (NAMUT_Format()) { - kamiFontPrintf(24, y_pos, FONT_COLOR_GREEN, " OK "); - } - else - { - kamiFontPrintf(24, y_pos, FONT_COLOR_RED, " NG "); + // 現在のリージョンを保存しておきフォーマット後に保存リージョンで初期化する + u8 region = LCFG_THW_GetRegion(); + BOOL result = TRUE; + + result &= NAMUT_Format(); + result &= WriteHWInfoFile(region); + + if (result) + { + kamiFontPrintf(24, y_pos, FONT_COLOR_GREEN, " OK "); + } + else + { + kamiFontPrintf(24, y_pos, FONT_COLOR_RED, " NG "); + } } #ifdef DUMP_NAND_TREE OS_Printf("\n"); diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c index 3db55b77..aef4a146 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c @@ -63,7 +63,6 @@ static BOOL s_isReadTSD; 内部関数宣言 *---------------------------------------------------------------------------*/ -static BOOL WriteHWInfoFile( u8 region ); static BOOL WriteHWNormalInfoFile( void ); static BOOL WriteHWSecureInfoFile( u8 region ); //static BOOL DeleteHWInfoFile( void ); @@ -252,12 +251,12 @@ void* HWInfoProcess2(void) Description: - Arguments: None. + Arguments: region : Returns: None. *---------------------------------------------------------------------------*/ -static BOOL WriteHWInfoFile( u8 region ) +BOOL WriteHWInfoFile( u8 region ) { static const char *pMsgNormalWriting = "Writing Normal File..."; static const char *pMsgSecureWriting = "Writing Secure File..."; @@ -297,7 +296,12 @@ static BOOL WriteHWInfoFile( u8 region ) result = FALSE; } - HWI_ModifyLanguage( region ); + // CFGデータの修正 + if (!HWI_ModifyLanguage( region )) + { + kamiFontPrintfConsoleEx(CONSOLE_RED, "Fail! Write TWLSettings\n" ); + result = FALSE; + } // InstalledSoftBoxCount, FreeSoftBoxCount の値を現在のNANDの状態に合わせて更新します。 UpdateNandBoxCount();