NandInitializerAuto を追加しました。（生産工程用？）NandInitializerと基本的には同じものですが L&Rを押さなくても自動的に初期化処理が開始されます。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@970 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/systemMenu_RED/Makefile

@@ -21,7 +21,7 @@ include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 #----------------------------------------------------------------------------
 
 SUBDIRS_P	=	launcher MachineSettings PictoChat HWInfoWriter \
-				NandInitializer NandFormatter wlanfirm
+				NandInitializer NandInitializerAuto NandFormatter wlanfirm
 				#DS_DownloadPlay
 
 #----------------------------------------------------------------------------

build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_auto.c

@@ -205,6 +205,11 @@ void* AutoProcess2(void)
 
 void* AutoProcess3(void)
 {
+#ifdef AUTO_FORMAT_MODE
+	// 検査ソフトではオート処理が完了した段階でTerminateさせます。
+	OS_Terminate();
+#endif
+
     if (kamiPadIsTrigger(PAD_BUTTON_B))
 	{
 		FADE_OUT_RETURN( TopmenuProcess0 );

build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_topmenu.c

@@ -53,6 +53,10 @@
 
 static s8 sMenuSelectNo;
 
+#ifdef AUTO_FORMAT_MODE
+static BOOL sAutoProcessFlag = TRUE;
+#endif
+
 /*---------------------------------------------------------------------------*
     内部関数定義
  *---------------------------------------------------------------------------*/
@@ -164,7 +168,18 @@ void* TopmenuProcess1(void)
 		return TopmenuProcess2;
 	}
 
+
 #ifndef NAND_FORMATTER_MODE
+
+#ifdef AUTO_FORMAT_MODE
+	// sAutoProcessFlag でオート実行
+	if (sAutoProcessFlag)
+	{
+		sAutoProcessFlag = FALSE;
+		FADE_OUT_RETURN( AutoProcess0 );
+	}
+#endif
+
 	// L&R同時押しでオート実行！
     if (kamiPadIsPress(PAD_BUTTON_L) && kamiPadIsPress(PAD_BUTTON_R))
 	{

build/systemMenu_RED/NandInitializerAuto/ARM7.TWL/Makefile

@@ -0,0 +1,85 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - tests - camera-test
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
+SUBDIRS		=
+
+
+#----------------------------------------------------------------------------
+
+override TARGET_PLATFORM	= TWL
+override TWL_PROC           = ARM7
+TWL_ARCHGEN                 = LIMITED
+TWL_NO_STD_PCHDR			= True
+#TWL_CODEGEN   =       THUMB
+
+TARGET_TEF      =   main.tef
+LCFILE_SPEC     = 	../../NandInitializer/ARM7.TWL/racoon.lsf
+LCFILE_TEMPLATE	=	../../NandInitializer/ARM7.TWL/racoon.lcf.template
+LDRES_TEMPLATE	=	../../NandInitializer/ARM7.TWL/racoon.response.template
+
+SRCS		=	main.c \
+				kami_pxi.c \
+				formatter.c \
+				nvram_misc.c \
+				initScfg.c \
+
+LINCLUDES	=	../../NandInitializer/common/include \
+				../../NandInitializer/ARM7.TWL/include \
+                ../common/include $(ROOT)/build/libraries/spi/ARM7/include
+
+
+SRCDIR		=	../../NandInitializer/ARM7.TWL/src
+#LCFILE		=	# using default
+
+
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+
+ifdef TWLSDK_NOCRYPTO
+CCFLAGS			+=	-DSDK_NOCRYPTO
+endif
+
+ifndef TWLSDK_NOCRYPTO
+MAKELCF_FLAGS	+=	-DUSE_CRYPTO_LIBS='libsea_sp$(TWL_LIBSUFFIX).a libcrypto_sp$(TWL_LIBSUFFIX).a'
+MACRO_FLAGS		+=	-DSDK_SEA
+endif
+
+ifeq ($(TWL_PLATFORM),BB)
+MAKELCF_FLAGS	+=	-DADDRESS_LTDWRAM='0x037e0000'
+else
+MAKELCF_FLAGS	+=	-DADDRESS_LTDWRAM='0x037c0000'
+endif
+
+MAKELCF_FLAGS	+=	-DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libstubsistd_sp$(TWL_LIBSUFFIX).a)'	\
+					-DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a'
+
+TWL_LIBS_EX		= 	libcamera_sp$(TWL_LIBSUFFIX).a	\
+					libfatfs_sp$(TWL_LIBSUFFIX).a   \
+					libi2c_sp$(TWL_LIBSUFFIX).a	\
+        			libcamera_sp$(TWL_LIBSUFFIX).a	\
+					libcdc_sp$(TWL_LIBSUFFIX).a	\
+					libtpex_sp$(TWL_LIBSUFFIX).a
+
+#----------------------------------------------------------------------------
+
+do-build:		$(TARGETS)
+
+
+include	$(TWLSDK_ROOT)/build/buildtools/modulerules
+
+
+#===== End of Makefile =====

build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile

@@ -0,0 +1,115 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL - systemMenu_RED - NandInitializer
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
+SUBDIRS		=
+
+
+#----------------------------------------------------------------------------
+
+#============================================================================
+#現時点で製品鍵を使った書き込みが行えてはダメなので、デフォルトOFFにしておいてください。
+#USE_PRODUCT_KEY			=	TRUE
+#============================================================================
+#============================================================================
+# NandInitializerと同様の動作をしますが自動フォーマットが強制的に実行され停止します。
+MACRO_FLAGS				+=	-DAUTO_FORMAT_MODE
+#============================================================================
+
+TARGET_FIRM			= SYSTEMMENU
+TARGET_PLATFORM		= TWL
+TWL_ARCHGEN    		= LIMITED
+
+#TWL_CODEGEN   =       THUMB
+
+TITLEID_LO				=	NINA
+TARGET_TAD				=	$(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad
+
+TARGET_BIN	= NandFormatterAuto.srl
+LCFILE_SPEC	= ../../NandInitializer/ARM9.TWL/ARM9-TS.lsf
+ROM_SPEC	= ../../NandInitializer/ARM9.TWL/main.rsf
+
+MAKEROM_ARM7_BASE	=	../ARM7.TWL/bin/$(TWL_BUILDTYPE_ARM7)/main
+MAKEROM_ARM7		=	$(MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
+
+SRCS		=	main.c \
+				kami_pxi.c \
+				font_data.c \
+				graphics.c \
+				keypad.c \
+				kami_font.c \
+				cursor.c \
+				process_format.c \
+				process_topmenu.c \
+				process_hw_info.c \
+				process_eticket.c \
+				process_import.c \
+				process_nandfirm.c \
+				process_norfirm.c \
+				process_auto.c \
+				process_fade.c \
+				sd_event.c \
+				hwi.c
+
+LINCLUDES	=	../../NandInitializer/common/include \
+				../../NandInitializer/ARM9.TWL/include \
+				$(ROOT)/build/libraries/lcfg/ARM9.TWL/include \
+                ../../misc/include
+
+SRCDIR		=	../../NandInitializer/ARM9.TWL/src \
+				../../HWInfoWriter/ARM9/src
+
+#LCFILE		=	# using default
+
+
+ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),)
+ifdef USE_PRODUCT_KEY
+MACRO_FLAGS				+=	-DUSE_PRODUCT_KEY
+MAKEROM_FLAGS			+=	-DHWINFO_PRIVKEY='private_HWInfo.der'
+else
+MAKEROM_FLAGS			+=	-DHWINFO_PRIVKEY='private_HWInfo_dev.der'
+endif
+endif
+
+MAKEROM_FLAGS			+=	-DTITLEID_LO='$(TITLEID_LO)' \
+							-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa'
+MAKETAD_FLAGS			+=	-s
+
+LLIBRARIES		+=	libes$(TWL_LIBSUFFIX).a				\
+					libboc$(TWL_LIBSUFFIX).a			\
+					libnam$(TWL_LIBSUFFIX).a			\
+					libsea$(TWL_LIBSUFFIX).a			\
+					libacsign_enc$(TWL_LIBSUFFIX).a     \
+					libnamut$(TWL_LIBSUFFIX).a
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib
+
+MAKEROM			 = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
+
+LDIRT_CLEAN				=	$(TARGET_TAD)
+#INSTALL_TARGETS			=	$(TARGET_TAD)
+#INSTALL_DIR				=	$(SDK_NMENU_DATADIR)
+
+#----------------------------------------------------------------------------
+
+do-build:		$(TARGETS)
+
+#include	$(TWLSDK_ROOT)/build/buildtools/modulerules
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#===== End of Makefile =====

build/systemMenu_RED/NandInitializerAuto/Makefile

@@ -0,0 +1,34 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - tests - camera
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+
+
+#----------------------------------------------------------------------------
+
+SUBDIRS =	\
+            banner \
+            ARM7.TWL \
+            ARM9.TWL \
+
+#----------------------------------------------------------------------------
+
+include	$(TWLSDK_ROOT)/build/buildtools/modulerules
+
+
+#===== End of Makefile =====

build/systemMenu_RED/NandInitializerAuto/banner/Makefile

@@ -0,0 +1,49 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/gameIcon.bmp
+BANNER_SPEC			= banner_v3.bsf
+
+TARGETS				= banner.bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+
+#