From a8ce73d1cd5666c17ea0e285e65b7655bdfb7017 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Thu, 10 Apr 2008 09:52:16 +0000 Subject: [PATCH] =?UTF-8?q?CheckPreloadParameters=E3=81=A7=E3=80=81OS=5FIs?= =?UTF-8?q?AvailableWireless=E3=81=AE=E5=80=A4=E3=81=AB=E5=BF=9C=E3=81=98?= =?UTF-8?q?=E3=81=A6=E7=84=A1=E7=B7=9ALED=E3=82=92=E7=82=B9=E7=81=AF?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82?= =?UTF-8?q?=20=E6=9C=AC=E4=BD=93=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=80=81?= =?UTF-8?q?=E7=84=A1=E7=B7=9AON/OFF=E3=81=AB=E5=BF=9C=E3=81=98=E3=81=A6?= =?UTF-8?q?=E7=84=A1=E7=B7=9ALED=E5=88=B6=E5=BE=A1=E3=81=A8OS=5FIsAvailabl?= =?UTF-8?q?eWireless=E3=81=B8=E3=81=AE=E5=8F=8D=E6=98=A0=E3=82=92=E8=A1=8C?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4=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@1101 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../MachineSettings/ARM9/src/MachineSetting.h | 2 +- .../MachineSettings/ARM9/src/setWireless.c | 32 +++++++++++++++---- build/tests/CheckPreloadParameters/Makefile | 5 +-- build/tests/CheckPreloadParameters/src/main.c | 1 + 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h index ea15e170..52b79543 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h @@ -35,7 +35,7 @@ extern "C" { #define HANDLE_OK_BUTTON 255 #define HANDLE_CANCEL_BUTTON 256 -//#define BROADON_ENABLE // BroadOn用に設定項目を切り替える +#define BROADON_ENABLE // BroadOn用に設定項目を切り替える // 数値入力インターフェース用ワーク（void InputDecimal()で使用） typedef struct InputNumParam { diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/setWireless.c b/build/systemMenu_RED/MachineSettings/ARM9/src/setWireless.c index db393d2f..5832f816 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/setWireless.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/setWireless.c @@ -257,7 +257,8 @@ static u16 DetectPadRepeat( void ) static void DrawWirelessMenuScene( void ) { BOOL bFlg; - + u16 color; + NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL ); PutStringUTF16( 0, 0, TXT_COLOR_BLUE, (const u16 *)L"WIRELESS" ); PutStringUTF16( CANCEL_BUTTON_TOP_X, CANCEL_BUTTON_TOP_Y, TXT_UCOLOR_G0, (const u16 *)L"ARETURN" ); @@ -266,9 +267,10 @@ static void DrawWirelessMenuScene( void ) // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: // あらかじめTWL設定データファイルから読み込み済みの設定を取得して表示 // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - // フリーソフトBOX数 - bFlg = LCFG_TSD_IsAvailableWireless(); - PutStringUTF16( 25*8, s_settingPos[0].y, TXT_UCOLOR_G0, + // 無線強制OFF + color = LCFG_THW_IsForceDisableWireless() ? TXT_COLOR_RED : TXT_COLOR_BLUE; + bFlg = LCFG_TSD_IsAvailableWireless(); + PutStringUTF16( 25*8, s_settingPos[0].y, color, (bFlg)?(const u16*)L"ON":(const u16*)L"OFF" ); // 値が不正のとき赤色で表示 } @@ -276,7 +278,18 @@ static void DrawWirelessMenuScene( void ) void SetWirelessInit( void ) { int i; - + + // 無線強制OFFフラグが有効な時は、無線有効フラグを強制的にOFFにする。 + if( LCFG_THW_IsForceDisableWireless() && + LCFG_TSD_IsAvailableWireless() ) { + OS_TPrintf( "Warning : AvailableWireless flag is different value.\n" ); + LCFG_TSD_SetFlagAvailableWireless( FALSE ); + if( !MY_WriteTWLSettings() ) + { + OS_TPrintf( "TWL settings write failed.\n" ); + } + } + // NITRO設定データのlanguageに応じたメインメニュー構成言語の切り替え for( i=0; i < MS_WIRELESS_NUMOF_ELEMENTS; i++ ) { @@ -325,7 +338,9 @@ int SetWirelessMain( void ) tpCommit = SelectSomethingByTP( &commit, func, 1 ); // メニューへの分岐 - if( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) { // メニュー項目への分岐 + if( !LCFG_THW_IsForceDisableWireless() && + ( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) + ) { // メニュー項目への分岐 if( (s_settingParam.pos[sCursorMenu]).enable ) { switch( sCursorMenu ) { @@ -419,13 +434,16 @@ static int SetAvailableWirelessMain( void ) if( (pad.trg & PAD_BUTTON_A) || (tp_touch && (commit == KEY_OK)) ) { LCFG_TSD_SetFlagAvailableWireless( sbAvailableWireless ); - // :::::::::::::::::::::::::::::::::::::::::::::: + ( (OSTWLSettingsData*) HW_PARAM_TWL_SETTINGS_DATA )->flags.isAvailableWireless = sbAvailableWireless; // [TODO]後で取る。LCFG_TSD_SetFlagAvailableWirelessでも同じ処理をしているが、SDKをコミットできないので、暫定対応。 + PMi_SetWirelessLED( sbAvailableWireless ? PM_WIRELESS_LED_ON : PM_WIRELESS_LED_OFF ); // 無線LEDも即座に変更 + // :::::::::::::::::::::::::::::::::::::::::::::: // TWL設定データファイルへの書き込み // :::::::::::::::::::::::::::::::::::::::::::::: if( !MY_WriteTWLSettings() ) { OS_TPrintf( "TWL settings write failed.\n" ); } + OS_TPrintf( "AvailableWireless : %s\n", OS_IsAvailableWireless() ? "TRUE" : "FALSE " ); SetWirelessInit(); g_pNowProcess = SetWirelessMain; return 0; diff --git a/build/tests/CheckPreloadParameters/Makefile b/build/tests/CheckPreloadParameters/Makefile index b7f30caa..db4cadbd 100644 --- a/build/tests/CheckPreloadParameters/Makefile +++ b/build/tests/CheckPreloadParameters/Makefile @@ -18,13 +18,14 @@ TARGET_PLATFORM = TWL SRCS = main.c -TARGET_BIN = main.srl +TARGET_BIN = main.tad +ROM_SPEC = main.rsf include $(TWLSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBDIRS = +SUBDIRS = banner #---------------------------------------------------------------------------- diff --git a/build/tests/CheckPreloadParameters/src/main.c b/build/tests/CheckPreloadParameters/src/main.c index 96d3711b..62e9d6a3 100644 --- a/build/tests/CheckPreloadParameters/src/main.c +++ b/build/tests/CheckPreloadParameters/src/main.c @@ -67,6 +67,7 @@ void TwlMain(void) OS_TPrintf( "Country : %s\n", s_strCountry[ s_owner.country ] ); OS_TPrintf( "AvailableWireless : %s\n", OS_IsAvailableWireless() ? "TRUE" : "FALSE" ); + PMi_SetWirelessLED( OS_IsAvailableWireless() ? PM_WIRELESS_LED_ON : PM_WIRELESS_LED_OFF ); { int i; OS_TPrintf( "CameraInfo :" );