From dabc37a6681ba21f0cf03738536506fb5168cef4 Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 11 Aug 2008 12:27:40 +0000
Subject: [PATCH] =?UTF-8?q?(TOOL)NandInitializerProduction=E3=81=AE?=
 =?UTF-8?q?=E6=9C=80=E7=B5=82=E5=87=A6=E7=90=86=E3=81=A8=E3=81=97=E3=81=A6?=
 =?UTF-8?q?NAMUT=5FFormat=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=EF=BC=88?=
 =?UTF-8?q?=E3=83=9E=E3=83=AA=E3=82=AA=E3=82=AF=E3=83=A9=E3=83=96=E3=81=A7?=
 =?UTF-8?q?=E3=81=AE=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E4=BD=9C=E6=A5=AD?=
 =?UTF-8?q?=E3=81=A7WiFi=E8=A8=AD=E5=AE=9A=E3=81=AA=E3=81=A9=E3=82=82?=
 =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=82=A2=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=9F=E6=96=B9=E3=81=8C=E9=83=BD=E5=90=88=E3=81=8C=E3=82=88?=
 =?UTF-8?q?=E3=81=84=E3=81=9F=E3=82=81=EF=BC=89=20(TOOL)=E3=83=80=E3=82=A4?=
 =?UTF-8?q?=E3=83=AC=E3=82=AF=E3=83=88=E3=83=96=E3=83=BC=E3=83=88=E6=99=82?=
 =?UTF-8?q?=E3=81=ABCARDi=5FReadRomID=E9=96=A2=E6=95=B0=E3=82=92=E5=AE=9F?=
 =?UTF-8?q?=E8=A1=8C=E3=81=99=E3=82=8B=E3=81=A8=E3=82=AB=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E6=8A=9C=E3=81=91=E3=81=A8=E5=88=A4=E5=AE=9A=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81CARDi=5FReadRomIDCore=E9=96=A2?=
 =?UTF-8?q?=E6=95=B0=E3=82=92=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=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/trunk@2140 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9.TWL/include/process_auto.h           |  1 +
 .../ARM9.TWL/src/process_auto.c               | 25 ++++++-------
 .../ARM9.TWL/src/process_format.c             | 36 +++++++++++++++++--
 .../ARM9.TWL/src/process_mcu.c                |  2 +-
 .../ARM9/src/debugger_hw_reset_control.c      |  4 ++-
 5 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h
index 65257c5f..b099515f 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h
@@ -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
 };
 
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c
index df042872..498600fb 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c
@@ -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);
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_format.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_format.c
index a9328019..d0b72129 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_format.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_format.c
@@ -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用
+		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 ); 
 			}
 		}
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_mcu.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_mcu.c
index 8233e02f..c57c8d5c 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_mcu.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_mcu.c
@@ -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 );	}
 	}
 
diff --git a/build/systemMenu_tools/common/ARM9/src/debugger_hw_reset_control.c b/build/systemMenu_tools/common/ARM9/src/debugger_hw_reset_control.c
index abe3f114..a1f50733 100644
--- a/build/systemMenu_tools/common/ARM9/src/debugger_hw_reset_control.c
+++ b/build/systemMenu_tools/common/ARM9/src/debugger_hw_reset_control.c
@@ -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秒間スリープ