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

(TOOL)NandInitializerProductionの最終処理としてNAMUT_Formatを実行するように変更。（マリオクラブでのデバッグ作業でWiFi設定などもクリアされていた方が都合がよいため）

Browse Source 
(TOOL)ダイレクトブート時にCARDi_ReadRomID関数を実行するとカード抜けと判定されるためCARDi_ReadRomIDCore関数を使うように変更。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2140 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa 2008-08-11 12:27:40 +00:00
parent f783df83a3
commit dabc37a668
5 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h
View File

@ -39,6 +39,7 @@ enum {
AUTO_PROCESS_MENU_IMPORT_TAD,
AUTO_PROCESS_MENU_IMPORT_NANDFIRM,
AUTO_PROCESS_MENU_MCU,
AUTO_PROCESS_MENU_MACHINE_INITIALIZE,
AUTO_PROCESS_MENU_NUM
};

25
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c
View File

@ -107,6 +107,7 @@ void* AutoProcess1(void)
{
case AUTO_PROCESS_MENU_FORMAT:
return FormatProcess0;
case AUTO_PROCESS_MENU_HARDWARE_INFO:
return HWInfoProcess0;
@ -124,6 +125,9 @@ void* AutoProcess1(void)
case AUTO_PROCESS_MENU_MCU:
return mcuProcess0;
case AUTO_PROCESS_MENU_MACHINE_INITIALIZE:
return FormatProcess0;
case AUTO_PROCESS_MENU_NUM:
return AutoProcess2;
}
@ -171,16 +175,7 @@ void* AutoProcess2(void)
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT TAD FROM SD ");
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD");
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE MCU FIRM ");
#ifndef AUTO_FORMAT_MODE
if (gAutoProcessResult[AUTO_PROCESS_MENU_MCU] == AUTO_PROCESS_RESULT_SKIP)
{
kamiFontPrintf(3, 22, FONT_COLOR_BLACK, " Button B : return to menu");
}
else
{
kamiFontPrintf(3, 22, FONT_COLOR_BLACK, " Please Shut Down");
}
#endif //AUTO_FORMAT_MODE
kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " MACHINE INITIALIZE ");
/*
for (i=0;i<sMenuSelectNo-1;i++)
@ -209,13 +204,13 @@ void* AutoProcess2(void)
// 失敗なし
if (totalResult)
{
kamiFontPrintf(3, 19, FONT_COLOR_BLACK, " Finished Successfully!");
kamiFontPrintf(3, 21, FONT_COLOR_BLACK, " Finished Successfully!");
bg_color = BG_COLOR_GREEN;
}
// 失敗あり
else
{
kamiFontPrintf(3, 19, FONT_COLOR_BLACK, " Error Occured!");
kamiFontPrintf(3, 21, FONT_COLOR_BLACK, " Error Occured!");
bg_color = BG_COLOR_RED;
}
@ -225,9 +220,9 @@ void* AutoProcess2(void)
kamiFontFillChar( 2, bg_color, BG_COLOR_TRANS );
// 背景下部
kamiFontFillChar(18, BG_COLOR_TRANS, bg_color );
kamiFontFillChar(19, bg_color, bg_color );
kamiFontFillChar(20, bg_color, BG_COLOR_TRANS );
kamiFontFillChar(20, BG_COLOR_TRANS, bg_color );
kamiFontFillChar(21, bg_color, bg_color );
kamiFontFillChar(22, bg_color, BG_COLOR_TRANS );
// カーソル消去
SetCursorPos((u16)200, (u16)200);

36
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_format.c
View File

@ -70,6 +70,10 @@ static s8 sMenuSelectNo;
static u8 sLock;
static u8 sFormatResult;
#ifndef NAND_INITIALIZER_LIMITED_MODE
static u8 sAutoModeSequence;
#endif // NAND_INITIALIZER_LIMITED_MODE
/*---------------------------------------------------------------------------*
内部関数宣言
*---------------------------------------------------------------------------*/
@ -153,7 +157,14 @@ void* FormatProcess1(void)
// オート実行用
if (gAutoFlag)
{
sMenuSelectNo = MENU_NORMAL_FORMAT;
if (sAutoModeSequence == 0)
{
sMenuSelectNo = MENU_NORMAL_FORMAT;
}
else
{
sMenuSelectNo = MENU_CLEAN_UP;
}
return FormatProcess2;
}
#endif
@ -253,6 +264,25 @@ void* FormatProcess2(void)
return ForeverLoopProcess;
#endif //USE_FOR_NIGHTLY_AUTO_TEST
#ifndef NAND_INITIALIZER_LIMITED_MODE
// Auto—p
if (gAutoFlag)
{
if (result)
{
gAutoProcessResult[AUTO_PROCESS_MENU_MACHINE_INITIALIZE] = AUTO_PROCESS_RESULT_SUCCESS;
sAutoModeSequence = 0;
FADE_OUT_RETURN( AutoProcess1 );
}
else
{
gAutoProcessResult[AUTO_PROCESS_MENU_MACHINE_INITIALIZE] = AUTO_PROCESS_RESULT_FAILURE;
sAutoModeSequence = 0;
FADE_OUT_RETURN( AutoProcess2 );
}
}
#endif
return FormatProcess1;
}
case MENU_CHECK_DISK: // チェックディスク
@ -364,11 +394,13 @@ void* FormatProcess3(void)
if (sFormatResult)
{
gAutoProcessResult[AUTO_PROCESS_MENU_FORMAT] = AUTO_PROCESS_RESULT_SUCCESS;
FADE_OUT_RETURN( AutoProcess1 );
sAutoModeSequence = 1;
FADE_OUT_RETURN( AutoProcess1 );
}
else
{
gAutoProcessResult[AUTO_PROCESS_MENU_FORMAT] = AUTO_PROCESS_RESULT_FAILURE;
sAutoModeSequence = 1;
FADE_OUT_RETURN( AutoProcess2 );
}
}

2
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_mcu.c
View File

@ -248,7 +248,7 @@ void* mcuProcess2(void)
}
else
{
if (gAutoFlag) { FADE_OUT_RETURN( AutoProcess2 ); }
if (gAutoFlag) { FADE_OUT_RETURN( AutoProcess1 ); }
else { FADE_OUT_RETURN( TopmenuProcess0 ); }
}

4
build/systemMenu_tools/common/ARM9/src/debugger_hw_reset_control.c
View File

@ -18,6 +18,8 @@
#include <twl.h>
#include "debugger_hw_reset_control.h"
extern u32 CARDi_ReadRomIDCore(void);
/*---------------------------------------------------------------------------*
型定義
*---------------------------------------------------------------------------*/
@ -58,7 +60,7 @@ static void CardAccessThread(void* arg)
while (!sHwResetEnable)
{
CARD_LockRom((u16)sLockId);
(void)CARDi_ReadRomID();
(void)CARDi_ReadRomIDCore();
CARD_UnlockRom((u16)sLockId);
// 5秒間スリープ