From 5b88d8c6bf33c9a0f04ddb194bdcd8b926af3459 Mon Sep 17 00:00:00 2001 From: nakasima Date: Fri, 29 Feb 2008 12:00:07 +0000 Subject: [PATCH] =?UTF-8?q?ROM=E3=83=98=E3=83=83=E3=83=80=E3=82=92ARM?= =?UTF-8?q?=EF=BC=97=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=81=8B=E3=82=89?= =?UTF-8?q?ARM9=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=81=B8=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E3=81=99=E3=82=8B=E5=89=8D=E3=81=AB=E5=8F=82?= =?UTF-8?q?=E7=85=A7=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E7=AE=87=E6=89=80?= =?UTF-8?q?=E3=82=92=E4=B8=80=E9=83=A8=E5=AF=BE=E5=87=A6=E3=80=82=20?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=83=90=E3=83=8A=E3=83=BC=E8=AA=AD?= =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF=E7=9B=B4=E5=BE=8C=E5=BE=8C=E3=81=AB?= =?UTF-8?q?=E3=83=87=E3=83=A2=E8=A1=A8=E7=A4=BA=E3=82=92=E8=A1=8C=E3=81=86?= =?UTF-8?q?=E3=81=A8=E7=8F=BE=E7=8A=B6=E3=81=A7=E3=81=AF=E3=81=BE=E3=81=9F?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E3=81=97=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?= =?UTF-8?q?=E7=AE=87=E6=89=80=E3=82=92=E4=B8=80=E6=99=82=E7=9A=84=E3=81=AB?= =?UTF-8?q?=E6=88=BB=E3=81=99=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@777 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 27 ++++++++++++------- .../sysmenu/ARM9/src/sysmenu_lib.c | 1 + .../sysmenu/common/src/status.c | 2 +- .../sysmenu/sysmenu_lib/common/sysmenu_work.h | 1 + 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index df190d8c..089af9ef 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -498,30 +498,37 @@ static HotSwState LoadBannerData(void) { BOOL state; HotSwState retval = HOTSW_SUCCESS; - + // バナーリード if( s_cbData.pBootSegBuf->rh.s.banner_offset ) { retval = s_funcTable[s_cbData.cardType].ReadPage_G(&s_cbData, s_cbData.pBootSegBuf->rh.s.banner_offset, (u32 *)SYSM_CARD_BANNER_BUF, sizeof(TWLBannerFile) ); + + // バナーリードが成功していたら各種フラグTRUE その他の場合はFALSE (この関数の外で排他制御されているからここでは排他制御しないでOK) + state = (retval == HOTSW_SUCCESS) ? TRUE : FALSE; + SYSMi_GetWork()->flags.hotsw.isValidCardBanner = state; + SYSMi_GetWork()->flags.hotsw.isCardStateChanged = (u8)state; + SYSMi_GetWork()->flags.hotsw.isExistCard = state; } else{ // バナーデータが登録されていない場合 (この関数の外で排他制御されているからここでは排他制御しないでOK) SYSMi_GetWork()->flags.hotsw.isValidCardBanner = FALSE; SYSMi_GetWork()->flags.hotsw.isExistCard = TRUE; SYSMi_GetWork()->flags.hotsw.isCardStateChanged = TRUE; - SYSMi_GetWork()->flags.hotsw.is1stCardChecked = TRUE; - - return retval; } - // バナーリードが成功していたら各種フラグTRUE その他の場合はFALSE (この関数の外で排他制御されているからここでは排他制御しないでOK) - state = (retval == HOTSW_SUCCESS) ? TRUE : FALSE; - SYSMi_GetWork()->flags.hotsw.isValidCardBanner = state; - SYSMi_GetWork()->flags.hotsw.isCardStateChanged = (u8)state; - SYSMi_GetWork()->flags.hotsw.isExistCard = state; - SYSMi_GetWork()->flags.hotsw.is1stCardChecked = TRUE; + if ( SYSMi_GetWork()->flags.hotsw.isExistCard ) + { + SYSMi_GetWork()->flags.hotsw.isInspectCard = ((ROM_Header_Short *)SYSM_CARD_ROM_HEADER_BAK)->inspect_card; + } + else + { + SYSMi_GetWork()->flags.hotsw.isInspectCard = FALSE; + } + +// SYSMi_GetWork()->flags.hotsw.is1stCardChecked = TRUE; return retval; } diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index e377121c..ff7765db 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -218,6 +218,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot( void ) s_bootTitle.flags.isLogoSkip = TRUE; // ロゴデモを飛ばす s_bootTitle.flags.bootType = LAUNCHER_BOOTTYPE_ROM; s_bootTitle.flags.isValid = TRUE; + // [TODO] 現状ではROMヘッダがまだコピーされていない s_bootTitle.titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo ); SYSM_SetLogoDemoSkip( s_bootTitle.flags.isLogoSkip ); return &s_bootTitle; diff --git a/build/libraries_sysmenu/sysmenu/common/src/status.c b/build/libraries_sysmenu/sysmenu/common/src/status.c index 2fbb5bb2..3fc8ec41 100644 --- a/build/libraries_sysmenu/sysmenu/common/src/status.c +++ b/build/libraries_sysmenu/sysmenu/common/src/status.c @@ -93,7 +93,7 @@ BOOL SYSM_IsExistCard( void ) // 検査用カードが差さっているか？ BOOL SYSM_IsInspectCard( void ) { - return ( SYSM_IsExistCard() && SYSM_GetCardRomHeader()->inspect_card ); + return ( SYSM_IsExistCard() && SYSMi_GetWork()->flags.hotsw.isInspectCard ); } diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h index c5df1068..e854b577 100644 --- a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h +++ b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h @@ -93,6 +93,7 @@ typedef struct SYSM_work { }common; struct { vu16 isExistCard :1; // 有効なNTR/TWLカードが存在するか？ + vu16 isInspectCard :1; // 検査カードか？ vu16 isOnDebugger :1; // デバッガ動作か？ vu16 isEnableHotSW :1; // 活線挿抜有効？ vu16 isBusyHotSW :1; // 活線挿抜処理中？