From f2fe11751fdbec1f52f60694cdc98fea187df863 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 5 Sep 2008 07:43:15 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=87=E3=82=A3=E3=82=A2=E3=83=95?=
 =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=AE?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92=E3=80=81?=
 =?UTF-8?q?=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB=E3=83=8F=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=89=8D?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=20=EF=BC=88=E4=BB=95=E6=A7=98?=
 =?UTF-8?q?=E3=81=AB=E3=82=88=E3=82=8A=E3=80=81=E3=83=A1=E3=83=87=E3=82=A3?=
 =?UTF-8?q?=E3=82=A2=E3=81=8CNAND=E3=81=AE=E3=82=A2=E3=83=97=E3=83=AA?=
 =?UTF-8?q?=E3=82=92TWL=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AB=E7=84=BC?=
 =?UTF-8?q?=E3=81=8F=E3=81=A8DS=E3=82=AB=E3=83=BC=E3=83=89=E3=81=A8?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=93=E3=81=A7?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=86=E3=81=9F=E3=82=81=E3=80=81=20makero?=
 =?UTF-8?q?m=E6=99=82=E7=82=B9=E3=81=A7=E3=81=AFTWL=E3=82=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=82=A2=E3=83=97=E3=83=AA=E3=81=A8=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=81=95=E3=82=8C=E3=81=9F=E3=82=A2=E3=83=97?=
 =?UTF-8?q?=E3=83=AA=E3=81=AE=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE=E3=81=BF?=
 =?UTF-8?q?NAND=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AA=20=E3=83=8F=E3=83=83=E3=82=AF=E3=82=92?=
 =?UTF-8?q?=E4=BB=95=E6=8E=9B=E3=81=91=E3=82=8B=E3=81=A8=E3=80=81=E3=81=86?=
 =?UTF-8?q?=E3=81=BE=E3=81=8FLTD=E3=82=92=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=82=81=E3=81=9A=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB?=
 =?UTF-8?q?=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E3=83=81=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=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@2413 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/title.c                  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
index bc220842..2ef503d9 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
@@ -1210,6 +1210,18 @@ static BOOL SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle )
 		}
 	}
 
+	// デバッガ動作以外の時はNANDアプリはNAND、カードアプリはカードからのみブート許可
+	if ( ! SYSM_IsRunOnDebugger() )
+	{
+		if ( ( (pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_NAND ||
+				pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_TEMP)  && !(head->s.titleID_Hi & TITLE_ID_HI_MEDIA_MASK) ) ||
+			   (pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_ROM    &&  (head->s.titleID_Hi & TITLE_ID_HI_MEDIA_MASK) ) )
+		{
+			UTL_SetFatalError(FATAL_ERROR_MEDIA_CHECK_FAILED);
+			return FALSE;
+		}
+	}
+
 	// ハッシュ比較
     {
 		int l;
@@ -1273,18 +1285,6 @@ static BOOL SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle )
 	}
 	OS_TPrintf("Authenticate : total %d ms.\n", OS_TicksToMilliSeconds(OS_GetTick() - start) );
 
-	// デバッガ動作以外の時はNANDアプリはNAND、カードアプリはカードからのみブート許可
-	if ( ! SYSM_IsRunOnDebugger() )
-	{
-		if ( ( (pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_NAND ||
-				pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_TEMP)  && !(head->s.titleID_Hi & TITLE_ID_HI_MEDIA_MASK) ) ||
-			   (pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_ROM    &&  (head->s.titleID_Hi & TITLE_ID_HI_MEDIA_MASK) ) )
-		{
-			UTL_SetFatalError(FATAL_ERROR_MEDIA_CHECK_FAILED);
-			return FALSE;
-		}
-	}
-
 	return TRUE;
 }