NandInitilizer の Makefileにおいて USE_WRITE_FONT_DATA を定義することで NandInitializerWithSharedFont が作成されるようにしました。

NandInitializerRed に 無線強制OFFフラグ 設定機能を追加しました。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1378 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa 2008-05-16 06:54:55 +00:00
parent 0342bdf8ef
commit aed54798bc
4 changed files with 47 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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;
}

View File

@ -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: