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

・REDランチャー関係のビルドスイッチに接頭語"SYSM_"を追加。

Browse Source 
SYSM_UPDATER_RELEASE
SYSM_BUILD_FOR_DEBUGGER
SYSM_DO_NOT_SHOW_LAUNCHER
SYSM_DISABLE_WDS_SCAN
SYSM_DISABLE_WLFIRM_LOAD
SYSM_DISABLE_INITIAL_SETTINGS
SYSM_IGNORE_WLFIRM_SIGNCHECK
SYSM_USE_WLANFIRM_LOCAL_PUBKEY	
SYSM_DISABLE_DEBUG

・新規ビルドスイッチ追加。

SYSM_BUILD_FOR_PRODUCTION_TEST

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2094 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat 2008-08-04 14:20:58 +00:00
parent 538e7dba68
commit a85fa8f6b1
19 changed files with 102 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/buildtools/commondefs
View File

@ -19,7 +19,7 @@ ifndef TWL_IPL_COMMONDEFS_
TWL_IPL_COMMONDEFS_ = TRUE TWL_IPL_COMMONDEFS_ = TRUE
#FIRM_USE_PRODUCT_KEYS = TRUE #FIRM_USE_PRODUCT_KEYS = TRUE
#SYSMENU_DEBUGGER_BUILD = TRUE #SYSM_BUILD_FOR_DEBUGGER = TRUE
ifeq ($(TARGET_FIRM),SYSTEMMENU) ifeq ($(TARGET_FIRM),SYSTEMMENU)
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs.sysmenu include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs.sysmenu

4
build/buildtools/commondefs.sysmenu
View File

@ -95,8 +95,8 @@ SDK_NMENU_DATADIR = $(ROOT)/build/tools/TwlNMenu/data
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
ifeq ($(SYSMENU_DEBUGGER_BUILD),TRUE) ifeq ($(SYSM_BUILD_FOR_DEBUGGER),TRUE)
MACRO_FLAGS += -DSYSMENU_DEBUGGER_BUILD MACRO_FLAGS += -DSYSM_BUILD_FOR_DEBUGGER
endif endif
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------

12
build/libraries_sysmenu/sysmenu/ARM9/Makefile
View File

@ -42,18 +42,22 @@ SRCS = sysmenu_lib.c \
TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a
ifeq ($(DO_NOT_SHOW_LAUNCHER),TRUE) ifeq ($(SYSM_DO_NOT_SHOW_LAUNCHER),TRUE)
MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER MACRO_FLAGS += -DSYSM_DO_NOT_SHOW_LAUNCHER
endif endif
ifeq ($(DISABLE_INITIAL_SETTINGS),TRUE) ifeq ($(SYSM_DISABLE_INITIAL_SETTINGS),TRUE)
MACRO_FLAGS += -DDISABLE_INITIAL_SETTINGS MACRO_FLAGS += -DSYSM_DISABLE_INITIAL_SETTINGS
endif endif
ifeq ($(DEFAULT_COMP_ARM7),hyena) ifeq ($(DEFAULT_COMP_ARM7),hyena)
MACRO_FLAGS += -DUSE_HYENA_COMPONENT MACRO_FLAGS += -DUSE_HYENA_COMPONENT
endif endif
ifeq ($(SYSM_BUILD_FOR_PRODUCTION_TEST),TRUE)
MACRO_FLAGS += -DSYSM_BUILD_FOR_PRODUCTION_TEST
endif
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
INSTALL_TARGETS = $(TARGETS) INSTALL_TARGETS = $(TARGETS)

12
build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
View File

@ -186,13 +186,17 @@ TitleProperty *SYSM_ReadParameters( void )
//----------------------------------------------------- //-----------------------------------------------------
// ノーマル情報リード // ノーマル情報リード
if( !LCFG_ReadHWNormalInfo() ) { if( !LCFG_ReadHWNormalInfo() ) {
#ifndef SYSM_IGNORE_RESULT_HWINFO
OS_TPrintf( "HW Normal Info Broken!\n" ); OS_TPrintf( "HW Normal Info Broken!\n" );
UTL_SetFatalError( FATAL_ERROR_HWINFO_NORMAL ); UTL_SetFatalError( FATAL_ERROR_HWINFO_NORMAL );
#endif // SYSM_IGNORE_RESULT_HWINFO
} }
// セキュア情報リード // セキュア情報リード
if( !LCFG_ReadHWSecureInfo() ) { if( !LCFG_ReadHWSecureInfo() ) {
#ifndef SYSM_IGNORE_RESULT_HWINFO
OS_TPrintf( "HW Secure Info Broken!\n" ); OS_TPrintf( "HW Secure Info Broken!\n" );
UTL_SetFatalError( FATAL_ERROR_HWINFO_SECURE ); UTL_SetFatalError( FATAL_ERROR_HWINFO_SECURE );
#endif // SYSM_IGNORE_RESULT_HWINFO
} }
//----------------------------------------------------- //-----------------------------------------------------
@ -389,7 +393,7 @@ static void SYSMi_CopyLCFGDataSettings( void )
BOOL SYSM_IsLauncherHidden( void ) BOOL SYSM_IsLauncherHidden( void )
{ {
#ifdef DO_NOT_SHOW_LAUNCHER #ifdef SYSM_DO_NOT_SHOW_LAUNCHER
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -463,7 +467,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
MI_CpuClear8( &s_bootTitleBuf, sizeof(TitleProperty) ); MI_CpuClear8( &s_bootTitleBuf, sizeof(TitleProperty) );
#ifndef DISABLE_INITIAL_SETTINGS #ifndef SYSM_DISABLE_INITIAL_SETTINGS
//----------------------------------------------------- //-----------------------------------------------------
// TWL設定データ破損時のフラッシュ壊れシーケンス起動 // TWL設定データ破損時のフラッシュ壊れシーケンス起動
//----------------------------------------------------- //-----------------------------------------------------
@ -482,7 +486,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
isSetArgument = TRUE; isSetArgument = TRUE;
isBootMSET = TRUE; isBootMSET = TRUE;
} }
#ifndef DISABLE_INITIAL_SETTINGS #ifndef SYSM_DISABLE_INITIAL_SETTINGS
//----------------------------------------------------- //-----------------------------------------------------
// TWL設定データ未設定時の初回起動シーケンス起動 // TWL設定データ未設定時の初回起動シーケンス起動
//----------------------------------------------------- //-----------------------------------------------------
@ -498,7 +502,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
// カードがささっていたらカードを起動する // カードがささっていたらカードを起動する
// ささっていない場合は本体設定を起動 // ささっていない場合は本体設定を起動
//----------------------------------------------------- //-----------------------------------------------------
#ifdef DO_NOT_SHOW_LAUNCHER #ifdef SYSM_DO_NOT_SHOW_LAUNCHER
else if( SYSM_IsExistCard() ) else if( SYSM_IsExistCard() )
{ {
s_bootTitleBuf.flags.isAppRelocate = TRUE; s_bootTitleBuf.flags.isAppRelocate = TRUE;

30
build/systemMenu_RED/Launcher/ARM9/Makefile
View File

@ -45,10 +45,10 @@ include $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/Launcher/ARM9/commondefs.launch
# MAKEROM SWITCH ※最終ROM作成時は、全てFALSEにセットする # MAKEROM SWITCH ※最終ROM作成時は、全てFALSEにセットする
USE_WLANFIRM_LOCAL_PUBKEY ?= TRUE SYSM_USE_WLANFIRM_LOCAL_PUBKEY ?= TRUE
# MAKEROM SWITCH ※最終ROM作成時は、全てTRUEにセットする # MAKEROM SWITCH ※最終ROM作成時は、全てTRUEにセットする
DISABLE_DEBUG ?= FALSE SYSM_DISABLE_DEBUG ?= FALSE
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
@ -124,25 +124,25 @@ ADDRESS_DTCM = 0x0e000000
MAKEROM_FLAGS += -F \ MAKEROM_FLAGS += -F \
-DTITLEID_LO='$(TITLEID_LO)' \ -DTITLEID_LO='$(TITLEID_LO)' \
-DCARD_REGION='$(CARD_REGION)' \ -DCARD_REGION='$(CARD_REGION)' \
-DDISABLE_DEBUG='$(DISABLE_DEBUG)' \ -DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)' \
-DWRAM_MAP_FILE='$(WRAM_MAP_FILE)' -DWRAM_MAP_FILE='$(WRAM_MAP_FILE)'
MAKETAD_OPTION += -s MAKETAD_OPTION += -s
ifeq ($(DO_NOT_SHOW_LAUNCHER),TRUE) ifeq ($(SYSM_DO_NOT_SHOW_LAUNCHER),TRUE)
MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER MACRO_FLAGS += -DSYSM_DO_NOT_SHOW_LAUNCHER
endif endif
ifeq ($(DISABLE_WDS_SCAN),TRUE) ifeq ($(SYSM_DISABLE_WDS_SCAN),TRUE)
MACRO_FLAGS += -DDISABLE_WDS_SCAN MACRO_FLAGS += -DSYSM_DISABLE_WDS_SCAN
endif endif
ifeq ($(DISABLE_WLFIRM_LOAD),TRUE) ifeq ($(SYSM_DISABLE_WLFIRM_LOAD),TRUE)
MACRO_FLAGS += -DDISABLE_WLFIRM_LOAD MACRO_FLAGS += -DSYSM_DISABLE_WLFIRM_LOAD
endif endif
ifeq ($(IGNORE_WLFIRM_SIGNCHECK),TRUE) ifeq ($(SYSM_IGNORE_WLFIRM_SIGNCHECK),TRUE)
MACRO_FLAGS += -DIGNORE_WLFIRM_SIGNCHECK MACRO_FLAGS += -DSYSM_IGNORE_WLFIRM_SIGNCHECK
endif endif
ifneq ($(DHT_TEST),) ifneq ($(DHT_TEST),)
@ -156,8 +156,12 @@ ifeq ($(DEFAULT_COMP_ARM7),hyena)
MACRO_FLAGS += -DUSE_HYENA_COMPONENT MACRO_FLAGS += -DUSE_HYENA_COMPONENT
endif endif
ifeq ($(USE_WLANFIRM_LOCAL_PUBKEY),TRUE) ifeq ($(SYSM_USE_WLANFIRM_LOCAL_PUBKEY),TRUE)
MACRO_FLAGS += -DUSE_WLANFIRM_LOCAL_PUBKEY MACRO_FLAGS += -DSYSM_USE_WLANFIRM_LOCAL_PUBKEY
endif
ifeq ($(SYSM_BUILD_FOR_PRODUCTION_TEST),TRUE)
MACRO_FLAGS += -DSYSM_BUILD_FOR_PRODUCTION_TEST
endif endif
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------

13
build/systemMenu_RED/Launcher/ARM9/commondefs.launcher
View File

@ -16,14 +16,15 @@
# $Author: # $Author:
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
ifneq ($(UPDATER_RELEASE),TRUE) ifneq ($(SYSM_UPDATER_RELEASE),TRUE)
# COMPILE SWITCH　※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。 # COMPILE SWITCH　※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。
export DO_NOT_SHOW_LAUNCHER = FALSE export SYSM_DO_NOT_SHOW_LAUNCHER = FALSE
export DISABLE_WDS_SCAN = FALSE export SYSM_DISABLE_WDS_SCAN = TRUE
export DISABLE_WLFIRM_LOAD = FALSE export SYSM_DISABLE_WLFIRM_LOAD = FALSE
export DISABLE_INITIAL_SETTINGS = TRUE export SYSM_DISABLE_INITIAL_SETTINGS = TRUE
export IGNORE_WLFIRM_SIGNCHECK = FALSE export SYSM_IGNORE_WLFIRM_SIGNCHECK = FALSE
export SYSM_BUILD_FOR_PRODUCTION_TEST = FALSE
endif endif

19
build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
View File

@ -217,8 +217,7 @@ s32 ReadFirmwareBinary(char *path, u32 offset, u8 *buffer, s32 bufSize)
return flen; return flen;
} }
//#define USE_LOCAL_PUBKEY #ifdef SYSM_USE_WLANFIRM_LOCAL_PUBKEY
#ifdef USE_WLANFIRM_LOCAL_PUBKEY
static const u8 s_pubkey9_1[ 0x80 ] = { static const u8 s_pubkey9_1[ 0x80 ] = {
0xb6, 0x18, 0xd8, 0x61, 0x28, 0xcb, 0x5c, 0x6f, 0x05, 0xfc, 0xd7, 0x09, 0x18, 0x3f, 0xb2, 0xd0, 0xb6, 0x18, 0xd8, 0x61, 0x28, 0xcb, 0x5c, 0x6f, 0x05, 0xfc, 0xd7, 0x09, 0x18, 0x3f, 0xb2, 0xd0,
0x6b, 0x7d, 0xee, 0xd9, 0x98, 0xdc, 0x4f, 0xdd, 0xc1, 0xa8, 0x59, 0x18, 0xfb, 0xb0, 0x65, 0xbd, 0x6b, 0x7d, 0xee, 0xd9, 0x98, 0xdc, 0x4f, 0xdd, 0xc1, 0xa8, 0x59, 0x18, 0xfb, 0xb0, 0x65, 0xbd,
@ -229,7 +228,7 @@ static const u8 s_pubkey9_1[ 0x80 ] = {
0xd4, 0x31, 0x6a, 0xb2, 0xad, 0xbc, 0x37, 0x06, 0x6a, 0x2e, 0xe9, 0x73, 0x5f, 0x3a, 0x57, 0xc7, 0xd4, 0x31, 0x6a, 0xb2, 0xad, 0xbc, 0x37, 0x06, 0x6a, 0x2e, 0xe9, 0x73, 0x5f, 0x3a, 0x57, 0xc7,
0xd7, 0xf8, 0x8e, 0xc1, 0xb9, 0x3d, 0x3f, 0xd4, 0xe5, 0x27, 0x6f, 0xb4, 0x00, 0x8b, 0xb7, 0x19, 0xd7, 0xf8, 0x8e, 0xc1, 0xb9, 0x3d, 0x3f, 0xd4, 0xe5, 0x27, 0x6f, 0xb4, 0x00, 0x8b, 0xb7, 0x19,
}; };
#endif #endif // SYSM_USE_WLANFIRM_LOCAL_PUBKEY
BOOL VerifyWlanfirmSignature(u8* buffer, u32 length) BOOL VerifyWlanfirmSignature(u8* buffer, u32 length)
{ {
@ -248,7 +247,7 @@ BOOL VerifyWlanfirmSignature(u8* buffer, u32 length)
OSTick vstart = OS_GetTick(); OSTick vstart = OS_GetTick();
#endif #endif
#ifdef USE_WLANFIRM_LOCAL_PUBKEY #ifdef SYSM_USE_WLANFIRM_LOCAL_PUBKEY
// ランチャー経由でのデバッガ起動では、鍵情報を受け取ることができない。 // ランチャー経由でのデバッガ起動では、鍵情報を受け取ることができない。
// よってリリースビルドの時は、デバッグ動作を優先して鍵を自分で持つ。 // よってリリースビルドの時は、デバッグ動作を優先して鍵を自分で持つ。
pPubkey = (u8 *)s_pubkey9_1; pPubkey = (u8 *)s_pubkey9_1;
@ -280,7 +279,7 @@ BOOL VerifyWlanfirmSignature(u8* buffer, u32 length)
{ {
OS_TPrintf("[Wlan Firm] !!!! Wlan Firmware authentication has failed !!!!\n"); OS_TPrintf("[Wlan Firm] !!!! Wlan Firmware authentication has failed !!!!\n");
#ifdef IGNORE_WLFIRM_SIGNCHECK #ifdef SYSM_IGNORE_WLFIRM_SIGNCHECK
OS_TPrintf("[Wlan Firm] But this failure is ignored.\n"); OS_TPrintf("[Wlan Firm] But this failure is ignored.\n");
if ( 0 ) if ( 0 )
#endif #endif
@ -301,7 +300,7 @@ BOOL VerifyWlanfirmSignature(u8* buffer, u32 length)
if (FALSE == SVC_CompareSHA1( (const void*)txtDigest, (const void*)signDigest )) if (FALSE == SVC_CompareSHA1( (const void*)txtDigest, (const void*)signDigest ))
{ {
OS_TPrintf("[Wlan Firm] !!!! Digest verification failed !!!!\n"); OS_TPrintf("[Wlan Firm] !!!! Digest verification failed !!!!\n");
#ifdef IGNORE_WLFIRM_SIGNCHECK #ifdef SYSM_IGNORE_WLFIRM_SIGNCHECK
OS_TPrintf("[Wlan Firm] But this failure is ignored.\n"); OS_TPrintf("[Wlan Firm] But this failure is ignored.\n");
if ( 0 ) if ( 0 )
#endif #endif
@ -377,6 +376,10 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
u8 *pSecBuf = NULL; u8 *pSecBuf = NULL;
u8 *pHdrBuf = NULL; u8 *pHdrBuf = NULL;
#if defined(SYSM_DISABLE_WLFIRM_LOAD) || defined(SYSM_BUILD_FOR_PRODUCTION_TEST)
return TRUE;
#endif // SYSM_DISABLE_WLFIRM_LOAD || SYSM_BUILD_FOR_PRODUCTION_TEST
ROM_Header_Short *header = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF; ROM_Header_Short *header = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF;
if( header->titleID_Lo[3] == '4' ) if( header->titleID_Lo[3] == '4' )
@ -656,6 +659,10 @@ static BOOL GetWlanFirmwareInstallResult(WLANFirmResult *pResult)
// 無線ファームロード完了？ // 無線ファームロード完了？
BOOL PollingInstallWlanFirmware( void ) BOOL PollingInstallWlanFirmware( void )
{ {
#if defined(SYSM_DISABLE_WLFIRM_LOAD) || defined(SYSM_BUILD_FOR_PRODUCTION_TEST)
return TRUE;
#endif // SYSM_DISABLE_WLFIRM_LOAD || SYSM_BUILD_FOR_PRODUCTION_TEST
if ( !s_isFinished ) { if ( !s_isFinished ) {
WLANFirmResult result; WLANFirmResult result;
if( GetWlanFirmwareInstallResult( &result ) ) { if( GetWlanFirmwareInstallResult( &result ) ) {

22
build/systemMenu_RED/Launcher/ARM9/src/main.c
View File

@ -355,6 +355,7 @@ void TwlMain( void )
// 「ダイレクトブートでない」もしくは // 「ダイレクトブートでない」もしくは
// 「ダイレクトブートだが、ロゴデモ表示」の時、各種リソースのロード------------ // 「ダイレクトブートだが、ロゴデモ表示」の時、各種リソースのロード------------
#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
if( !pBootTitle || if( !pBootTitle ||
( pBootTitle && !SYSM_IsLogoDemoSkip() ) ) { ( pBootTitle && !SYSM_IsLogoDemoSkip() ) ) {
u32 timestamp; u32 timestamp;
@ -364,6 +365,7 @@ void TwlMain( void )
timestamp = OS_GetSharedFontTimestamp(); timestamp = OS_GetSharedFontTimestamp();
if( timestamp > 0 ) OS_TPrintf( "SharedFont timestamp : %08x\n", timestamp ); if( timestamp > 0 ) OS_TPrintf( "SharedFont timestamp : %08x\n", timestamp );
} }
#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
// end時間計測6 // end時間計測6
MEASURE_RESULT( start, "GetSharedFont : %dms\n" ); MEASURE_RESULT( start, "GetSharedFont : %dms\n" );
@ -419,11 +421,9 @@ void TwlMain( void )
MEASURE_START(start); MEASURE_START(start);
// 無線ファームウェアを無線モジュールにダウンロードする。 // 無線ファームウェアを無線モジュールにダウンロードする。
#ifndef DISABLE_WLFIRM_LOAD
if( FALSE == InstallWlanFirmware( SYSM_IsHotStart() ) ) { if( FALSE == InstallWlanFirmware( SYSM_IsHotStart() ) ) {
OS_TPrintf( "ERROR: Wireless firmware download failed!\n" ); OS_TPrintf( "ERROR: Wireless firmware download failed!\n" );
} }
#endif // DISABLE_WLFIRM_LOAD
// end時間計測8 // end時間計測8
MEASURE_RESULT( start, "Load WlanFirm Time : %dms\n" ); MEASURE_RESULT( start, "Load WlanFirm Time : %dms\n" );
@ -489,12 +489,10 @@ MAIN_LOOP_START:
break; break;
case LOAD_START: case LOAD_START:
if( IsFinishedLoadSharedFont() // ダイレクトブートの時は、フォントロード終了をここでチェック if( IsFinishedLoadSharedFont() // ダイレクトブートの時は、フォントロード終了をここでチェック
#ifndef DISABLE_WLFIRM_LOAD // アプリブート前に無線ファームのロードは完了しておく
&& PollingInstallWlanFirmware() && PollingInstallWlanFirmware()
#endif // DISABLE_WLFIRM_LOAD #ifndef SYSM_DISABLE_WDS_SCAN // アプリブート前にWDSスキャンは終了しておく必要がある
#ifndef DISABLE_WDS_SCAN // アプリブート前にWDSスキャンは終了しておく必要がある
&& ( WDS_WrapperStopScan() != WDSWRAPPER_ERRCODE_OPERATING ) && ( WDS_WrapperStopScan() != WDSWRAPPER_ERRCODE_OPERATING )
#endif // DISABLE_WLFIRM_LOAD #endif // SYSM_DISABLE_WDS_SCAN
) { ) {
SYSM_StartLoadTitle( pBootTitle ); SYSM_StartLoadTitle( pBootTitle );
state = LOADING; state = LOADING;
@ -545,23 +543,23 @@ MAIN_LOOP_START:
break; // state を STOP にして break し、 Boot させない break; // state を STOP にして break し、 Boot させない
} }
#ifndef DISABLE_WDS_SCAN #ifndef SYSM_DISABLE_WDS_SCAN
// Nintendoスポットブート時は、アプリ間パラメータにビーコン情報をセットする。 // Nintendoスポットブート時は、アプリ間パラメータにビーコン情報をセットする。
if( STD_CompareNString( (char *)&pBootTitle->titleID + 1, "JNH", 3 ) == 0 ) if( STD_CompareNString( (char *)&pBootTitle->titleID + 1, "JNH", 3 ) == 0 )
{ {
(void)WDS_WrapperSetArgumentParam(); (void)WDS_WrapperSetArgumentParam();
} }
#endif // DISABLE_WDS_SCAN #endif // SYSM_DISABLE_WDS_SCAN
state = BOOT; state = BOOT;
} }
break; break;
case BOOT: case BOOT:
#ifndef DISABLE_WDS_SCAN #ifndef SYSM_DISABLE_WDS_SCAN
// アプリブート前にWDSスキャンは終了しておく必要がある // アプリブート前にWDSスキャンは終了しておく必要がある
if( ( WDS_WrapperCleanup() != WDSWRAPPER_ERRCODE_OPERATING ) && if( ( WDS_WrapperCleanup() != WDSWRAPPER_ERRCODE_OPERATING ) &&
IsClearnupWDSWrapper() ) IsClearnupWDSWrapper() )
#endif // DISABLE_WDS_SCAN #endif // SYSM_DISABLE_WDS_SCAN
{ {
SYSM_TryToBootTitle( pBootTitle ); // never return. SYSM_TryToBootTitle( pBootTitle ); // never return.
} }
@ -586,7 +584,7 @@ MAIN_LOOP_START:
( GetWlanFirmwareInstallFinalResult() == WLANFIRM_RESULT_SUCCESS ) // ロード成功 ( GetWlanFirmwareInstallFinalResult() == WLANFIRM_RESULT_SUCCESS ) // ロード成功
) { ) {
// 下記条件を満たすなら、WDSスキャン開始 // 下記条件を満たすなら、WDSスキャン開始
#ifndef DISABLE_WDS_SCAN #ifndef SYSM_DISABLE_WDS_SCAN
if( !isStartScanWDS && // WDSスキャン開始済みでない if( !isStartScanWDS && // WDSスキャン開始済みでない
!direct_boot && // ダイレクトブートでない !direct_boot && // ダイレクトブートでない
!LCFG_THW_IsForceDisableWireless() && // 無線強制OFFでない !LCFG_THW_IsForceDisableWireless() && // 無線強制OFFでない
@ -595,7 +593,7 @@ MAIN_LOOP_START:
InitializeWDS(); // 初期化と動作開始を兼ねている。（失敗しても止まりはしないので、気にしない） InitializeWDS(); // 初期化と動作開始を兼ねている。（失敗しても止まりはしないので、気にしない）
isStartScanWDS = TRUE; isStartScanWDS = TRUE;
} }
#endif // DISABLE_WDS_SCAN #endif // SYSM_DISABLE_WDS_SCAN
} }
// コマンドフラッシュ // コマンドフラッシュ

4
build/systemMenu_RED/MachineSettings/ARM9/Makefile
View File

@ -27,7 +27,7 @@ SUBMAKES = \
SYSM_OUTSIDE_UI ?= FALSE SYSM_OUTSIDE_UI ?= FALSE
# MAKEROM SWITCH ※最終ROM作成時は、TRUEにする # MAKEROM SWITCH ※最終ROM作成時は、TRUEにする
DISABLE_DEBUG ?= FALSE SYSM_DISABLE_DEBUG ?= FALSE
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL TARGET_PLATFORM = TWL
@ -66,7 +66,7 @@ LINCLUDES = $(MISC_DIR)/include
MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \
-DCARD_REGION='$(CARD_REGION)' \ -DCARD_REGION='$(CARD_REGION)' \
-DDISABLE_DEBUG='$(DISABLE_DEBUG)' \ -DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)' \
-DROM_HEADER_TEMPLATE='$(call empath,$(ROM_HEADER_TEMPLATE))' -DROM_HEADER_TEMPLATE='$(call empath,$(ROM_HEADER_TEMPLATE))'
MAKETAD_OPTION += -s MAKETAD_OPTION += -s

6
build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile
View File

@ -49,9 +49,9 @@ endif
#============================================================================ #============================================================================
ifdef USE_FOR_NIGHTLY_AUTO_TEST ifdef USE_FOR_NIGHTLY_AUTO_TEST
DISABLE_DEBUG = FALSE SYSM_DISABLE_DEBUG = FALSE
else else
DISABLE_DEBUG = TRUE SYSM_DISABLE_DEBUG = TRUE
endif endif
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
@ -125,7 +125,7 @@ endif
MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \
-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \ -DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \
-DCARD_REGION='$(CARD_REGION)' \ -DCARD_REGION='$(CARD_REGION)' \
-DDISABLE_DEBUG='$(DISABLE_DEBUG)' -DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
MAKETAD_FLAGS += -s MAKETAD_FLAGS += -s

4
build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile
View File

@ -38,7 +38,7 @@ MACRO_FLAGS += -DUSE_WRITE_FONT_DATA
#MACRO_FLAGS += -DMARIOCLUB_VERSION #MACRO_FLAGS += -DMARIOCLUB_VERSION
#============================================================================ #============================================================================
DISABLE_DEBUG = FALSE SYSM_DISABLE_DEBUG = FALSE
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL TARGET_PLATFORM = TWL
@ -109,7 +109,7 @@ endif
MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \
-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \ -DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \
-DCARD_REGION='$(CARD_REGION)' \ -DCARD_REGION='$(CARD_REGION)' \
-DDISABLE_DEBUG='$(DISABLE_DEBUG)' -DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
MAKETAD_FLAGS += -s MAKETAD_FLAGS += -s

4
build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile
View File

@ -34,7 +34,7 @@ MACRO_FLAGS += -DUSE_WRITE_FONT_DATA
#MACRO_FLAGS += -DMARIOCLUB_VERSION #MACRO_FLAGS += -DMARIOCLUB_VERSION
#============================================================================ #============================================================================
DISABLE_DEBUG = FALSE SYSM_DISABLE_DEBUG = FALSE
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL TARGET_PLATFORM = TWL
@ -104,7 +104,7 @@ endif
MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \
-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \ -DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \
-DCARD_REGION='$(CARD_REGION)' \ -DCARD_REGION='$(CARD_REGION)' \
-DDISABLE_DEBUG='$(DISABLE_DEBUG)' -DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
MAKETAD_FLAGS += -s MAKETAD_FLAGS += -s

4
build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile
View File

@ -24,7 +24,7 @@
IGNORE_VERSION_CHECK ?= FALSE IGNORE_VERSION_CHECK ?= FALSE
# MAKEROM SWITCH for build SystemUpdater # MAKEROM SWITCH for build SystemUpdater
DISABLE_DEBUG ?= TRUE SYSM_DISABLE_DEBUG ?= TRUE
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL TARGET_PLATFORM = TWL
@ -92,7 +92,7 @@ endif
MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \
-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \ -DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \
-DCARD_REGION='$(CARD_REGION)' \ -DCARD_REGION='$(CARD_REGION)' \
-DDISABLE_DEBUG='$(DISABLE_DEBUG)' -DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
MAKETAD_FLAGS += -s MAKETAD_FLAGS += -s

4
build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c
View File

@ -236,7 +236,7 @@ TwlMain()
break; break;
} }
#ifdef SYSMENU_DEBUGGER_BUILD #ifdef SYSM_BUILD_FOR_DEBUGGER
// デバッガ向けSystemUpdaterは実機とキャプチャでは動作させない // デバッガ向けSystemUpdaterは実機とキャプチャでは動作させない
if (running != IS_TWL_DEBUGGER) if (running != IS_TWL_DEBUGGER)
{ {
@ -254,7 +254,7 @@ TwlMain()
kamiFontPrintfMain( 2, 11, 3, " execute on IS-TWL-DEBUGGER."); kamiFontPrintfMain( 2, 11, 3, " execute on IS-TWL-DEBUGGER.");
DrawInvalidConsole(); DrawInvalidConsole();
} }
#endif // SYSMENU_DEBUGGER_BUILD #endif // SYSM_BUILD_FOR_DEBUGGER
// UNKNOWNはは動作させない // UNKNOWNはは動作させない
if (running == UNKNOWN) if (running == UNKNOWN)

20
build/systemMenu_tools/SystemUpdater/Makefile
View File

@ -42,18 +42,20 @@ SUBDIRS = $(LAUNCHER_DIR) \
# COMPILE SWITCH for build SystemMenu # COMPILE SWITCH for build SystemMenu
export UPDATER_RELEASE = TRUE export SYSM_UPDATER_RELEASE = TRUE
export DO_NOT_SHOW_LAUNCHER = TRUE export SYSM_DO_NOT_SHOW_LAUNCHER = TRUE
export DISABLE_WDS_SCAN = FALSE export SYSM_DISABLE_WDS_SCAN = FALSE
export IGNORE_WLFIRM_SIGNCHECK = FALSE export SYSM_IGNORE_WLFIRM_SIGNCHECK = FALSE
export DISABLE_WLFIRM_LOAD = FALSE export SYSM_DISABLE_WLFIRM_LOAD = FALSE
export DISABLE_INITIAL_SETTINGS = TRUE export SYSM_DISABLE_INITIAL_SETTINGS = TRUE
export SYSM_OUTSIDE_UI = TRUE export SYSM_OUTSIDE_UI = TRUE
export SYSM_BUILD_FOR_PRODUCTION_TEST = FALSE
# MAKEROM SWITCH for build SystemMenu # MAKEROM SWITCH for build SystemMenu
export DISABLE_DEBUG = TRUE export SYSM_DISABLE_DEBUG = TRUE
export USE_WLANFIRM_LOCAL_PUBKEY = FALSE export SYSM_USE_WLANFIRM_LOCAL_PUBKEY = FALSE
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------

18
build/tests/build4WLDev/Makefile
View File

@ -19,7 +19,7 @@
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
# force to build for debugger # force to build for debugger
export SYSMENU_DEBUGGER_BUILD = TRUE export SYSM_BUILD_FOR_DEBUGGER = TRUE
# SDK configuration for export # SDK configuration for export
override TWL_ARCHGEN := LIMITED override TWL_ARCHGEN := LIMITED
@ -65,25 +65,25 @@ SUBMAKES += ./scripts/Makefile \
# COMPILE SWITCH for build SystemMenu # COMPILE SWITCH for build SystemMenu
export UPDATER_RELEASE = TRUE export SYSM_UPDATER_RELEASE = TRUE
export DO_NOT_SHOW_LAUNCHER = TRUE export SYSM_DO_NOT_SHOW_LAUNCHER = TRUE
export DISABLE_WDS_SCAN = FALSE export SYSM_DISABLE_WDS_SCAN = FALSE
############################################# #############################################
# For Wireless development # For Wireless development
# #
# disable signature check # disable signature check
export IGNORE_WLFIRM_SIGNCHECK = TRUE export SYSM_IGNORE_WLFIRM_SIGNCHECK = TRUE
export DISABLE_WLFIRM_LOAD = FALSE export SYSM_DISABLE_WLFIRM_LOAD = FALSE
export DISABLE_INITIAL_SETTINGS = TRUE export SYSM_DISABLE_INITIAL_SETTINGS = TRUE
export SYSM_OUTSIDE_UI = TRUE export SYSM_OUTSIDE_UI = TRUE
# MAKEROM SWITCH for build SystemMenu # MAKEROM SWITCH for build SystemMenu
export DISABLE_DEBUG = TRUE export SYSM_DISABLE_DEBUG = TRUE
export USE_WLANFIRM_LOCAL_PUBKEY = FALSE export SYSM_USE_WLANFIRM_LOCAL_PUBKEY = FALSE
DATE_AND_TIME ?= $(shell date +"%y%m%d %H%M") DATE_AND_TIME ?= $(shell date +"%y%m%d %H%M")

2
build/tests/build4WLDev/Makefile_environment
View File

@ -19,7 +19,7 @@
TARGET_FIRM = SYSTEMMENU TARGET_FIRM = SYSTEMMENU
# force to build for debugger # force to build for debugger
export SYSMENU_DEBUGGER_BUILD = TRUE export SYSM_BUILD_FOR_DEBUGGER = TRUE
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

2
include/sysmenu/sysmenu_lib/common/sysmenu_work.h
View File

@ -212,7 +212,7 @@ typedef struct DeliverBROM9Key {
// ISデバッガ上で動作しているか？ // ISデバッガ上で動作しているか？
static inline BOOL SYSM_IsRunOnDebugger( void ) static inline BOOL SYSM_IsRunOnDebugger( void )
{ {
#ifdef SYSMENU_DEBUGGER_BUILD #ifdef SYSM_BUILD_FOR_DEBUGGER
return SYSMi_GetWork()->flags.hotsw.isOnDebugger; return SYSMi_GetWork()->flags.hotsw.isOnDebugger;
#else #else
return FALSE; return FALSE;

3
include/sysmenu/util.h
View File

@ -123,9 +123,8 @@ extern u64 UTL_GetFatalError( void ); // FATAL
// リージョンチェック // リージョンチェック
static inline BOOL UTL_CheckAppRegion( u32 card_region_bitmap ) static inline BOOL UTL_CheckAppRegion( u32 card_region_bitmap )
{ {
#ifdef SYSMENU_DEBUGGER_BUILD #ifdef SYSM_BUILD_FOR_DEBUGGER
#pragma unused(card_region_bitmap) #pragma unused(card_region_bitmap)
// 2008.07.23 ISデバッガの暫定対応
return TRUE; return TRUE;
#else #else
return ( card_region_bitmap & ( 0x00000001 << OS_GetRegion() ) ) ? TRUE : FALSE; return ( card_region_bitmap & ( 0x00000001 << OS_GetRegion() ) ) ? TRUE : FALSE;