From aed54798bcb4fad85640565ef2a8f5ef56b660b2 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Fri, 16 May 2008 06:54:55 +0000 Subject: [PATCH] =?UTF-8?q?NandInitilizer=20=E3=81=AE=20Makefile=E3=81=AB?= =?UTF-8?q?=E3=81=8A=E3=81=84=E3=81=A6=20USE=5FWRITE=5FFONT=5FDATA=20?= =?UTF-8?q?=E3=82=92=E5=AE=9A=E7=BE=A9=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8?= =?UTF-8?q?=E3=81=A7=20NandInitializerWithSharedFont=20=E3=81=8C=E4=BD=9C?= =?UTF-8?q?=E6=88=90=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=20NandInitializer?= =?UTF-8?q?Red=20=E3=81=AB=20=E7=84=A1=E7=B7=9A=E5=BC=B7=E5=88=B6OFF?= =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=20=E8=A8=AD=E5=AE=9A=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=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@1378 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../NandInitializer/ARM9.TWL/Makefile | 13 +++++++++ .../NandInitializerRed/ARM9.TWL/Makefile | 9 ++++++ .../ARM9.TWL/src/process_font.c | 4 +++ .../ARM9.TWL/src/process_topmenu.c | 28 ++++++++++++++----- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile index fb3e5989..b77ef11c 100644 --- a/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile @@ -33,6 +33,14 @@ MACRO_FLAGS += -DNAND_INITIALIZER_LIMITED_MODE #MACRO_FLAGS += -DUSE_WIRELESS_FORCE_DISABLE_SETTING #============================================================================ #============================================================================ +# フォントデータを書き込み可能にする場合定義します。（要:Make Clean） +#USE_WRITE_FONT_DATA = TRUE + +ifdef USE_WRITE_FONT_DATA +MACRO_FLAGS += -DUSE_WRITE_FONT_DATA +endif +#============================================================================ +#============================================================================ # NightlyBuild 用に自動実行させる場合定義します。（要:Make Clean） #USE_FOR_NIGHTLY_AUTO_TEST = TRUE @@ -59,8 +67,12 @@ TITLEID_LO = 0NIA ifdef USE_FOR_NIGHTLY_AUTO_TEST TARGET_BIN = NandInitializerForAutoTest.srl else +ifdef USE_WRITE_FONT_DATA +TARGET_BIN = NandInitializerWithSharedFont.srl +else TARGET_BIN = NandInitializer.srl endif +endif LCFILE_SPEC = ../../NandInitializerRed/ARM9.TWL/ARM9-TS.lsf ROM_SPEC = ./main.rsf @@ -80,6 +92,7 @@ SRCS = main.c \ process_hw_info.c \ process_wireless_setting.c \ process_fade.c \ + process_font.c \ sd_event.c \ hwi.c diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile index 5d1398d4..17ecac0d 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile @@ -22,6 +22,14 @@ #現時点で製品鍵を使った書き込みが行えてはダメなので、デフォルトOFFにしておいてください。 #USE_PRODUCT_KEY = TRUE #============================================================================ +#============================================================================ +# ワイヤレスの強制Disableフラグを設定可能にする場合定義します。（要:Make Clean） +MACRO_FLAGS += -DUSE_WIRELESS_FORCE_DISABLE_SETTING +#============================================================================ +#============================================================================ +# フォントデータを書き込み可能にする場合定義します。（要:Make Clean） +MACRO_FLAGS += -DUSE_WRITE_FONT_DATA +#============================================================================ DISABLE_DEBUG = FALSE @@ -59,6 +67,7 @@ SRCS = main.c \ process_auto.c \ process_fade.c \ process_font.c \ + process_wireless_setting.c \ sd_event.c \ hwi.c diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_font.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_font.c index 23c2ad4a..f9c83d12 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_font.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_font.c @@ -117,12 +117,14 @@ void* fontProcess0(void) void* fontProcess1(void) { +#ifndef NAND_INITIALIZER_LIMITED_MODE // オート実行用 if (gAutoFlag) { sMenuSelectNo = 0; return fontProcess2; } +#endif // 選択メニューの変更 if ( kamiPadIsRepeatTrigger(PAD_KEY_UP) ) @@ -182,12 +184,14 @@ void* fontProcess2(void) FADE_OUT_RETURN( TopmenuProcess0 ); } +#ifndef NAND_INITIALIZER_LIMITED_MODE // Auto用 if (gAutoFlag) { if (result) { FADE_OUT_RETURN( AutoProcess1 ); } else { FADE_OUT_RETURN( AutoProcess2); } } +#endif return fontProcess1; } diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_topmenu.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_topmenu.c index 9dc50983..d77410ae 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_topmenu.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_topmenu.c @@ -21,17 +21,16 @@ #include "process_format.h" #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" #include "process_fade.h" +#include "process_wireless_setting.h" +#include "process_font.h" #include "cursor.h" #include "keypad.h" -#ifdef USE_WIRELESS_FORCE_DISABLE_SETTING -#include "process_wireless_setting.h" -#endif // USE_WIRELESS_FORCE_DISABLE_SETTING /*---------------------------------------------------------------------------* 型定義 @@ -40,11 +39,16 @@ enum { MENU_FORMAT = 0, MENU_HARDWARE_INFO, + #ifdef USE_WIRELESS_FORCE_DISABLE_SETTING MENU_WIRELESS_SETTING, #endif // USE_WIRELESS_FORCE_DISABLE_SETTING -#ifndef NAND_INITIALIZER_LIMITED_MODE + +#ifdef USE_WRITE_FONT_DATA MENU_FONT_DATA, +#endif // USE_WRITE_FONT_DATA + +#ifndef NAND_INITIALIZER_LIMITED_MODE MENU_ETICKET, MENU_IMPORT_TAD, MENU_IMPORT_NANDFIRM, @@ -73,11 +77,16 @@ static const MenuAndColor sMenuArray[] = { {" FORMAT NAND ", BG_COLOR_BLUE }, {" WRITE HARDWARE INFO ", BG_COLOR_PURPLE }, + #ifdef USE_WIRELESS_FORCE_DISABLE_SETTING {" WIRELESS FORCE SETTING ", BG_COLOR_YELLOW }, #endif // USE_WIRELESS_FORCE_DISABLE_SETTING -#ifndef NAND_INITIALIZER_LIMITED_MODE + +#ifdef USE_WRITE_FONT_DATA {" WRITE FONT DATA ", BG_COLOR_BROWN }, +#endif // USE_WRITE_FONT_DATA + +#ifndef NAND_INITIALIZER_LIMITED_MODE {" WRITE ETICKET SIGN ", BG_COLOR_GRAY }, {" IMPORT TAD FROM SD ", BG_COLOR_PINK }, {" IMPORT NANDFIRM FROM SD", BG_COLOR_GREEN }, @@ -215,13 +224,18 @@ void* TopmenuProcess2(void) FADE_OUT_RETURN( FormatProcess0 ); case MENU_HARDWARE_INFO: FADE_OUT_RETURN( HWInfoProcess0 ); + #ifdef USE_WIRELESS_FORCE_DISABLE_SETTING case MENU_WIRELESS_SETTING: FADE_OUT_RETURN( WirelessSettingProcess0 ); #endif // USE_WIRELESS_FORCE_DISABLE_SETTING -#ifndef NAND_INITIALIZER_LIMITED_MODE + +#ifdef USE_WRITE_FONT_DATA case MENU_FONT_DATA: FADE_OUT_RETURN( fontProcess0 ); +#endif // USE_WRITE_FONT_DATA + +#ifndef NAND_INITIALIZER_LIMITED_MODE case MENU_ETICKET: FADE_OUT_RETURN( eTicketProcess0 ); case MENU_IMPORT_TAD: