rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ワイヤレス強制OFFフラグのライトに対応。

Browse Source 
現在のリージョン及びワイヤレス強制OFFフラグを確認できるようにUIを改良。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1057 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa 2008-04-03 09:52:56 +00:00
parent b7c9e3f79d
commit 7ffe371c7f
3 changed files with 95 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/systemMenu_RED/NandInitializerRed/ARM9.TWL/include/process_hw_info.h
View File

@ -48,10 +48,11 @@ void* HWInfoProcess4(void);
Description: Description:
Arguments: region : Arguments: region :
wirelessForceOff : 無線強制OFFならTRUEを指定
Returns: None. Returns: None.
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL WriteHWInfoFile( u8 region ); BOOL WriteHWInfoFile( u8 region, BOOL wirelessForceOff );
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: UpdateNandBoxCount Name: UpdateNandBoxCount

5
build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c
View File

@ -211,12 +211,13 @@ void* FormatProcess2(void)
kamiFontLoadScreenData(); kamiFontLoadScreenData();
{ {
// 現在のリージョンを保存しておきフォーマット後に保存リージョンで初期化する // 現在の設定を保存しておきフォーマット後に保存設定で初期化する
u8 region = LCFG_THW_GetRegion(); u8 region = LCFG_THW_GetRegion();
BOOL isForceDisableWireless = LCFG_THW_IsForceDisableWireless();
BOOL result = TRUE; BOOL result = TRUE;
result &= NAMUT_Format(); result &= NAMUT_Format();
result &= WriteHWInfoFile(region); result &= WriteHWInfoFile(region, isForceDisableWireless);
if (result) if (result)
{ {

129
build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
View File

@ -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 DOT_OF_MENU_SPACE 16
#define CHAR_OF_MENU_SPACE 2 #define CHAR_OF_MENU_SPACE 2
#define MENU_TOP_LINE 5
#define CURSOR_ORIGIN_X 32 #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(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, 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, 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, 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, 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, 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, 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, 18, FONT_COLOR_BLACK, "+--------------------+----+");
// kamiFontPrintf(3, 19, FONT_COLOR_BLACK, "l DELETE l l"); kamiFontPrintf(3, 19, FONT_COLOR_BLACK, "l l l");
// kamiFontPrintf(3, 20, FONT_COLOR_BLACK, "+--------------------+----+"); kamiFontPrintf(5, 17, FONT_COLOR_CYAN, " Wireless Enable ");
kamiFontPrintf(3, 19, FONT_COLOR_BLACK, "l RETURN l l"); kamiFontPrintf(5, 19, FONT_COLOR_CYAN, " Wireless Force Off");
kamiFontPrintf(3, 20, FONT_COLOR_BLACK, "+--------------------+----+"); 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++) for (i=0;i<24;i++)
@ -198,37 +222,64 @@ void* HWInfoProcess2(void)
switch( sMenuSelectNo ) switch( sMenuSelectNo )
{ {
case 0: case MENU_REGION_JAPAN:
case 1: case MENU_REGION_AMERICA:
case 2: case MENU_REGION_EUROPE:
case 3: case MENU_REGION_AUSTRALIA:
case 4: case MENU_REGION_CHINA:
case 5: case MENU_REGION_KOREA:
OS_TPrintf( "Write Start.\n" ); OS_TPrintf( "Write Start.\n" );
result = WriteHWInfoFile( (u8)sMenuSelectNo ); result = WriteHWInfoFile( (u8)sMenuSelectNo, LCFG_THW_IsForceDisableWireless() );
// 全リージョンの結果をクリア
for (i=0;i<NUM_OF_MENU_REGION;i++)
{
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+i*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, " ");
}
// 今回の結果を表示
if ( result == TRUE )
{
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+sMenuSelectNo*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "OK ");
}
else
{
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+sMenuSelectNo*CHAR_OF_MENU_SPACE), FONT_COLOR_RED, "NG ");
}
break; break;
// case 6:
// OS_TPrintf( "Delete start.\n" ); case MENU_WIRELESS_ENABLE:
// result = DeleteHWInfoFile(); result = WriteHWInfoFile( LCFG_THW_GetRegion(), FALSE );
// break; if ( result == TRUE )
case 6: {
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "OK ");
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_FORCE_OFF*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, " ");
}
else
{
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "NG ");
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_FORCE_OFF*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, " ");
}
break;
case MENU_WIRELESS_FORCE_OFF:
result = WriteHWInfoFile( LCFG_THW_GetRegion(), TRUE );
if ( result == TRUE )
{
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, " ");
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_FORCE_OFF*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "OK ");
}
else
{
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, " ");
kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_FORCE_OFF*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "NG ");
}
break;
case MENU_RETURN:
FADE_OUT_RETURN( TopmenuProcess0 ); FADE_OUT_RETURN( TopmenuProcess0 );
break;
} }
// 全結果をクリア
for (i=0;i<NUM_OF_MENU_SELECT;i++)
{
kamiFontPrintf(26, (s16)(7+i*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, " ");
}
// 今回の結果を表示
if ( result == TRUE )
{
kamiFontPrintf(26, (s16)(7+sMenuSelectNo*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "OK");
}
else
{
kamiFontPrintf(26, (s16)(7+sMenuSelectNo*CHAR_OF_MENU_SPACE), FONT_COLOR_RED, "NG");
}
#ifndef NAND_INITIALIZER_LIMITED_MODE #ifndef NAND_INITIALIZER_LIMITED_MODE
// Auto用 // Auto用
@ -256,7 +307,7 @@ void* HWInfoProcess2(void)
Returns: None. Returns: None.
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL WriteHWInfoFile( u8 region ) BOOL WriteHWInfoFile( u8 region, BOOL wirelessForceOff )
{ {
static const char *pMsgNormalWriting = "Writing Normal File..."; static const char *pMsgNormalWriting = "Writing Normal File...";
static const char *pMsgSecureWriting = "Writing Secure File..."; static const char *pMsgSecureWriting = "Writing Secure File...";
@ -279,7 +330,7 @@ BOOL WriteHWInfoFile( u8 region )
// セキュアファイルのライト // セキュアファイルのライト
kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSecureWriting ); kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSecureWriting );
if( HWI_WriteHWSecureInfoFile( region, NULL, FALSE ) ) { // とりあえず無線は有効で。 if( HWI_WriteHWSecureInfoFile( region, NULL, wirelessForceOff ) ) { // とりあえず無線は有効で。
kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSucceeded ); kamiFontPrintfConsoleEx(CONSOLE_ORANGE, pMsgSucceeded );
}else { }else {
kamiFontPrintfConsoleEx(CONSOLE_RED, pMsgFailed ); kamiFontPrintfConsoleEx(CONSOLE_RED, pMsgFailed );