From 87d99166b0f6fd293ea914ba832b1c11b35b803f Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Mon, 24 Mar 2008 07:44:27 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=89=E6=99=82=E3=80=81?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89ROM=E3=83=98=E3=83=83=E3=83=80?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=81=ABROM=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=82=92=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=80?= =?UTF-8?q?=E4=BA=8B=E3=81=A7=E3=80=81=E3=82=AB=E3=83=BC=E3=83=89=E3=82=A2?= =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=81=8C?= =?UTF-8?q?=E5=A4=89=E5=8C=96=E3=81=97=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=81=AE=E4=BF=AE=E6=AD=A3?= 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@928 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/sysmenu/ARM9/src/title.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 9454a8f5..6e127e90 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -173,13 +173,12 @@ BOOL SYSM_GetCardTitleList( TitleProperty *pTitleList_Card ) pTitleList_Card->flags.isAppRelocate = TRUE; } + // タイトル情報フラグのセット + pTitleList_Card->flags.bootType = LAUNCHER_BOOTTYPE_ROM; + pTitleList_Card->titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo ); retval = TRUE; } - // タイトル情報フラグのセット - pTitleList_Card->flags.bootType = LAUNCHER_BOOTTYPE_ROM; - pTitleList_Card->titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo ); - return retval; } @@ -514,7 +513,10 @@ void SYSM_StartLoadTitle( TitleProperty *pBootTitle ) static u64 stack[ STACK_SIZE / sizeof(u64) ]; SYSMi_EnableHotSW( FALSE ); - + // このあとCardRomヘッダバッファにROMヘッダを上書きで読み込むので + // この時点でHotSWが止まっていないと、さらにカードのROMヘッダ + // を上書きしてしまう可能性がある + // 一応、アプリロード開始前に検証結果をPROCESSINGにセット s_authResult = AUTH_RESULT_PROCESSING; // アプリ未ロード状態なら、ロード開始 @@ -1093,7 +1095,7 @@ static void SYSMi_makeTitleIdList( TitleProperty *pTitleList ) ( same_maker_code ) ) { // リストに追加 - list->TitleID[count] = pTitleList[l].titleID; + list->TitleID[count] = pe_hs->titleID; // sameMakerFlagをON list->sameMakerFlag[count/8] |= (u8)(0x1 << (count%8)); // Prv,Pubそれぞれセーブデータがあるか見て、存在すればフラグON @@ -1111,7 +1113,7 @@ static void SYSMi_makeTitleIdList( TitleProperty *pTitleList ) if( pe_hs->permit_landing_normal_jump ) { // リストに追加してジャンプ可能フラグON - list->TitleID[count] = pTitleList[l].titleID; + list->TitleID[count] = pe_hs->titleID; list->appJumpFlag[count/8] |= (u8)(0x1 << (count%8)); }