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

Nightlyの自動テストで Nand を初期化するツールが必要との環境制作からの要望に応えて NandInitializerForAutoTest を作れるように対応しました。

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1139 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa 2008-04-15 06:54:27 +00:00
parent bfec50a789
commit 2915dcea86
3 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile
View File

@ -16,7 +16,7 @@
# $Author$
#----------------------------------------------------------------------------
SUBDIRS = $(ROOT)/build/demos/gx/UnitTours/DEMOLib
SUBDIRS =
#----------------------------------------------------------------------------
@ -32,6 +32,14 @@ MACRO_FLAGS += -DNAND_INITIALIZER_LIMITED_MODE
# ワイヤレスの強制Disableフラグを設定可能にする場合定義します。（要:Make Clean）
#MACRO_FLAGS += -DUSE_WIRELESS_FORCE_DISABLE_SETTING
#============================================================================
#============================================================================
# NightlyBuild 用に自動実行させる場合定義します。（要:Make Clean）
#USE_FOR_NIGHTLY_AUTO_TEST = TRUE
ifdef USE_FOR_NIGHTLY_AUTO_TEST
MACRO_FLAGS += -DUSE_FOR_NIGHTLY_AUTO_TEST
endif
#============================================================================
TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL
@ -42,7 +50,12 @@ TWL_ARCHGEN = LIMITED
TITLEID_LO = 0NIA
#TARGET_TAD =
ifdef USE_FOR_NIGHTLY_AUTO_TEST
TARGET_BIN = NandInitializerForAutoTest.srl
else
TARGET_BIN = NandInitializer.srl
endif
LCFILE_SPEC = ../../NandInitializerRed/ARM9.TWL/ARM9-TS.lsf
ROM_SPEC = ../../NandInitializerRed/ARM9.TWL/main.rsf
@ -95,7 +108,6 @@ LLIBRARIES += libes$(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

34
build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c
View File

@ -73,6 +73,7 @@ static u8 sFormatResult;
*---------------------------------------------------------------------------*/
static void FormatCallback(KAMIResult result, void* arg);
void* ForeverLoopProcess(void);
/*---------------------------------------------------------------------------*
プロセス関数定義
@ -155,6 +156,11 @@ void* FormatProcess1(void)
}
#endif
#ifdef USE_FOR_NIGHTLY_AUTO_TEST
sMenuSelectNo = MENU_CLEAN_UP;
return FormatProcess2;
#endif //USE_FOR_NIGHTLY_AUTO_TEST
// 選択メニューの変更
if ( kamiPadIsRepeatTrigger(PAD_KEY_UP) )
{
@ -201,6 +207,8 @@ void* FormatProcess2(void)
switch( sMenuSelectNo )
{
case MENU_CLEAN_UP: // 簡易フォーマット
{
BOOL result = TRUE;
#ifdef DUMP_NAND_TREE
OS_Printf("---------------------------------------\n");
OS_Printf(" Before \n");
@ -214,7 +222,6 @@ void* FormatProcess2(void)
// 現在の設定を保存しておきフォーマット後に保存設定で初期化する
u8 region = LCFG_THW_GetRegion();
BOOL isForceDisableWireless = LCFG_THW_IsForceDisableWireless();
BOOL result = TRUE;
result &= NAMUT_Format();
result &= WriteHWInfoFile(region, isForceDisableWireless);
@ -239,8 +246,16 @@ void* FormatProcess2(void)
// InstalledSoftBoxCount, FreeSoftBoxCount の値を現在のNANDの状態に合わせて更新します。
UpdateNandBoxCount();
return FormatProcess1;
#ifdef USE_FOR_NIGHTLY_AUTO_TEST
if (result)
{
OS_Printf("NAND_CLEANUP_SUCCESS");
}
return ForeverLoopProcess;
#endif //USE_FOR_NIGHTLY_AUTO_TEST
return FormatProcess1;
}
case MENU_CHECK_DISK: // チェックディスク
{
FATFSDiskInfo info;
@ -360,3 +375,18 @@ void* FormatProcess3(void)
return FormatProcess3;
}
/*---------------------------------------------------------------------------*
Name: Format プロセス４
Description: 無限ループプロセス
Arguments: None.
Returns: next sequence
*---------------------------------------------------------------------------*/
void* ForeverLoopProcess(void)
{
return ForeverLoopProcess;
}

20
build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_topmenu.c
View File

@ -76,9 +76,9 @@ static const MenuAndColor sMenuArray[] =
#endif // USE_WIRELESS_FORCE_DISABLE_SETTING
#ifndef NAND_INITIALIZER_LIMITED_MODE
{" WRITE ETICKET SIGN ", BG_COLOR_GRAY },
{" INPORT TAD FROM SD ", BG_COLOR_PINK },
{" INPORT NANDFIRM FROM SD", BG_COLOR_GREEN },
{" INPORT NORFIRM FROM SD", BG_COLOR_VIOLET }
{" IMPORT TAD FROM SD ", BG_COLOR_PINK },
{" IMPORT NANDFIRM FROM SD", BG_COLOR_GREEN },
{" IMPORT NORFIRM FROM SD", BG_COLOR_VIOLET }
#endif // NAND_INITIALIZER_LIMITED_MODE
};
@ -88,10 +88,6 @@ static const MenuAndColor sMenuArray[] =
static s8 sMenuSelectNo;
#ifdef AUTO_FORMAT_MODE
static BOOL sAutoProcessFlag = TRUE;
#endif
/*---------------------------------------------------------------------------*
内部関数定義
*---------------------------------------------------------------------------*/
@ -178,16 +174,14 @@ void* TopmenuProcess1(void)
return TopmenuProcess2;
}
#ifdef USE_FOR_NIGHTLY_AUTO_TEST
FADE_OUT_RETURN( FormatProcess0 );
#endif //USE_FOR_NIGHTLY_AUTO_TEST
#ifndef NAND_INITIALIZER_LIMITED_MODE
#ifdef AUTO_FORMAT_MODE
// sAutoProcessFlag でオート実行
if (sAutoProcessFlag)
{
sAutoProcessFlag = FALSE;
FADE_OUT_RETURN( AutoProcess0 );
}
#endif
// L&R同時押しでオート実行！
@ -195,7 +189,7 @@ void* TopmenuProcess1(void)
{
FADE_OUT_RETURN( AutoProcess0 );
}
#endif
#endif // NAND_INITIALIZER_LIMITED_MODE
return TopmenuProcess1;
}