rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

各処理が失敗した場合に最大１０回までリトライするように変更。

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1247 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa 2008-04-23 12:46:08 +00:00
parent c5e8070542
commit 65a97e08f0
1 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
build/systemMenu_RED/SystemUpdater/ARM9.TWL/src/main.c
View File

@ -33,6 +33,9 @@
内部定数定義 内部定数定義
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
// リトライ回数
#define MAX_RETRY_COUNT 10
static const char* ImportTadFileList[] = static const char* ImportTadFileList[] =
{ {
"rom:/data/HNAA.tad", "rom:/data/HNAA.tad",
@ -70,8 +73,10 @@ void
TwlMain() TwlMain()
{ {
BOOL result; BOOL result;
BOOL hw_info_result;
BOOL nand_firm_result;
int tadNum; int tadNum;
int i; int i,j;
OS_Init(); OS_Init();
OS_InitArena(); OS_InitArena();
@ -91,8 +96,6 @@ TwlMain()
TP_Init(); TP_Init();
RTC_Init(); RTC_Init();
InitAllocation();
KamiPxiInit(); /* 独自PXI初期化 */ KamiPxiInit(); /* 独自PXI初期化 */
// Vブランク割り込み設定 // Vブランク割り込み設定
@ -105,6 +108,8 @@ TwlMain()
// initialize file-system // initialize file-system
FS_Init(FS_DMA_NOT_USE); FS_Init(FS_DMA_NOT_USE);
InitAllocation();
// NAMライブラリ初期化 // NAMライブラリ初期化
NAM_Init( OS_AllocFromMain, OS_FreeToMain); NAM_Init( OS_AllocFromMain, OS_FreeToMain);
@ -151,10 +156,23 @@ TwlMain()
result = TRUE; result = TRUE;
// 全ハードウェア情報の更新 // 全ハードウェア情報の更新
if (WriteHWInfoFile(OS_GetRegion(), OS_IsForceDisableWireless()) == FALSE) for (i=0;i<MAX_RETRY_COUNT;i++)
{
hw_info_result = WriteHWInfoFile(OS_GetRegion(), OS_IsForceDisableWireless());
if (hw_info_result)
{
kamiFontPrintf( 0, (s16)0, FONT_COLOR_GREEN, "Write Hardware Info Success.");
break;
}
else
{
kamiFontPrintfConsole(CONSOLE_RED, "Write Hardware Info Retry!\n");
}
}
if ( hw_info_result == FALSE)
{ {
result = FALSE; result = FALSE;
kamiFontPrintfConsole(CONSOLE_RED, "Hardware Update Failure!\n"); kamiFontPrintf( 0, (s16)0, FONT_COLOR_RED, "Write Hardware Info Failure!");
} }
// TADのインポート開始 // TADのインポート開始
@ -162,30 +180,52 @@ TwlMain()
for (i=0; i<tadNum; i++) for (i=0; i<tadNum; i++)
{ {
s32 nam_result = kamiImportTad(i+1, tadNum, ImportTadFileList[i]); s32 nam_result;
// MAX_RETRY_COUNTまでリトライする
for (j=0; j<MAX_RETRY_COUNT; j++)
{
nam_result = kamiImportTad(i+1, tadNum, ImportTadFileList[i]);
if (nam_result == NAM_OK) if (nam_result == NAM_OK)
{ {
kamiFontPrintf( 0, (s16)i, FONT_COLOR_GREEN, "List : %d Update Success.", i+1 ); break;
} }
else else
{ {
kamiFontPrintf( 0, (s16)i, FONT_COLOR_RED, "Error: %d : RetCode = %d", i+1, nam_result ); kamiFontPrintfConsole(CONSOLE_RED, "Import %d Retry!\n", i+1);
}
}
if ( nam_result == NAM_OK)
{
kamiFontPrintf( 0, (s16)(i+1), FONT_COLOR_GREEN, "List : %d Update Success.", i+1 );
}
else
{
kamiFontPrintf( 0, (s16)(i+1), FONT_COLOR_RED, "Error: %d : RetCode = %d", i+1, nam_result );
result = FALSE; result = FALSE;
} }
} }
// NANDファームのインストール開始 // NANDファームのインストール開始
if( kamiWriteNandfirm(NandFirmPath, OS_AllocFromMain, OS_FreeToMain)) for (j=0;j<MAX_RETRY_COUNT;j++)
{ {
kamiFontPrintf( 0, (s16)i, FONT_COLOR_GREEN, "Firm Update Success."); nand_firm_result = kamiWriteNandfirm(NandFirmPath, OS_AllocFromMain, OS_FreeToMain);
if (nand_firm_result)
{
kamiFontPrintf( 0, (s16)(i+1), FONT_COLOR_GREEN, "Firm Update Success.");
break;
} }
else else
{ {
kamiFontPrintf( 0, (s16)i, FONT_COLOR_RED, "Firm Update Failure!"); kamiFontPrintfConsole(CONSOLE_RED, "Write Firm Retry!\n");
result = FALSE; }
}
if ( nand_firm_result == FALSE)
{
result = FALSE;
kamiFontPrintf( 0, (s16)(i+1), FONT_COLOR_RED, "Firm Update Failure!");
} }
kamiFontLoadScreenData();
// 調査に不便なので一時的に削除 // 調査に不便なので一時的に削除
/* /*
@ -215,6 +255,7 @@ TwlMain()
static void static void
VBlankIntr(void) VBlankIntr(void)
{ {
kamiFontLoadScreenData();
OS_SetIrqCheckFlag(OS_IE_V_BLANK); // checking VBlank interrupt OS_SetIrqCheckFlag(OS_IE_V_BLANK); // checking VBlank interrupt
} }
@ -259,7 +300,6 @@ static void DrawWaitButtonA(void)
kamiFontPrintfMain( 3, 11, 1, "Do not turn off power"); kamiFontPrintfMain( 3, 11, 1, "Do not turn off power");
kamiFontPrintfMain( 3, 12, 1, "while update is processing"); kamiFontPrintfMain( 3, 12, 1, "while update is processing");
kamiFontPrintfMain( 3, 13, 1, "--------------------------"); kamiFontPrintfMain( 3, 13, 1, "--------------------------");
kamiFontLoadScreenData();
while(1) while(1)
{ {
@ -279,6 +319,10 @@ static void DrawWaitButtonA(void)
} }
OS_WaitVBlankIntr(); OS_WaitVBlankIntr();
} }
G3X_Reset();
G3_SwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_W);
OS_WaitVBlankIntr();
} }
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
@ -297,7 +341,6 @@ static void DrawAlready(void)
kamiFontPrintfMain( 3, 11, 1, "This machine has already"); kamiFontPrintfMain( 3, 11, 1, "This machine has already");
kamiFontPrintfMain( 3, 12, 1, "been updated."); kamiFontPrintfMain( 3, 12, 1, "been updated.");
kamiFontPrintfMain( 3, 13, 1, "--------------------------"); kamiFontPrintfMain( 3, 13, 1, "--------------------------");
kamiFontLoadScreenData();
while(1) while(1)
{ {
@ -312,4 +355,3 @@ static void DrawAlready(void)
OS_WaitVBlankIntr(); OS_WaitVBlankIntr();
} }
} }