From e6249d6feef7b2e4e22ad4f5ce164e17a5640a6d Mon Sep 17 00:00:00 2001 From: kamikawa Date: Thu, 22 May 2008 07:13:35 +0000 Subject: [PATCH] =?UTF-8?q?=E6=A8=A9=E5=88=A9=E9=96=A2=E4=BF=82=E3=81=8C?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=82=A2=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=BE?= =?UTF-8?q?=E3=81=A7=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88=E3=81=AF=E3=83=87?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7=E3=81=AFNAND?= =?UTF-8?q?=E3=81=AB=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BE=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=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@1464 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/namut/ARM9/src/namut.c | 4 ++-- .../NandInitializerProduction/ARM9.TWL/Makefile | 2 +- .../ARM9.TWL/src/process_auto.c | 15 ++++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build/libraries_sysmenu/namut/ARM9/src/namut.c b/build/libraries_sysmenu/namut/ARM9/src/namut.c index f4b6f5b4..3b7ccf05 100644 --- a/build/libraries_sysmenu/namut/ARM9/src/namut.c +++ b/build/libraries_sysmenu/namut/ARM9/src/namut.c @@ -629,8 +629,8 @@ BOOL NAMUT_UpdateSoftBoxCount( void ) return FALSE; } - OS_Printf("installedSoftBoxCount = %d\n", installedSoftBoxCount); - OS_Printf("freeSoftBoxCount = %d\n", freeSoftBoxCount); +// OS_Printf("installedSoftBoxCount = %d\n", installedSoftBoxCount); +// OS_Printf("freeSoftBoxCount = %d\n", freeSoftBoxCount); // LCFGライブラリの静的変数に対する更新 LCFG_TSD_SetInstalledSoftBoxCount( installedSoftBoxCount ); diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile index b22fa6de..7d080c5c 100644 --- a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile @@ -31,7 +31,7 @@ MACRO_FLAGS += -DUSE_WIRELESS_FORCE_DISABLE_SETTING #============================================================================ #============================================================================ # フォントデータを書き込み可能にする場合定義します。（要:Make Clean） -MACRO_FLAGS += -DUSE_WRITE_FONT_DATA +#MACRO_FLAGS += -DUSE_WRITE_FONT_DATA #============================================================================ #============================================================================ # マリクラデバッグ用に製品本体での起動を抑制する場合定義します。（要:Make Clean） 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 88f84972..110e3bd8 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c @@ -22,7 +22,6 @@ #include "process_hw_info.h" #include "process_import.h" #include "process_font.h" -//#include "process_eticket.h" #include "process_nandfirm.h" #include "process_norfirm.h" #include "process_auto.h" @@ -148,6 +147,7 @@ void* AutoProcess1(void) void* AutoProcess2(void) { int i; + s8 line = 5; u8 bg_color; // 文字列全クリア @@ -164,13 +164,14 @@ void* AutoProcess2(void) kamiFontPrintf(0, 2, FONT_COLOR_BLACK, "--------------------------------"); // メニュー一覧 - kamiFontPrintf(3, 7, FONT_COLOR_BLACK, " FORMAT NAND "); - kamiFontPrintf(3, 9, FONT_COLOR_BLACK, " WRITE HARDWARE INFO "); - kamiFontPrintf(3, 11, FONT_COLOR_BLACK, " WRITE FONT DATA "); -// kamiFontPrintf(3, 13, FONT_COLOR_BLACK, " WRITE ETICKET SIGN "); - kamiFontPrintf(3, 13, FONT_COLOR_BLACK, " INPORT TAD FROM SD "); + kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " FORMAT NAND "); + kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE HARDWARE INFO "); +#ifdef USE_WRITE_FONT_DATA + kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE FONT DATA "); +#endif // USE_WRITE_FONT_DATA + kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT TAD FROM SD "); #ifndef MARIOCLUB_VERSION - kamiFontPrintf(3, 15, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD"); + kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD"); #endif //MARIOCLUB_VERSION #ifndef AUTO_FORMAT_MODE kamiFontPrintf(3, 22, FONT_COLOR_BLACK, " Button B : return to menu");