From 4462a071f270e7a90a07859b6cea5e4a08bfa246 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 14 Apr 2008 06:00:11 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=82=A2=E3=83=97=E3=83=AA=E3=83=AA?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E4=BD=9C=E6=88=90=E6=99=82=E3=80=81DataOnly?=
 =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=82=82=E8=A6=8B=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=20=E3=83=BB=E3=82=A2?=
 =?UTF-8?q?=E3=83=97=E3=83=AA=E3=83=AD=E3=83=BC=E3=83=89=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=E3=83=81=E3=83=A5=E3=83=BC=E3=83=8B=E3=83=B3=E3=82=B0=E3=80=80?=
 =?UTF-8?q?=E3=81=A4=E3=82=82=E3=82=8A=E3=81=A4=E3=82=82=E3=82=8A=E3=81=AE?=
 =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=EF=BC=88?=
 =?UTF-8?q?=E9=81=A9=E5=BD=93=EF=BC=89?=
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@1123 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/title.c                  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
index 19643203..0dfc05d5 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
@@ -503,7 +503,16 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode,
 				return;
 			}
 		}
-
+/*
+		// [TODO:]新規Read関数の準備、とりあえずWRAMBをガメるつもりで実装
+		FS_InitWramTransfer(3);
+		MI_FreeWram_B( MI_WRAM_ARM7 );
+		MI_FreeWram_B( MI_WRAM_ARM9 );
+		MI_FreeWram_B( MI_WRAM_DSP );
+		MI_CancelWram_B( MI_WRAM_ARM7 );
+		MI_CancelWram_B( MI_WRAM_ARM9 );
+		MI_CancelWram_B( MI_WRAM_DSP );
+*/
         for (i = region_header; i < region_max; ++i)
         {
             u32 len = MATH_ROUNDUP( length[i], SYSM_ALIGNMENT_LOAD_MODULE );// AES暗号化領域の関係で、ロードサイズは32バイトアライメントに補正
@@ -519,6 +528,16 @@ OS_TPrintf("RebootSystem failed: cant seek file(%d)\n", source[i]);
                 return;
             }
 
+/*
+            // [TODO:]ここで新規関数を使って同時にハッシュ計算やAES処理もやってしまう予定
+            // 別スレッドで同じWRAM使おうとすると多分コケるのでしっかりWRAMガメないとダメ
+			if ( !FS_ReadFileViaWram(file, (void *)destaddr[i], len, MI_WRAM_B, 0, MI_WRAM_SIZE_256KB, コールバック, 引数 ) )
+			{
+OS_TPrintf("RebootSystem failed: cant read file(%d, %d)\n", source[i], len);
+                FS_CloseFile(file);
+                return;
+			}
+*/
             readLen = FS_ReadFile(file, (void *)destaddr[i], (s32)len);
 
             if( readLen < 0 )
@@ -1191,8 +1210,8 @@ static void SYSMi_makeTitleIdList( void )
 			}
 		}
 		
-		// ジャンプ可能ならば
-		if( pe_hs->permit_landing_normal_jump )
+		// ジャンプ可能ならば(一応Data Onlyフラグも見ておくが、ジャンプAPIでも見る事)
+		if( pe_hs->permit_landing_normal_jump && !( hs->titleID & TITLE_ID_DATA_ONLY_FLAG_MASK ) )
 		{
 			// リストに追加してジャンプ可能フラグON
 			list->TitleID[count] = pe_hs->titleID;