From 809f19f081ac5763a5aab7f614bc83ebdbfc5c0e Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 21 Jul 2009 06:10:10 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=AE=E6=95=B4?=
 =?UTF-8?q?=E7=90=862?=
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@2874 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../NandFirmWriter/ARM9.TWL/Makefile          | 40 +++++++--------
 .../NandFirmWriter/ARM9.TWL/src/main.c        | 51 ++++++++++---------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
index 8501e698..dd94c935 100644
--- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
+++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
@@ -39,7 +39,6 @@ SRCS				=	main.c \
 						common.c \
 						font.c \
 						screen.c \
-						hwi.c \
 						kami_pxi.c \
 						kami_write_nandfirm.c \
 
@@ -48,7 +47,6 @@ LINCLUDES			=	../common/include \
 						../../common/ARM9/include
 
 SRCDIR				=	src \
-						../../HWInfoWriter/ARM9/src \
 						../../common/ARM9/src
 
 #LCFILE				=	# using default
@@ -57,31 +55,31 @@ SRCDIR				=	src \
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
-MAKEROM_FLAGS			+=	-DTITLEID_LO='$(TITLEID_LO)' \
-							-DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
+MAKEROM_FLAGS		+=	-DTITLEID_LO='$(TITLEID_LO)' \
+						-DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
 
-MAKETAD_FLAGS			+=	-s
+MAKETAD_FLAGS		+=	-s
 
-SYSMENU_LIBS			=	\
-							libnamut$(TWL_LIBSUFFIX).a
+SYSMENU_LIBS		=	\
+						libnamut$(TWL_LIBSUFFIX).a
 
-SDK_APPEND_LIBS			=	\
-							libes$(TWL_LIBSUFFIX).a \
-							libboc$(TWL_LIBSUFFIX).a \
-							libsfs$(TWL_LIBSUFFIX).a \
-							libnam$(TWL_LIBSUFFIX).a \
-							libsea$(TWL_LIBSUFFIX).a \
-							liblcfg$(TWL_LIBSUFFIX).a \
-							libna$(TWL_LIBSUFFIX).a \
-							liberrorlog$(TWL_LIBSUFFIX).a
+SDK_APPEND_LIBS		=	\
+						libes$(TWL_LIBSUFFIX).a \
+						libboc$(TWL_LIBSUFFIX).a \
+						libsfs$(TWL_LIBSUFFIX).a \
+						libnam$(TWL_LIBSUFFIX).a \
+						libsea$(TWL_LIBSUFFIX).a \
+						liblcfg$(TWL_LIBSUFFIX).a \
+						libna$(TWL_LIBSUFFIX).a \
+						liberrorlog$(TWL_LIBSUFFIX).a
 
-LLIBRARIES				+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
+LLIBRARIES			+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
 
-MAKEROM			 		= $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
+MAKEROM			 	= $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
 
-#LDIRT_CLEAN			=
-#INSTALL_TARGETS		=
-INSTALL_DIR				=	$(SDK_NMENU_DATADIR)
+#LDIRT_CLEAN		=
+#INSTALL_TARGETS	=
+INSTALL_DIR			=	$(SDK_NMENU_DATADIR)
 
 #----------------------------------------------------------------------------
 
diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c
index 8b58e239..d0c01694 100644
--- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c
+++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c
@@ -19,14 +19,12 @@
 #include <nitro/snd.h>
 #include <twl/fatfs.h>
 #include <nitro/card.h>
-#include <twl/nam.h>
 #include <twl/os/common/format_rom.h>
-#include <sysmenu/namut.h>
+#include <twl/lcfg.h>
 #include "kami_pxi.h"
 #include "common.h"
 #include "screen.h"
 #include "kami_write_nandfirm.h"
-#include "hwi.h"
 
 #define SCRAMBLE_MASK 0x00406000
 
@@ -48,6 +46,7 @@ static BOOL gResult;
  *---------------------------------------------------------------------------*/
 static void VBlankIntr(void);
 static void InitAllocation(void);
+static BOOL ReadTWLSettings( void );
 static void DrawScene(void);
 
 /*---------------------------------------------------------------------------*
@@ -141,27 +140,8 @@ TwlMain()
 //  仮に未フォーマットであったとしてもBadFormat扱いとなる。2009/03/05
 #endif
 
-	// NAMライブラリ初期化
-	NAM_Init( OS_AllocFromMain, OS_FreeToMain);
-	NAMUT_Init( OS_AllocFromMain, OS_FreeToMain);
-
 #ifndef TWL_CAPTURE_VERSION
-	// HWInfo関連の前準備
-	switch (HWI_Init( OS_AllocFromMain, OS_FreeToMain ))
-	{
-	case HWI_INIT_FAILURE:
-        OS_PutString("HWI_INIT() Failure!\n");
-		break;
-	case HWI_INIT_SUCCESS_PRO_SIGNATURE_MODE:
-		OS_PutString("[PRO Signature MODE]\n");
-		break;
-	case HWI_INIT_SUCCESS_DEV_SIGNATURE_MODE:
-        OS_PutString("[DEV Signature MODE]\n");
-		break;
-	case HWI_INIT_SUCCESS_NO_SIGNATRUE_MODE:
-        OS_PutString("[No Signature MODE]\n");
-		break;
-	}
+    ReadTWLSettings();
 #endif
 
     gResult = FALSE;
@@ -204,6 +184,31 @@ TwlMain()
 }
 
 
+// TWL設定データのリード
+static BOOL ReadTWLSettings( void )
+{
+    u8 *pBuffer = OS_AllocFromMain( LCFG_READ_TEMP );
+    BOOL result;
+    if( pBuffer ) {
+        result = LCFG_ReadTWLSettings( (u8 (*)[ LCFG_READ_TEMP ] )pBuffer );
+		// Readに失敗した場合ファイルのリカバリ生成を試みる
+		if (!result)
+		{
+			OS_TPrintf( "TSD read failed. Retry onece more.\n" );
+	        result = LCFG_RecoveryTWLSettings();
+		}
+        OS_FreeToMain( pBuffer );
+    }
+    if( result ) {
+        OS_TPrintf( "TSD read succeeded.\n" );
+    }else {
+        OS_TPrintf( "TSD read failed.\n" );
+    }
+
+	return result;
+}
+
+
 static void DrawScene(void)
 {
     PutMainScreen( 5, 2, 0xf8, " ------------------- ");