From 7ffe371c7fbe7d0707675b9c1e236ba5b0690369 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Thu, 3 Apr 2008 09:52:56 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AF=E3=82=A4=E3=83=A4=E3=83=AC=E3=82=B9?= =?UTF-8?q?=E5=BC=B7=E5=88=B6OFF=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=80=82?= =?UTF-8?q?=20=E7=8F=BE=E5=9C=A8=E3=81=AE=E3=83=AA=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=8F=8A=E3=81=B3=E3=83=AF=E3=82=A4=E3=83=A4?= =?UTF-8?q?=E3=83=AC=E3=82=B9=E5=BC=B7=E5=88=B6OFF=E3=83=95=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E3=82=92=E7=A2=BA=E8=AA=8D=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=ABUI=E3=82=92=E6=94=B9=E8=89=AF?= =?UTF-8?q?=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@1057 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../ARM9.TWL/include/process_hw_info.h | 3 +- .../ARM9.TWL/src/process_format.c | 5 +- .../ARM9.TWL/src/process_hw_info.c | 129 ++++++++++++------ 3 files changed, 95 insertions(+), 42 deletions(-) diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h index d14b0312..11415b11 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h @@ -48,10 +48,11 @@ void* HWInfoProcess4(void); Description: Arguments: region : + wirelessForceOff : 無線強制OFFならTRUEを指定 Returns: None. *---------------------------------------------------------------------------*/ -BOOL WriteHWInfoFile( u8 region ); +BOOL WriteHWInfoFile( u8 region, BOOL wirelessForceOff ); /*---------------------------------------------------------------------------* Name: UpdateNandBoxCount diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c index ae54ab34..e962f03f 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c @@ -211,12 +211,13 @@ void* FormatProcess2(void) kamiFontLoadScreenData(); { - // 現在のリージョンを保存しておきフォーマット後に保存リージョンで初期化する + // 現在の設定を保存しておきフォーマット後に保存設定で初期化する u8 region = LCFG_THW_GetRegion(); + BOOL isForceDisableWireless = LCFG_THW_IsForceDisableWireless(); BOOL result = TRUE; result &= NAMUT_Format(); - result &= WriteHWInfoFile(region); + result &= WriteHWInfoFile(region, isForceDisableWireless); if (result) { diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c index aef4a146..edbccc09 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c @@ -39,15 +39,29 @@ 型定義 *---------------------------------------------------------------------------*/ +enum { + MENU_REGION_JAPAN = 0, + MENU_REGION_AMERICA, + MENU_REGION_EUROPE, + MENU_REGION_AUSTRALIA, + MENU_REGION_CHINA, + MENU_REGION_KOREA, + MENU_WIRELESS_ENABLE, + MENU_WIRELESS_FORCE_OFF, + MENU_RETURN, + NUM_OF_MENU_SELECT +}; + /*---------------------------------------------------------------------------* 定数定義 *---------------------------------------------------------------------------*/ -#define NUM_OF_MENU_SELECT 7 +#define NUM_OF_MENU_REGION 6 #define DOT_OF_MENU_SPACE 16 #define CHAR_OF_MENU_SPACE 2 +#define MENU_TOP_LINE 5 #define CURSOR_ORIGIN_X 32 -#define CURSOR_ORIGIN_Y 56 +#define CURSOR_ORIGIN_Y 40 /*---------------------------------------------------------------------------* 内部変数定義 @@ -98,23 +112,33 @@ void* HWInfoProcess0(void) kamiFontPrintf(0, 2, FONT_COLOR_BLACK, "--------------------------------"); // メニュー一覧 + kamiFontPrintf(3, 4, FONT_COLOR_BLACK, "+--------------------+----+"); + kamiFontPrintf(3, 5, FONT_COLOR_BLACK, "l REGION JAPAN l l"); kamiFontPrintf(3, 6, FONT_COLOR_BLACK, "+--------------------+----+"); - kamiFontPrintf(3, 7, FONT_COLOR_BLACK, "l REGION JAPAN l l"); + kamiFontPrintf(3, 7, FONT_COLOR_BLACK, "l REGION AMERICA l l"); kamiFontPrintf(3, 8, FONT_COLOR_BLACK, "+--------------------+----+"); - kamiFontPrintf(3, 9, FONT_COLOR_BLACK, "l REGION AMERICA l l"); + kamiFontPrintf(3, 9, FONT_COLOR_BLACK, "l REGION EUROPE l l"); kamiFontPrintf(3, 10, FONT_COLOR_BLACK, "+--------------------+----+"); - kamiFontPrintf(3, 11, FONT_COLOR_BLACK, "l REGION EUROPE l l"); + kamiFontPrintf(3, 11, FONT_COLOR_BLACK, "l REGION AUSTRALIA l l"); kamiFontPrintf(3, 12, FONT_COLOR_BLACK, "+--------------------+----+"); - kamiFontPrintf(3, 13, FONT_COLOR_BLACK, "l REGION AUSTRALIA l l"); + kamiFontPrintf(3, 13, FONT_COLOR_BLACK, "l REGION CHINA l l"); kamiFontPrintf(3, 14, FONT_COLOR_BLACK, "+--------------------+----+"); - kamiFontPrintf(3, 15, FONT_COLOR_BLACK, "l REGION CHINA l l"); + kamiFontPrintf(3, 15, FONT_COLOR_BLACK, "l REGION KOREA l l"); kamiFontPrintf(3, 16, FONT_COLOR_BLACK, "+--------------------+----+"); - kamiFontPrintf(3, 17, FONT_COLOR_BLACK, "l REGION KOREA l l"); + kamiFontPrintf(3, 17, FONT_COLOR_BLACK, "l l l"); kamiFontPrintf(3, 18, FONT_COLOR_BLACK, "+--------------------+----+"); -// kamiFontPrintf(3, 19, FONT_COLOR_BLACK, "l DELETE l l"); -// kamiFontPrintf(3, 20, FONT_COLOR_BLACK, "+--------------------+----+"); - kamiFontPrintf(3, 19, FONT_COLOR_BLACK, "l RETURN l l"); + kamiFontPrintf(3, 19, FONT_COLOR_BLACK, "l l l"); + kamiFontPrintf(5, 17, FONT_COLOR_CYAN, " Wireless Enable "); + kamiFontPrintf(5, 19, FONT_COLOR_CYAN, " Wireless Force Off"); kamiFontPrintf(3, 20, FONT_COLOR_BLACK, "+--------------------+----+"); + kamiFontPrintf(3, 21, FONT_COLOR_BLACK, "l RETURN l l"); + kamiFontPrintf(3, 22, FONT_COLOR_BLACK, "+--------------------+----+"); + + // 現在のリージョンに"now"と表示 + kamiFontPrintf(26, (s16)(MENU_TOP_LINE+LCFG_THW_GetRegion()*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, "now"); + + // 現在の無線強制OFF状態に"now"と表示 + kamiFontPrintf(26, (s16)(MENU_TOP_LINE+(NUM_OF_MENU_REGION + LCFG_THW_IsForceDisableWireless())*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, "now"); // 背景全クリア for (i=0;i<24;i++) @@ -198,37 +222,64 @@ void* HWInfoProcess2(void) switch( sMenuSelectNo ) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: + case MENU_REGION_JAPAN: + case MENU_REGION_AMERICA: + case MENU_REGION_EUROPE: + case MENU_REGION_AUSTRALIA: + case MENU_REGION_CHINA: + case MENU_REGION_KOREA: OS_TPrintf( "Write Start.\n" ); - result = WriteHWInfoFile( (u8)sMenuSelectNo ); + result = WriteHWInfoFile( (u8)sMenuSelectNo, LCFG_THW_IsForceDisableWireless() ); + + // 全リージョンの結果をクリア + for (i=0;i