From ebbc54b7040d55f3326fd48ce712e43f3cf95b34 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Mon, 19 May 2008 02:46:54 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4?= =?UTF-8?q?=E3=83=83=E3=83=81=E3=81=A7MARIOCLUB=5FVERSION=E3=81=8C?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=95=E3=82=8C=E3=81=9F=E5=A0=B4=E5=90=88?= =?UTF-8?q?NAND=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0=E3=81=AE=E6=9B=B8?= =?UTF-8?q?=E3=81=8D=E8=BE=BC=E3=81=BF=E3=82=92=E8=A1=8C=E3=82=8F=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82=20NandInitializerProduction=20=E3=81=AEMakef?= =?UTF-8?q?ile=E3=81=AB=20NandInitializerRed=20=E3=81=A8=E5=90=8C=E3=81=98?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81?= =?UTF-8?q?=E9=83=A1=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@1391 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../NandInitializerProduction/ARM9.TWL/Makefile | 13 +++++++++++++ .../NandInitializerRed/ARM9.TWL/src/process_auto.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile index a1f9e8e4..a387d865 100644 --- a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile @@ -26,6 +26,18 @@ # NandInitializerRedと同様の動作をしますが自動フォーマットが強制的に実行され停止します。 MACRO_FLAGS += -DAUTO_FORMAT_MODE #============================================================================ +#============================================================================ +# ワイヤレスの強制Disableフラグを設定可能にする場合定義します。（要:Make Clean） +MACRO_FLAGS += -DUSE_WIRELESS_FORCE_DISABLE_SETTING +#============================================================================ +#============================================================================ +# フォントデータを書き込み可能にする場合定義します。（要:Make Clean） +MACRO_FLAGS += -DUSE_WRITE_FONT_DATA +#============================================================================ +#============================================================================ +# マリクラデバッグ用に製品本体での起動を抑制する場合定義します。（要:Make Clean） +#MACRO_FLAGS += -DMARIOCLUB_VERSION +#============================================================================ DISABLE_DEBUG = TRUE @@ -63,6 +75,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_auto.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c index 82c8f3ea..97556f6f 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c @@ -109,7 +109,11 @@ void* AutoProcess1(void) case 4: return ImportProcess0; case 5: +#ifndef MARIOCLUB_VERSION return NandfirmProcess0; +#else + return AutoProcess2; +#endif //MARIOCLUB_VERSION case 6: return AutoProcess2; } @@ -152,10 +156,12 @@ void* AutoProcess2(void) kamiFontPrintf(3, 11, FONT_COLOR_BLACK, " WRITE FONT DATA "); kamiFontPrintf(3, 13, FONT_COLOR_BLACK, " WRITE ETICKET SIGN "); kamiFontPrintf(3, 15, FONT_COLOR_BLACK, " INPORT TAD FROM SD "); +#ifndef MARIOCLUB_VERSION kamiFontPrintf(3, 17, 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"); -#endif +#endif //AUTO_FORMAT_MODE for (i=0;i